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 4cea69da..ebf02098 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -28,13 +28,13 @@ 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.events.internal.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
 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.DependencyVector;
 import de.staropensource.sosengine.base.types.ImmutableMap;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import de.staropensource.sosengine.base.utility.DependencyResolver;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
@@ -163,10 +163,9 @@ public final class Engine implements SubsystemMainClass {
      */
     private void initializeClasses() {
         // Sorted in rough order of dependence
-        new EngineInformation();
         new PlaceholderEngine();
 
-        EngineInformation.getInstance().load();
+        EngineInformation.updateVariables();
     }
 
     /**
@@ -356,7 +355,7 @@ public final class Engine implements SubsystemMainClass {
      */
     @Override
     public DependencyVector getDependencyVector() {
-        return new DependencyVector("engine", StarOpenSourceVersioningSystem.class, EngineInformation.getInstance().getVersioningString());
+        return new DependencyVector("engine", StarOpenSourceVersioningSystem.class, EngineInformation.getVersioningString());
     }
 
     /**
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 70bfcc5c..7440b6b4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
@@ -25,8 +25,8 @@ 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.utility.PropertyParser;
 import de.staropensource.sosengine.base.utility.converter.AnsiShortcodeConverter;
+import de.staropensource.sosengine.base.utility.parser.PropertyParser;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -162,8 +162,6 @@ public final class EngineConfiguration implements SubsystemConfiguration {
      * Contains the logging template used for creating log messages.
      *
      * @see Logger
-     * @see de.staropensource.sosengine.base.data.placeholder Global placeholder list
-     * @see de.staropensource.sosengine.base.logging.placeholders.logger Logger placeholder list
      * @since 1-alpha0
      *
      * -- GETTER --
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 7db80136..46913deb 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
@@ -21,9 +21,9 @@ package de.staropensource.sosengine.base.classes;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.events.internal.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
-import de.staropensource.sosengine.base.types.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 
 /**
  * The interface for engine subsystem main classes.
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 01ce8fd4..e4b435a0 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
@@ -21,12 +21,11 @@ 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.Logger;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.VersionType;
-import de.staropensource.sosengine.base.utility.PropertyParser;
-import de.staropensource.sosengine.base.utility.StackTraceParser;
+import de.staropensource.sosengine.base.types.versioning.VersionType;
+import de.staropensource.sosengine.base.utility.parser.PropertyParser;
+import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
 import lombok.Getter;
 
 import java.io.IOException;
@@ -42,22 +41,7 @@ import java.util.Properties;
  * Provides build information about the sos!engine.
  */
 @SuppressWarnings({ "unused", "JavadocDeclaration", "JavadocBlankLines" })
-@Getter
 public final class EngineInformation {
-    /**
-     * Contains the class instance.
-     *
-     * @since 1-alpha0
-     *
-     * -- GETTER --
-     * Returns the class instance.
-     *
-     * @return class instance unless {@link Engine} is uninitialized
-     * @since 1-alpha0
-     */
-    @Getter
-    private static EngineInformation instance;
-
     /**
      * Provides the engine's version.
      *
@@ -69,7 +53,8 @@ public final class EngineInformation {
      * @return engine version
      * @since 1-alpha0
      */
-    private int versioningVersion;
+    @Getter
+    private static int versioningVersion;
 
     /**
      * Provides the engine's version type.
@@ -82,7 +67,8 @@ public final class EngineInformation {
      * @return engine version type
      * @since 1-alpha0
      */
-    private VersionType versioningType;
+    @Getter
+    private static VersionType versioningType;
 
     /**
      * Provides the engine's type release.
@@ -95,7 +81,8 @@ public final class EngineInformation {
      * @return engine type release
      * @since 1-alpha0
      */
-    private int versioningTyperelease;
+    @Getter
+    private static int versioningTyperelease;
 
     /**
      * Provides the engine's fork identifier.<br/>
@@ -110,7 +97,8 @@ public final class EngineInformation {
      * @return engine fork identifier
      * @since 1-alpha0
      */
-    private String versioningFork;
+    @Getter
+    private static String versioningFork;
 
     /**
      * Provides the engine's full version string.
@@ -123,7 +111,8 @@ public final class EngineInformation {
      * @return engine version string
      * @since 1-alpha1
      */
-    private String versioningString;
+    @Getter
+    private static String versioningString;
 
 
     /**
@@ -137,7 +126,8 @@ public final class EngineInformation {
      * @return git dirty value
      * @since 1-alpha1
      */
-    private Boolean gitDirty;
+    @Getter
+    private static Boolean gitDirty;
 
     /**
      * Provides the branch the engine was built on.
@@ -150,7 +140,8 @@ public final class EngineInformation {
      * @return git branch
      * @since 1-alpha1
      */
-    private String gitBranch;
+    @Getter
+    private static String gitBranch;
 
     /**
      * Provides the commit count.
@@ -163,7 +154,8 @@ public final class EngineInformation {
      * @return git commit count
      * @since 1-alpha1
      */
-    private int gitCommitCount;
+    @Getter
+    private static int gitCommitCount;
 
     /**
      * Provides the commit identifier (short form).
@@ -176,7 +168,8 @@ public final class EngineInformation {
      * @return git long commit id
      * @since 1-alpha1
      */
-    private String gitCommitIdentifierShort;
+    @Getter
+    private static String gitCommitIdentifierShort;
 
     /**
      * Provides the commit identifier (long form).
@@ -189,7 +182,8 @@ public final class EngineInformation {
      * @return git long commit id
      * @since 1-alpha1
      */
-    private String gitCommitIdentifierLong;
+    @Getter
+    private static String gitCommitIdentifierLong;
 
     /**
      * Provides the commit header.
@@ -202,7 +196,8 @@ public final class EngineInformation {
      * @return git commit header
      * @since 1-alpha1
      */
-    private String gitCommitHeader;
+    @Getter
+    private static String gitCommitHeader;
 
     /**
      * Provides the commit time.
@@ -215,7 +210,8 @@ public final class EngineInformation {
      * @return git commit time
      * @since 1-alpha1
      */
-    private ZonedDateTime gitCommitTime;
+    @Getter
+    private static ZonedDateTime gitCommitTime;
 
     /**
      * Provides the commiter's name.
@@ -228,7 +224,8 @@ public final class EngineInformation {
      * @return git committer name
      * @since 1-alpha1
      */
-    private String gitCommitterName;
+    @Getter
+    private static String gitCommitterName;
 
     /**
      * Provides the commiter's email.
@@ -241,7 +238,8 @@ public final class EngineInformation {
      * @return git committer email
      * @since 1-alpha1
      */
-    private String gitCommitterEmail;
+    @Getter
+    private static String gitCommitterEmail;
 
 
     /**
@@ -255,7 +253,8 @@ public final class EngineInformation {
      * @return Lombok dependency version
      * @since 1-alpha0
      */
-    private String dependencyLombok;
+    @Getter
+    private static String dependencyLombok;
 
     /**
      * Provides the version of the dependency {@code Jetbrains Annotations}.
@@ -268,7 +267,8 @@ public final class EngineInformation {
      * @return Jetbrains Annotations dependency version
      * @since 1-alpha0
      */
-    private String dependencyJetbrainsAnnotations;
+    @Getter
+    private static String dependencyJetbrainsAnnotations;
 
     /**
      * Provides the version of the dependency {@code Jansi}.
@@ -281,7 +281,8 @@ public final class EngineInformation {
      * @return Jansi dependency version
      * @since 1-alpha0
      */
-    private String dependencyJansi;
+    @Getter
+    private static String dependencyJansi;
 
     /**
      * Provides the version of the dependency {@code Reflections}.
@@ -294,7 +295,8 @@ public final class EngineInformation {
      * @return Reflections dependency version
      * @since 1-alpha0
      */
-    private String dependencyReflections;
+    @Getter
+    private static String dependencyReflections;
 
     /**
      * Provides the version of the dependency {@code SLF4J}.
@@ -307,7 +309,8 @@ public final class EngineInformation {
      * @return SLF4J dependency version
      * @since 1-alpha0
      */
-    private String dependencySlf4j;
+    @Getter
+    private static String dependencySlf4j;
 
     /**
      * Provides the version of the dependency {@code LWJGL}.
@@ -320,7 +323,8 @@ public final class EngineInformation {
      * @return LWJGL dependency version
      * @since 1-alpha0
      */
-    private String dependencyLwjgl;
+    @Getter
+    private static String dependencyLwjgl;
 
     /**
      * Provides the version of the Gradle plugin {@code Shadow}.
@@ -333,7 +337,8 @@ public final class EngineInformation {
      * @return Shadow plugin version
      * @since 1-alpha0
      */
-    private String pluginShadow;
+    @Getter
+    private static String pluginShadow;
 
     /**
      * Provides the version of the Gradle plugin {@code Lombok}.
@@ -346,33 +351,27 @@ public final class EngineInformation {
      * @return Lombok plugin version
      * @since 1-alpha0
      */
-    private String pluginLombok;
+    @Getter
+    private static String pluginLombok;
 
     /**
      * Constructs this class.
      *
      * @since 1-alpha0
      */
-    public EngineInformation() {
-        // Only allow one instance
-        if (instance == null)
-            instance = this;
-        else {
-            Logger.crash(new LogIssuer(getClass(), CodePart.ENGINE), "Tried reinitializing " + getClass().getName() + " twice");
-        }
-    }
+    public EngineInformation() {}
 
     /**
      * Updates all variables.
      *
      * @since 1-alpha1
      */
-    public void load() {
-        LoggerInstance logger = new LoggerInstance(new LogIssuer(getClass(), CodePart.ENGINE));
+    public static void updateVariables() {
+        LoggerInstance logger = new LoggerInstance(new LogIssuer(EngineInformation.class, CodePart.ENGINE));
 
         // Load properties from bundled gradle.properties
         Properties gradleProperties = new Properties();
-        InputStream gradleStream = this.getClass().getClassLoader().getResourceAsStream("gradle.properties");
+        InputStream gradleStream = EngineInformation.class.getClassLoader().getResourceAsStream("gradle.properties");
 
         if (gradleStream == null) {
             System.out.println("Unable to load build information: The bundled gradle.properties file could not be found. Do symlinks work on the system that built this JAR?");
@@ -394,7 +393,7 @@ public final class EngineInformation {
         // Load properties from bundled git.properties
         // or fill in blank information if file missing
         Properties gitProperties = new Properties();
-        InputStream gitStream = this.getClass().getClassLoader().getResourceAsStream("git.properties");
+        InputStream gitStream = EngineInformation.class.getClassLoader().getResourceAsStream("git.properties");
         if (gitStream == null) {
             logger.error("Unable to load build information: The bundled git.properties file could not be found. Did you download a tarball?");
 
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 8939210b..2009d1f4 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
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
-import de.staropensource.sosengine.base.types.VersioningSystem;
+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/SemanticVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/SemanticVersioningSystem.java
index 661f201a..b7cc1e6e 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
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
-import de.staropensource.sosengine.base.types.VersioningSystem;
+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 03bddbaa..b4119947 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
@@ -21,8 +21,8 @@ package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
-import de.staropensource.sosengine.base.types.VersionType;
-import de.staropensource.sosengine.base.types.VersioningSystem;
+import de.staropensource.sosengine.base.types.versioning.VersionType;
+import de.staropensource.sosengine.base.types.versioning.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/data/versioning/ThreeNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/ThreeNumberVersioningSystem.java
index 3433b357..bdaac636 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
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
-import de.staropensource.sosengine.base.types.VersioningSystem;
+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 7f6035ef..741adb25 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
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
-import de.staropensource.sosengine.base.types.VersioningSystem;
+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/EngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
index 9bd1ec6a..202defb6 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
@@ -27,7 +27,7 @@ import de.staropensource.sosengine.base.classes.helpers.EventHelper;
  *
  * @since 1-alpha0
  */
-public class EngineShutdownEvent implements Event {
+public final class EngineShutdownEvent implements Event {
     /**
      * Constructs this class.
      */
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 7973ee1d..6cd32750 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
@@ -21,9 +21,9 @@ 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.helpers.EventHelper;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.classes.logging.LogLevel;
-import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 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 ff2a0b2a..1a62149d 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
@@ -34,7 +34,7 @@ import java.lang.reflect.Method;
  * @see Miscellaneous#executeSafely(Runnable, String)
  * @since 1-alpha0
  */
-public class ThrowableCatchEvent implements Event {
+public final class ThrowableCatchEvent implements Event {
     /**
      * Constructs this class.
      */
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 f2c46818..6aef17b0 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.VersioningSystem;
+import de.staropensource.sosengine.base.types.versioning.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 12620c50..7ff51919 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.VersioningSystem;
+import de.staropensource.sosengine.base.types.versioning.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 d08035d1..8537cb97 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.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
index 0a7b8af1..63599fec 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.events.internal;
+package de.staropensource.sosengine.base.internal.events;
 
 import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/internal/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/events/package-info.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/events/internal/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/events/package-info.java
index 0b862127..b09535ee 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/internal/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/events/package-info.java
@@ -21,4 +21,4 @@
  * Events used for engine-internal communication.
  * These events are meant to be listened on by the base engine and it's subsystems.
  */
-package de.staropensource.sosengine.base.events.internal;
+package de.staropensource.sosengine.base.internal.events;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/package-info.java
new file mode 100644
index 00000000..cea87913
--- /dev/null
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/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 internal packages.
+ *
+ * @since 1-alpha1
+ */
+package de.staropensource.sosengine.base.internal;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateDay.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateDay.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateDay.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateDay.java
index 22af6b72..f404ab43 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateDay.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateDay.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateMonth.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateMonth.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateMonth.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateMonth.java
index f9d69551..ba2a798b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateMonth.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateMonth.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateYear.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateYear.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateYear.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateYear.java
index 44b92095..9918c0c0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateYear.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateYear.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJansi.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJansi.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJansi.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJansi.java
index 8f8c7f5c..219f912f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJansi.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJansi.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineDependencyJansi implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getDependencyJansi());
+        return text.replace("%" + getName() + "%", EngineInformation.getDependencyJansi());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJetbrainsAnnotations.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJetbrainsAnnotations.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJetbrainsAnnotations.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJetbrainsAnnotations.java
index 3ee6aa70..51690f00 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJetbrainsAnnotations.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJetbrainsAnnotations.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineDependencyJetbrainsAnnotations implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getDependencyJetbrainsAnnotations());
+        return text.replace("%" + getName() + "%", EngineInformation.getDependencyJetbrainsAnnotations());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLombok.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLombok.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLombok.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLombok.java
index 6b74207f..18d8e13c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLombok.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLombok.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineDependencyLombok implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getDependencyLombok());
+        return text.replace("%" + getName() + "%", EngineInformation.getDependencyLombok());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLwjgl.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLwjgl.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLwjgl.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLwjgl.java
index e126900b..44293e15 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLwjgl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLwjgl.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineDependencyLwjgl implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getDependencyLwjgl());
+        return text.replace("%" + getName() + "%", EngineInformation.getDependencyLwjgl());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyReflections.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyReflections.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyReflections.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyReflections.java
index aa71bee7..e9e14db4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyReflections.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyReflections.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineDependencyReflections implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getDependencyReflections());
+        return text.replace("%" + getName() + "%", EngineInformation.getDependencyReflections());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencySlf4j.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencySlf4j.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencySlf4j.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencySlf4j.java
index ecffffa6..f9fccdfb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencySlf4j.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencySlf4j.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineDependencySlf4j implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getDependencySlf4j());
+        return text.replace("%" + getName() + "%", EngineInformation.getDependencySlf4j());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitBranch.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitBranch.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitBranch.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitBranch.java
index cdf68e96..deba4e23 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitBranch.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitBranch.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitBranch implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getGitBranch());
+        return text.replace("%" + getName() + "%", EngineInformation.getGitBranch());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitHeader.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitHeader.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitHeader.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitHeader.java
index 586ac23b..83105aa0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitHeader.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitHeader.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitHeader implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getGitCommitHeader());
+        return text.replace("%" + getName() + "%", EngineInformation.getGitCommitHeader());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdLong.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdLong.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdLong.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdLong.java
index 87c36cac..001eabea 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdLong.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdLong.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitIdLong implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getGitCommitIdentifierLong());
+        return text.replace("%" + getName() + "%", EngineInformation.getGitCommitIdentifierLong());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdShort.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdShort.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdShort.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdShort.java
index 7a3da25a..f64b675f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdShort.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdShort.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitIdShort implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getGitCommitIdentifierShort());
+        return text.replace("%" + getName() + "%", EngineInformation.getGitCommitIdentifierShort());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeDay.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeDay.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeDay.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeDay.java
index 5d54508c..2e9f0e73 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeDay.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeDay.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitTimeDay implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitTime().getDayOfMonth()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitTime().getDayOfMonth()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeHour.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeHour.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeHour.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeHour.java
index e18be344..15cfea3a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeHour.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeHour.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitTimeHour implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitTime().getHour()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitTime().getHour()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMinute.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMinute.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMinute.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMinute.java
index 9f3419c7..5e6842b4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMinute.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMinute.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitTimeMinute implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitTime().getMinute()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitTime().getMinute()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMonth.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMonth.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMonth.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMonth.java
index c8aaef9a..73925412 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMonth.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMonth.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitTimeMonth implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitTime().getMonth()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitTime().getMonth()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeSecond.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeSecond.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeSecond.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeSecond.java
index 08672595..35a2c4b6 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeSecond.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeSecond.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitTimeSecond implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitTime().getSecond()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitTime().getSecond()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeYear.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeYear.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeYear.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeYear.java
index 37fa9c00..b0eacd88 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeYear.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeYear.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitTimeYear implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitTime().getYear()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitTime().getYear()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommits.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommits.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommits.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommits.java
index bfb6159f..ccdaf3a4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommits.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommits.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommits implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitCommitCount()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitCommitCount()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterEmail.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterEmail.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterEmail.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterEmail.java
index c15d92b3..9087e6a8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterEmail.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterEmail.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitterEmail implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getGitCommitterEmail());
+        return text.replace("%" + getName() + "%", EngineInformation.getGitCommitterEmail());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterName.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterName.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterName.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterName.java
index 6e6f9586..9bdba750 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterName.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitCommitterName implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getGitCommitterName());
+        return text.replace("%" + getName() + "%", EngineInformation.getGitCommitterName());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitDirty.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitDirty.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitDirty.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitDirty.java
index 36ca210f..4ecc5e0c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitDirty.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitDirty.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineGitDirty implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getGitDirty()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getGitDirty()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginLombok.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EnginePluginLombok.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginLombok.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EnginePluginLombok.java
index dc2e5595..907a68b1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginLombok.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EnginePluginLombok.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EnginePluginLombok implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getPluginLombok());
+        return text.replace("%" + getName() + "%", EngineInformation.getPluginLombok());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginShadow.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EnginePluginShadow.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginShadow.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EnginePluginShadow.java
index 2746546d..21ffd955 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginShadow.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EnginePluginShadow.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EnginePluginShadow implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getPluginShadow());
+        return text.replace("%" + getName() + "%", EngineInformation.getPluginShadow());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersion.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersion.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersion.java
index 715d37bc..a4fdd94d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionFork.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionFork.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionFork.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionFork.java
index 71634e79..e5a2f94a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionFork.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionFork.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineVersionFork implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getVersioningFork());
+        return text.replace("%" + getName() + "%", EngineInformation.getVersioningFork());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionType.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionType.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionType.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionType.java
index 92c174b6..10c93aca 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineVersionType implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", EngineInformation.getInstance().getVersioningType().name().toLowerCase());
+        return text.replace("%" + getName() + "%", EngineInformation.getVersioningType().name().toLowerCase());
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionTyperelease.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionTyperelease.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionTyperelease.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionTyperelease.java
index 97185728..4722c06e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionTyperelease.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionTyperelease.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineVersionTyperelease implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getVersioningTyperelease()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getVersioningTyperelease()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionVersion.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionVersion.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionVersion.java
index 3e666f06..7e7d8a7e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
@@ -48,6 +48,6 @@ public final class EngineVersionVersion implements Placeholder {
     @NotNull
     @Override
     public String replace(@NotNull String text) {
-        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getInstance().getVersioningVersion()));
+        return text.replace("%" + getName() + "%", String.valueOf(EngineInformation.getVersioningVersion()));
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmArguments.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmArguments.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmArguments.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmArguments.java
index 75866d2d..c6c7b2ea 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmArguments.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmArguments.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationName.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationName.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationName.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationName.java
index 2fe2d32a..614cb6d2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationName.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVendor.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVendor.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVendor.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVendor.java
index 32974077..435f1d85 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVendor.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVendor.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVersion.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVersion.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVersion.java
index 1b54ddef..02f99ea2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmJava.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmJava.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmJava.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmJava.java
index ec264fa4..01b0caef 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmJava.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmJava.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmUptime.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmUptime.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmUptime.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmUptime.java
index 7e8b574c..edb65395 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmUptime.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmUptime.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeEpoch.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeEpoch.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeEpoch.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeEpoch.java
index e9e16f37..71296f34 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeEpoch.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeEpoch.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeHour.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeHour.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeHour.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeHour.java
index 37da6fee..bea95898 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeHour.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeHour.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeMinute.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeMinute.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeMinute.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeMinute.java
index fc80a47b..a1a0372e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeMinute.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeMinute.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeSecond.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeSecond.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeSecond.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeSecond.java
index 6e9bc7cd..243dd3b8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeSecond.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeSecond.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeZone.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeZone.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeZone.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeZone.java
index 5dced7bb..922a4784 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeZone.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeZone.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
index 968c950e..1539b772 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java
index b5280109..9d66e2bd 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java
index 9682d1ae..b7fc4eae 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerMessage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerMessage.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerMessage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerMessage.java
index cec9f6aa..bbdebb73 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerMessage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
index e9959a2d..f33bebf5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
index 330522b6..6e334821 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/Stacktrace.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/Stacktrace.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java
index f7d87139..c3b0c8be 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/Stacktrace.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.StackTraceParser;
+import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/package-info.java
index ae857486..c865195f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/package-info.java
@@ -23,4 +23,4 @@
  * @see de.staropensource.sosengine.base.logging.CrashHandler
  * @since 1-alpha0
  */
-package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
index fa9f9afb..6527d60e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java
index 926c029a..c3ff6c54 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
index dc758fac..87d32be9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
index 2167ee94..89ca6b5c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java
index 1803fe0c..f10067a4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
index 534b025a..d417086a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogMessage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogMessage.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogMessage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogMessage.java
index 8a84ad39..7732d759 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogMessage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
index ad772180..e3e531af 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
index 0d820fb7..2d98aea2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/package-info.java
index e754cc8d..8e97df9e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/package-info.java
@@ -23,4 +23,4 @@
  * @see de.staropensource.sosengine.base.logging.Logger
  * @since 1-alpha0
  */
-package de.staropensource.sosengine.base.logging.placeholders.logger;
+package de.staropensource.sosengine.base.internal.placeholders.logger;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/package-info.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholder/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/package-info.java
index 20575d12..dd8016b3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/package-info.java
@@ -24,4 +24,4 @@
  * @see de.staropensource.sosengine.base.classes.Placeholder
  * @since 1-alpha0
  */
-package de.staropensource.sosengine.base.data.placeholder;
+package de.staropensource.sosengine.base.internal.placeholders;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
index ab8d61f0..c2c41077 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging;
+package de.staropensource.sosengine.base.internal.types;
 
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.classes.logging.LogLevel;
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 49319382..ec8da6a6 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
@@ -25,7 +25,7 @@ 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.logging.placeholders.crashhandler.*;
+import de.staropensource.sosengine.base.internal.placeholders.crashhandler.*;
 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 b66f726c..5ead8ee2 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,14 +21,12 @@ package de.staropensource.sosengine.base.logging;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogRule;
-import de.staropensource.sosengine.base.classes.logging.LogRuleType;
-import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.events.LogEvent;
-import de.staropensource.sosengine.base.logging.placeholders.logger.*;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 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.utility.PlaceholderEngine;
 import lombok.Getter;
@@ -206,7 +204,7 @@ public final class Logger {
         temporaryPlaceholders.add(new LogClass(issuer));
         temporaryPlaceholders.add(new LogColorPrimary(level));
         temporaryPlaceholders.add(new LogInfo(issuer));
-        temporaryPlaceholders.add(new de.staropensource.sosengine.base.logging.placeholders.logger.LogLevel(level));
+        temporaryPlaceholders.add(new de.staropensource.sosengine.base.internal.placeholders.logger.LogLevel(level));
         temporaryPlaceholders.add(new LogPackage(issuer));
         temporaryPlaceholders.add(new LogPath(issuer));
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/package-info.java
deleted file mode 100644
index 11db0068..00000000
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 placeholders used by the {@link de.staropensource.sosengine.base.logging.Logger} or {@link de.staropensource.sosengine.base.logging.CrashHandler}.
- *
- * @see de.staropensource.sosengine.base.logging.Logger
- * @see de.staropensource.sosengine.base.logging.CrashHandler
- */
-package de.staropensource.sosengine.base.logging.placeholders;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/DependencyResolvedDependencyVector.java b/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyResolvedDependencyVector.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/types/DependencyResolvedDependencyVector.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyResolvedDependencyVector.java
index 1fb8a6a4..79e40baf 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/DependencyResolvedDependencyVector.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyResolvedDependencyVector.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.dependency;
 
 import lombok.Getter;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/DependencyVector.java b/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyVector.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/types/DependencyVector.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyVector.java
index cc9da10d..21f827ee 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/DependencyVector.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyVector.java
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.dependency;
 
+import de.staropensource.sosengine.base.types.versioning.VersioningSystem;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/Vec2.java b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec2.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/Vec2.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec2.java
index cba132e1..bb9761a5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/Vec2.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.vectors;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/Vec2i.java b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec2i.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/Vec2i.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec2i.java
index ffbbf122..f938f76b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/Vec2i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec2i.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.vectors;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/Vec3.java b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec3.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/Vec3.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec3.java
index 034105f5..aca55964 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/Vec3.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec3.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.vectors;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/Vec3i.java b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec3i.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/Vec3i.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec3i.java
index 0a17e2be..3d834ae0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/Vec3i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/Vec3i.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.vectors;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java b/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersionType.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersionType.java
index 4d543169..ca09a0e1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersionType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.versioning;
 
 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/types/VersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersioningSystem.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/types/VersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersioningSystem.java
index 48a668cc..dbb70ca6 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/VersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.types.versioning;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import org.jetbrains.annotations.NotNull;
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 07ecac65..80ae351d 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,8 +21,8 @@ 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.DependencyResolvedDependencyVector;
-import de.staropensource.sosengine.base.types.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyResolvedDependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -36,7 +36,7 @@ import java.util.Map;
  * @since 1-alpha1
  */
 @SuppressWarnings({ "unused" })
-public class DependencyResolver {
+public final class DependencyResolver {
     /**
      * A list of {@link DependencyVector}s.
      *
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/ListFormatter.java b/base/src/main/java/de/staropensource/sosengine/base/utility/ListFormatter.java
index 7f097077..c16e9317 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/ListFormatter.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/ListFormatter.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * @since 1-alpha0
  */
 @SuppressWarnings({ "unused" })
-public class ListFormatter {
+public final class ListFormatter {
     /**
      * Constructs this class.
      */
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 7ddb20b8..0b20023b 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
@@ -22,7 +22,7 @@ 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.data.placeholder.*;
+import de.staropensource.sosengine.base.internal.placeholders.*;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java
similarity index 99%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java
rename to base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java
index c942dfb3..6b5a35c3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.utility;
+package de.staropensource.sosengine.base.utility.parser;
 
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
@@ -36,7 +36,7 @@ import java.util.Properties;
  */
 @SuppressWarnings({ "unused", "JavadocDeclaration", "JavadocBlankLines" })
 @NotNull
-public class PropertyParser {
+public final class PropertyParser {
     /**
      * Contains an instance providing access to the JVM-wide properties.
      *
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/StackTraceParser.java b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/StackTraceParser.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/StackTraceParser.java
rename to base/src/main/java/de/staropensource/sosengine/base/utility/parser/StackTraceParser.java
index 3a258ec8..cc97a06e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/StackTraceParser.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/StackTraceParser.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.utility;
+package de.staropensource.sosengine.base.utility.parser;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  * @since 1-alpha0
  */
 @SuppressWarnings({ "unused", "JavadocBlankLines" })
-public class StackTraceParser {
+public final class StackTraceParser {
     /**
      * The throwable to use.
      *
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java
index 2f722db4..e8bf10b7 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/PropertyParserTest.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.srctests.utility;
 
-import de.staropensource.sosengine.base.utility.PropertyParser;
+import de.staropensource.sosengine.base.utility.parser.PropertyParser;
 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/utility/StackTraceParserTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/StackTraceParserTest.java
index 8bf064c5..65e89117 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/StackTraceParserTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/StackTraceParserTest.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.srctests.utility;
 
-import de.staropensource.sosengine.base.utility.StackTraceParser;
+import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.DisplayName;
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java
index f406bc6e..70b8a562 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.opengl;
 
-import de.staropensource.sosengine.base.types.Vec2i;
+import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
 import de.staropensource.sosengine.graphics.opengl.classes.Window;
 import org.jetbrains.annotations.NotNull;
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 8217f3df..668a796b 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
@@ -28,7 +28,7 @@ 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.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
@@ -200,6 +200,6 @@ public final class OpenGlSubsystem implements ApiMainClass {
     /** {@inheritDoc} */
     @Override
     public DependencyVector getDependencyVector() {
-        return new DependencyVector("opengl", StarOpenSourceVersioningSystem.class, EngineInformation.getInstance().getVersioningString());
+        return new DependencyVector("opengl", StarOpenSourceVersioningSystem.class, EngineInformation.getVersioningString());
     }
 }
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 91dee682..36be063c 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
@@ -22,7 +22,7 @@ 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.Vec2i;
+import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.events.GraphicsApiErrorEvent;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
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 374fd8b4..d31cd5ab 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
@@ -27,10 +27,10 @@ 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.internal.InternalEngineShutdownEvent;
+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.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import de.staropensource.sosengine.base.utility.ListFormatter;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
@@ -150,7 +150,7 @@ public final class GraphicsSubsystem implements SubsystemMainClass {
     /** {@inheritDoc} */
     @Override
     public DependencyVector getDependencyVector() {
-        return new DependencyVector("graphics", StarOpenSourceVersioningSystem.class, EngineInformation.getInstance().getVersioningString());
+        return new DependencyVector("graphics", StarOpenSourceVersioningSystem.class, EngineInformation.getVersioningString());
     }
 
     /**
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 199ee30a..00278f68 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
@@ -23,7 +23,7 @@ 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.utility.PropertyParser;
+import de.staropensource.sosengine.base.utility.parser.PropertyParser;
 import de.staropensource.sosengine.graphics.events.GraphicsErrorEvent;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
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 d5d6c1bc..1ef88eea 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
@@ -23,7 +23,7 @@ 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.events.internal.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.graphics.events.GraphicsErrorEvent;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java
index 4eefa47e..2436b612 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.classes;
 
-import de.staropensource.sosengine.base.types.Vec2i;
+import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java
index 66ba42ea..ab177c20 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.classes;
 
-import de.staropensource.sosengine.base.types.Vec2i;
+import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.types.WindowMode;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java
index 884cb832..442ff5e6 100644
--- a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java
+++ b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.vulkan;
 
-import de.staropensource.sosengine.base.types.Vec2i;
+import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
 import de.staropensource.sosengine.graphics.classes.Window;
 import org.jetbrains.annotations.NotNull;
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 888707d1..b02fe826 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
@@ -27,7 +27,7 @@ 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.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
@@ -175,6 +175,6 @@ public final class VulkanSubsystem implements ApiMainClass {
     /** {@inheritDoc} */
     @Override
     public DependencyVector getDependencyVector() {
-        return new DependencyVector("vulkan", StarOpenSourceVersioningSystem.class, EngineInformation.getInstance().getVersioningString());
+        return new DependencyVector("vulkan", StarOpenSourceVersioningSystem.class, EngineInformation.getVersioningString());
     }
 }
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 54429bf0..06446caf 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
@@ -27,7 +27,7 @@ import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioning
 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.DependencyVector;
+import de.staropensource.sosengine.base.types.dependency.DependencyVector;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.Getter;
 import org.slf4j.LoggerFactory;
@@ -81,6 +81,6 @@ public class Slf4jCompatibilitySubsystem implements SubsystemMainClass {
     /** {@inheritDoc} */
     @Override
     public DependencyVector getDependencyVector() {
-        return new DependencyVector("slf4j-compat", StarOpenSourceVersioningSystem.class, EngineInformation.getInstance().getVersioningString());
+        return new DependencyVector("slf4j-compat", StarOpenSourceVersioningSystem.class, EngineInformation.getVersioningString());
     }
 }
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 a1169d1d..ed4f29d9 100644
--- a/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
+++ b/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
@@ -23,7 +23,7 @@ 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.Vec2i;
+import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;