diff --git a/ansi/src/main/java/de/staropensource/sosengine/ansi/AnsiSubsystem.java b/ansi/src/main/java/de/staropensource/sosengine/ansi/AnsiSubsystem.java
index 9a8cb9a33..d7c77d31d 100644
--- a/ansi/src/main/java/de/staropensource/sosengine/ansi/AnsiSubsystem.java
+++ b/ansi/src/main/java/de/staropensource/sosengine/ansi/AnsiSubsystem.java
@@ -21,8 +21,8 @@ package de.staropensource.sosengine.ansi;
 
 import de.staropensource.sosengine.base.annotation.EngineSubsystem;
 import de.staropensource.sosengine.base.implementable.SubsystemClass;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.type.DependencyVector;
 import lombok.Getter;
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 8d8cd5272..2d886465d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -22,15 +22,15 @@ package de.staropensource.sosengine.base;
 import de.staropensource.sosengine.base.annotation.EngineSubsystem;
 import de.staropensource.sosengine.base.implementable.ShutdownHandler;
 import de.staropensource.sosengine.base.implementable.SubsystemClass;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.event.*;
-import de.staropensource.sosengine.base.exception.NoAccessException;
+import de.staropensource.sosengine.base.exception.NoCallAccessException;
 import de.staropensource.sosengine.base.exception.dependency.UnmetDependenciesException;
-import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
-import de.staropensource.sosengine.base.internal.types.DependencySubsystemVector;
+import de.staropensource.sosengine.base.internal.event.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.internal.type.DependencySubsystemVector;
 import de.staropensource.sosengine.base.logging.*;
 import de.staropensource.sosengine.base.type.DependencyVector;
 import de.staropensource.sosengine.base.type.EngineState;
@@ -523,12 +523,12 @@ public final class Engine extends SubsystemClass {
      * Sets the engine state.
      *
      * @param state new state
-     * @throws NoAccessException if the caller class is unauthorized
+     * @throws NoCallAccessException if the caller class is unauthorized
      * @since v1-alpha2
      */
-    public void setState(@NotNull EngineState state) throws NoAccessException {
+    public void setState(@NotNull EngineState state) throws NoCallAccessException {
         if (!Thread.currentThread().getStackTrace()[2].getClassName().startsWith("de.staropensource.sosengine.base."))
-            throw new NoAccessException("Only classes inside the \"de.staropensource.sosengine.base\" package are allowed to call this method.");
+            throw new NoCallAccessException("Only classes inside the \"de.staropensource.sosengine.base\" package are allowed to call this method.");
 
         this.state = state;
     }
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 692b82e45..7f34679d0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base;
 
 import de.staropensource.sosengine.base.implementable.ShortcodeParserSkeleton;
 import de.staropensource.sosengine.base.implementable.Configuration;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import de.staropensource.sosengine.base.logging.CrashHandler;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.type.EngineState;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/EngineInternals.java b/base/src/main/java/de/staropensource/sosengine/base/EngineInternals.java
index a84611623..0c45f0964 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineInternals.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineInternals.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base;
 
 import de.staropensource.sosengine.base.implementable.ShutdownHandler;
-import de.staropensource.sosengine.base.exception.NoAccessException;
+import de.staropensource.sosengine.base.exception.NoCallAccessException;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.InternalAccessArea;
 import lombok.Getter;
@@ -89,12 +89,12 @@ public final class EngineInternals {
      * Determines whether access to the specified area is allowed.
      *
      * @param area internal access area to check
-     * @throws NoAccessException when restricted
+     * @throws NoCallAccessException when restricted
      * @since v1-alpha4
      */
-    private void isRestricted(@NotNull InternalAccessArea area) throws NoAccessException {
+    private void isRestricted(@NotNull InternalAccessArea area) throws NoCallAccessException {
         if (restrictedAreas.contains(area))
-            throw new NoAccessException("The internal access area " + area.name() + " has been restricted");
+            throw new NoCallAccessException("The internal access area " + area.name() + " has been restricted");
     }
 
     /**
@@ -125,10 +125,10 @@ public final class EngineInternals {
      * Highly recommended to keep enabled.
      *
      * @param status {@code true} to install, {@code false} otherwise
-     * @throws NoAccessException when restricted
+     * @throws NoCallAccessException when restricted
      * @since v1-alpha4
      */
-    public void installSafetyShutdownHook(boolean status) throws NoAccessException {
+    public void installSafetyShutdownHook(boolean status) throws NoCallAccessException {
         isRestricted(InternalAccessArea.SAFETY_SHUTDOWN_HOOK);
 
         try {
@@ -145,10 +145,10 @@ public final class EngineInternals {
      * shutting down the JVM safely.
      *
      * @param shutdownHandler new shutdown handler
-     * @throws NoAccessException when restricted
+     * @throws NoCallAccessException when restricted
      * @since v1-alpha4
      */
-    public void setShutdownHandler(@NotNull ShutdownHandler shutdownHandler) throws NoAccessException {
+    public void setShutdownHandler(@NotNull ShutdownHandler shutdownHandler) throws NoCallAccessException {
         isRestricted(InternalAccessArea.SHUTDOWN_HANDLER_UPDATE);
         Engine.getInstance().setShutdownHandler(shutdownHandler);
     }
@@ -159,10 +159,10 @@ public final class EngineInternals {
      * shutting down the JVM safely.
      *
      * @return shutdown handler
-     * @throws NoAccessException when restricted
+     * @throws NoCallAccessException when restricted
      * @since v1-alpha4
      */
-    public @NotNull ShutdownHandler getShutdownHandler() throws NoAccessException {
+    public @NotNull ShutdownHandler getShutdownHandler() throws NoCallAccessException {
         isRestricted(InternalAccessArea.SHUTDOWN_HANDLER_GET);
         return Engine.getInstance().getShutdownHandler();
     }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/dataprovider/package-info.java
deleted file mode 100644
index 675cb5ec1..000000000
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * STAROPENSOURCE ENGINE SOURCE FILE
- * Copyright (c) 2024 The StarOpenSource Engine Authors
- * 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/>.
- */
-
-/**
- * Classes which provide or process information.
- *
- * @since v1-alpha0
- */
-package de.staropensource.sosengine.base.dataprovider;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/event/EngineCrashEvent.java b/base/src/main/java/de/staropensource/sosengine/base/event/EngineCrashEvent.java
index 616310cf4..0c603ac9b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/event/EngineCrashEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/event/EngineCrashEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 
 /**
  * Called in the event of an engine crash.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/event/EngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/event/EngineShutdownEvent.java
index a78e52ef2..5087647e9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/event/EngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/event/EngineShutdownEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 
 /**
  * Called when the engine is about to shutdown.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/event/EngineSoftCrashEvent.java b/base/src/main/java/de/staropensource/sosengine/base/event/EngineSoftCrashEvent.java
index 72e9ed88b..6dd436145 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/event/EngineSoftCrashEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/event/EngineSoftCrashEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import de.staropensource.sosengine.base.logging.Logger;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/event/LogEvent.java b/base/src/main/java/de/staropensource/sosengine/base/event/LogEvent.java
index 162df8356..ddb4be37e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/event/LogEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/event/LogEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/event/ThrowableCatchEvent.java b/base/src/main/java/de/staropensource/sosengine/base/event/ThrowableCatchEvent.java
index b6a1fd3a0..24b2182f5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/event/ThrowableCatchEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/event/ThrowableCatchEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/implementable/Event.java b/base/src/main/java/de/staropensource/sosengine/base/implementable/Event.java
index 8d2c546d7..309a10ed5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/implementable/Event.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementable/Event.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.implementable;
 
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 
 /**
  * Represents an event.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/implementable/SubsystemClass.java b/base/src/main/java/de/staropensource/sosengine/base/implementable/SubsystemClass.java
index 80b62d27b..b421e3e03 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/implementable/SubsystemClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementable/SubsystemClass.java
@@ -22,7 +22,7 @@ package de.staropensource.sosengine.base.implementable;
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.annotation.EngineSubsystem;
 import de.staropensource.sosengine.base.annotation.EventListener;
-import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.internal.event.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.DependencyVector;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/implementable/helpers/EventHelper.java b/base/src/main/java/de/staropensource/sosengine/base/implementable/helper/EventHelper.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/implementable/helpers/EventHelper.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementable/helper/EventHelper.java
index 8438024eb..06428de40 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/implementable/helpers/EventHelper.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementable/helper/EventHelper.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.implementable.helpers;
+package de.staropensource.sosengine.base.implementable.helper;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.annotation.EventListener;
@@ -26,7 +26,7 @@ import de.staropensource.sosengine.base.event.LogEvent;
 import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
 import de.staropensource.sosengine.base.exception.reflection.InstanceMethodFromStaticContextException;
 import de.staropensource.sosengine.base.exception.reflection.InvalidMethodSignature;
-import de.staropensource.sosengine.base.exception.reflection.NoAccessException;
+import de.staropensource.sosengine.base.exception.reflection.NoReflectionAccessException;
 import de.staropensource.sosengine.base.exception.reflection.StaticInitializerException;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.reflection.Reflect;
@@ -159,7 +159,7 @@ public final class EventHelper {
                     method.invoke(arguments);
                 } catch (UnexpectedThrowableException exception) {
                     logger.crash("Event listener method " + method.getName() + " could not be called as an error occurred during reflection", exception, true);
-                } catch (NoAccessException exception) {
+                } catch (NoReflectionAccessException exception) {
                     logger.warn("Event listener method " + method.getName() + " could not be called as the method could not be accessed");
                 } catch (InvalidMethodSignature exception) {
                     logger.warn("Event listener method " + method.getName() + " has an invalid method signature");
diff --git a/base/src/main/java/de/staropensource/sosengine/base/implementable/helpers/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/implementable/helper/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/implementable/helpers/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementable/helper/package-info.java
index 7e7373527..174a65c2a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/implementable/helpers/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementable/helper/package-info.java
@@ -23,4 +23,4 @@
  *
  * @since v1-alpha0
  */
-package de.staropensource.sosengine.base.implementable.helpers;
+package de.staropensource.sosengine.base.implementable.helper;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImplementation.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/PlainLoggerImplementation.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImplementation.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/logging/PlainLoggerImplementation.java
index c01e24eee..2f7cbb941 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImplementation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/PlainLoggerImplementation.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.implementation;
+package de.staropensource.sosengine.base.implementation.logging;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.implementable.LoggerImplementation;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
-import de.staropensource.sosengine.base.utility.converter.EmptyShortcodeConverter;
+import de.staropensource.sosengine.base.implementation.shortcode.EmptyShortcodeConverter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/QuietLoggerImplementation.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/QuietLoggerImplementation.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/implementation/QuietLoggerImplementation.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/logging/QuietLoggerImplementation.java
index 2f8aab95e..164803a1c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/QuietLoggerImplementation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/QuietLoggerImplementation.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.implementation;
+package de.staropensource.sosengine.base.implementation.logging;
 
 import de.staropensource.sosengine.base.implementable.LoggerImplementation;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImplementation.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/RawLoggerImplementation.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImplementation.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/logging/RawLoggerImplementation.java
index 4431939a1..0e562b904 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImplementation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/RawLoggerImplementation.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.logging.implementation;
+package de.staropensource.sosengine.base.implementation.logging;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.implementable.LoggerImplementation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/logging/implementation/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/logging/package-info.java
index 1df974953..3f42c6af4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/logging/package-info.java
@@ -22,4 +22,4 @@
  *
  * @since v1-alpha1
  */
-package de.staropensource.sosengine.base.logging.implementation;
+package de.staropensource.sosengine.base.implementation.logging;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/shortcode/EmptyShortcodeConverter.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/shortcode/EmptyShortcodeConverter.java
index 9344b101b..1197341c3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/shortcode/EmptyShortcodeConverter.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.utility.converter;
+package de.staropensource.sosengine.base.implementation.shortcode;
 
 import de.staropensource.sosengine.base.implementable.ShortcodeParserSkeleton;
 import de.staropensource.sosengine.base.exception.ParserException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/shortcode/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/converter/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/shortcode/package-info.java
index 6f8ebe6d9..d6444160a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/shortcode/package-info.java
@@ -22,4 +22,4 @@
  *
  * @since v1-alpha1
  */
-package de.staropensource.sosengine.base.utility.converter;
+package de.staropensource.sosengine.base.implementation.shortcode;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/FourNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/FourNumberVersioningSystem.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/FourNumberVersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/FourNumberVersioningSystem.java
index be102b7eb..61f7299b4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/FourNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/FourNumberVersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
 
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.IncompatibleVersioningSystemException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/OneNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/OneNumberVersioningSystem.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/OneNumberVersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/OneNumberVersioningSystem.java
index 87d333b7d..5314c13b1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/OneNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/OneNumberVersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
 
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.IncompatibleVersioningSystemException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/SemanticVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/SemanticVersioningSystem.java
similarity index 99%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/SemanticVersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/SemanticVersioningSystem.java
index 4746ad42b..c52f919c7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/SemanticVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/SemanticVersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
 
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.IncompatibleVersioningSystemException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/StarOpenSourceVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/StarOpenSourceVersioningSystem.java
similarity index 99%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/StarOpenSourceVersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/StarOpenSourceVersioningSystem.java
index 7282e335a..af115a65d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/StarOpenSourceVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/StarOpenSourceVersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
 
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.IncompatibleVersioningSystemException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/ThreeNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/ThreeNumberVersioningSystem.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/ThreeNumberVersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/ThreeNumberVersioningSystem.java
index 7a712f95c..53fa93459 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/ThreeNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/ThreeNumberVersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
 
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.IncompatibleVersioningSystemException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/TwoNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/TwoNumberVersioningSystem.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/TwoNumberVersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/TwoNumberVersioningSystem.java
index fb54e82d8..d70d14b9c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/TwoNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/TwoNumberVersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
 
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.IncompatibleVersioningSystemException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/package-info.java
index 7ef3ca839..4ba1e544b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/versioning/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/implementation/versioning/package-info.java
@@ -23,4 +23,4 @@
  *
  * @since v1-alpha1
  */
-package de.staropensource.sosengine.base.dataprovider.versioning;
+package de.staropensource.sosengine.base.implementation.versioning;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/internal/event/InternalEngineShutdownEvent.java
similarity index 91%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/event/InternalEngineShutdownEvent.java
index 3edd6e7ed..46e38f2d3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/event/InternalEngineShutdownEvent.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.events;
+package de.staropensource.sosengine.base.internal.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 
 /**
  * Called when the engine is about to shutdown, after {@link de.staropensource.sosengine.base.event.EngineShutdownEvent}.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/events/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/event/package-info.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/events/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/event/package-info.java
index c7157e8fd..c982e90a4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/events/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/event/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.internal.events;
+package de.staropensource.sosengine.base.internal.event;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateDay.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateDay.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateDay.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateDay.java
index 9792e2a98..6dadfaed1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateDay.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateDay.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateMonth.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateMonth.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateMonth.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateMonth.java
index 09db01ed5..c4469874d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateMonth.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateMonth.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateYear.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateYear.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateYear.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateYear.java
index 40e411c38..a1c084b89 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/DateYear.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/DateYear.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJansi.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyJansi.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJansi.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyJansi.java
index 1cf2d0a64..bb1ef3d83 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyJansi.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyJansi.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLwjgl.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyLwjgl.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLwjgl.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyLwjgl.java
index 05711ad4b..1bba5f614 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyLwjgl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyLwjgl.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyReflections.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyReflections.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyReflections.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyReflections.java
index a4de6a97f..2b8e08555 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencyReflections.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencyReflections.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencySlf4j.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencySlf4j.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencySlf4j.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencySlf4j.java
index 63edf8e88..bb5d98a1b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineDependencySlf4j.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineDependencySlf4j.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitBranch.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitBranch.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitBranch.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitBranch.java
index ee74f12e1..bb60bf0c0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitBranch.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitBranch.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitHeader.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitHeader.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitHeader.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitHeader.java
index b0431a869..e0d62d086 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitHeader.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitHeader.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdLong.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitIdLong.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdLong.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitIdLong.java
index d81b35438..60fd6f1fe 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdLong.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitIdLong.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdShort.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitIdShort.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdShort.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitIdShort.java
index 200e9abd0..0b4079a47 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitIdShort.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitIdShort.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeDay.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeDay.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeDay.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeDay.java
index 03ff02b25..5b691c5c8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeDay.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeDay.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeHour.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeHour.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeHour.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeHour.java
index 2ec7ee878..9bc4621cb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeHour.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeHour.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMinute.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeMinute.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMinute.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeMinute.java
index e13d844ec..acf3baf6d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMinute.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeMinute.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMonth.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeMonth.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMonth.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeMonth.java
index f764a0476..d7aad7127 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeMonth.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeMonth.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeSecond.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeSecond.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeSecond.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeSecond.java
index 0007e427e..14a0ecc35 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeSecond.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeSecond.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeYear.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeYear.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeYear.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeYear.java
index b77005546..5fcf85b38 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitTimeYear.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitTimeYear.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommits.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommits.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommits.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommits.java
index b28f68ec7..a6e4c3b28 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommits.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommits.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterEmail.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitterEmail.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterEmail.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitterEmail.java
index 72827fbe3..5e6be6fdb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterEmail.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitterEmail.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterName.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitterName.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterName.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitterName.java
index 4e8e2273b..9a130e93b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitCommitterName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitCommitterName.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitDirty.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitDirty.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitDirty.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitDirty.java
index cdbcfed73..201c2fd5a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineGitDirty.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineGitDirty.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersion.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersion.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersion.java
index 95e87f694..47f841d73 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionFork.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionFork.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionFork.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionFork.java
index 353fdf85d..62724b9e1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionFork.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionFork.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionType.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionType.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionType.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionType.java
index 6b9fe178b..6c044056a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionType.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionTyperelease.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionTyperelease.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionTyperelease.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionTyperelease.java
index e987e1563..a054f5cd9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionTyperelease.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionTyperelease.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionVersion.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionVersion.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionVersion.java
index 2a8b29e83..037a7663a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/EngineVersionVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/EngineVersionVersion.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmArguments.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmArguments.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmArguments.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmArguments.java
index 597b9dc84..9d4dc3501 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmArguments.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmArguments.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationName.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationName.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationName.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationName.java
index 4f6d86dde..70f2f111a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationName.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVendor.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationVendor.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVendor.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationVendor.java
index 92775d53a..4a1bb5102 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVendor.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationVendor.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVersion.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationVersion.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationVersion.java
index 97678206b..da89ea92a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmImplementationVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmImplementationVersion.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmJava.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmJava.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmJava.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmJava.java
index 875fa16e6..a1d9a1328 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmJava.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmJava.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmUptime.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmUptime.java
similarity index 90%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmUptime.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmUptime.java
index 3065da8ca..4db9800ac 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/JvmUptime.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/JvmUptime.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.dataprovider.information.JvmInformation;
+import de.staropensource.sosengine.base.utility.information.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeEpoch.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeEpoch.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeEpoch.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeEpoch.java
index 45c6a56a5..35df363a3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeEpoch.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeEpoch.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeHour.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeHour.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeHour.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeHour.java
index a2f48221e..27812d8cb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeHour.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeHour.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeMinute.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeMinute.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeMinute.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeMinute.java
index 2dd636348..c2542c122 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeMinute.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeMinute.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeSecond.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeSecond.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeSecond.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeSecond.java
index 3b97d2b1c..5925c07c1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeSecond.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeSecond.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Math;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeZone.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeZone.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeZone.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeZone.java
index c9e7f76c6..ae44bdd24 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/TimeZone.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/TimeZone.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/CrashMessage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/CrashMessage.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/CrashMessage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/CrashMessage.java
index e95aa5dff..a17c1e699 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/CrashMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/CrashMessage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerClass.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerClass.java
index 550de98f6..521c585cc 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerClass.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerMetadata.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerMetadata.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerMetadata.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerMetadata.java
index 3cd36cbd6..cb23ef926 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerMetadata.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerMetadata.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerOrigin.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerOrigin.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerOrigin.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerOrigin.java
index 929f44df8..4a9f0791d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerOrigin.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerOrigin.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerPackage.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerPackage.java
index 2e5af20ca..ace7a41e7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerPackage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerPath.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerPath.java
index de2706a00..efdf0f826 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/IssuerPath.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/Stacktrace.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/Stacktrace.java
index 2ba067fe8..d33bde775 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/Stacktrace.java
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
-import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
+import de.staropensource.sosengine.base.utility.StackTraceParser;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/StacktraceAll.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/StacktraceAll.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/StacktraceAll.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/StacktraceAll.java
index 5a1cca655..b6ee2811f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/StacktraceAll.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/StacktraceAll.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/package-info.java
similarity index 91%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/package-info.java
index 57658c650..6b1496d3a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/crashhandler/package-info.java
@@ -23,4 +23,4 @@
  * @see de.staropensource.sosengine.base.logging.CrashHandler
  * @since v1-alpha0
  */
-package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogClass.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogClass.java
index 1fa725631..7ca489fe5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogClass.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogColorPrimary.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogColorPrimary.java
index 713446016..5a2daa98d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogColorPrimary.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogColorSecondary.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogColorSecondary.java
index afda5865b..8b050ef98 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogColorSecondary.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogLevel.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogLevel.java
index 5b55415e8..ea65ebff0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogLevel.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogMetadata.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogMetadata.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogMetadata.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogMetadata.java
index a28c7b400..59b91c148 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogMetadata.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogMetadata.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogOrigin.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogOrigin.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogOrigin.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogOrigin.java
index 5f8bc8872..633f92de3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogOrigin.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogOrigin.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogPackage.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogPackage.java
index d86861bda..96e44a9b8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogPackage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogPath.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogPath.java
index 1ee3eb460..cb2bc8597 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/LogPath.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
 
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/package-info.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/package-info.java
index 6b4f8bc50..4dd99837b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/logger/package-info.java
@@ -23,4 +23,4 @@
  * @see de.staropensource.sosengine.base.logging.Logger
  * @since v1-alpha0
  */
-package de.staropensource.sosengine.base.internal.placeholders.logger;
+package de.staropensource.sosengine.base.internal.implementation.placeholder.logger;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/package-info.java
index 44fe448be..74111d8f9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/implementation/placeholder/package-info.java
@@ -27,4 +27,4 @@
  * @see de.staropensource.sosengine.base.implementable.Placeholder
  * @since v1-alpha0
  */
-package de.staropensource.sosengine.base.internal.placeholders;
+package de.staropensource.sosengine.base.internal.implementation.placeholder;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/reflection/ReflectionAccessWidener.java b/base/src/main/java/de/staropensource/sosengine/base/internal/reflection/ReflectionAccessWidener.java
index cb6693719..cc2c45116 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/reflection/ReflectionAccessWidener.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/reflection/ReflectionAccessWidener.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.reflection;
 
 import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
-import de.staropensource.sosengine.base.exception.reflection.NoAccessException;
+import de.staropensource.sosengine.base.exception.reflection.NoReflectionAccessException;
 import de.staropensource.sosengine.base.reflection.ReflectionField;
 import de.staropensource.sosengine.base.reflection.ReflectionMethod;
 
@@ -67,11 +67,11 @@ public final class ReflectionAccessWidener {
      * @param reflectionField {@link ReflectionField} to unlock
      * @return updated modifiers. pass those to {@link #lockModifications(ReflectionField, int)} to lock the field again
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the field has been denied
+     * @throws NoReflectionAccessException            if access to the field has been denied
      * @see #lockModifications(ReflectionField, int)
      * @since v1-alpha2
      */
-    public static int unlockModifications(ReflectionField reflectionField) throws UnexpectedThrowableException, NoAccessException {
+    public static int unlockModifications(ReflectionField reflectionField) throws UnexpectedThrowableException, NoReflectionAccessException {
         int updatedModifiers = 0;
         Field field = reflectionField.getField();
 
@@ -92,7 +92,7 @@ public final class ReflectionAccessWidener {
         try {
             modifiersField.setInt(field, field.getModifiers() & ~updatedModifiers);
         } catch (IllegalAccessException exception) {
-            throw new NoAccessException("field", field.getName());
+            throw new NoReflectionAccessException("field", field.getName());
         }
 
         return updatedModifiers;
@@ -104,11 +104,11 @@ public final class ReflectionAccessWidener {
      * @param reflectionMethod {@link ReflectionMethod} to unlock
      * @return updated modifiers. pass those to {@link #lockModifications(ReflectionMethod, int)} to lock the method again
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the method has been denied
+     * @throws NoReflectionAccessException            if access to the method has been denied
      * @see #lockModifications(ReflectionMethod, int)
      * @since v1-alpha2
      */
-    public static int unlockModifications(ReflectionMethod reflectionMethod) throws UnexpectedThrowableException, NoAccessException {
+    public static int unlockModifications(ReflectionMethod reflectionMethod) throws UnexpectedThrowableException, NoReflectionAccessException {
         Method method = reflectionMethod.getMethod();
         int updatedModifiers = method.getModifiers();
 
@@ -136,7 +136,7 @@ public final class ReflectionAccessWidener {
         try {
             modifiersField.setInt(method, method.getModifiers() & ~updatedModifiers);
         } catch (IllegalAccessException exception) {
-            throw new NoAccessException("method", method.getName());
+            throw new NoReflectionAccessException("method", method.getName());
         }
 
         return updatedModifiers;
@@ -148,11 +148,11 @@ public final class ReflectionAccessWidener {
      * @param reflectionField  {@link ReflectionField} to lock
      * @param updatedModifiers original modifiers
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the field has been denied
+     * @throws NoReflectionAccessException            if access to the field has been denied
      * @see #unlockModifications(ReflectionField)
      * @since v1-alpha2
      */
-    public static void lockModifications(ReflectionField reflectionField, int updatedModifiers) throws UnexpectedThrowableException, NoAccessException {
+    public static void lockModifications(ReflectionField reflectionField, int updatedModifiers) throws UnexpectedThrowableException, NoReflectionAccessException {
         Field field = reflectionField.getField();
 
         Field modifiersField;
@@ -167,7 +167,7 @@ public final class ReflectionAccessWidener {
         try {
             modifiersField.setInt(field, field.getModifiers() & ~updatedModifiers);
         } catch (IllegalAccessException exception) {
-            throw new NoAccessException("field", field.getName());
+            throw new NoReflectionAccessException("field", field.getName());
         }
 
         modifiersField.setAccessible(false);
@@ -179,11 +179,11 @@ public final class ReflectionAccessWidener {
      * @param reflectionMethod {@link ReflectionMethod} to lock
      * @param updatedModifiers original modifiers
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the method has been denied
+     * @throws NoReflectionAccessException            if access to the method has been denied
      * @see #unlockModifications(ReflectionMethod)
      * @since v1-alpha2
      */
-    public static void lockModifications(ReflectionMethod reflectionMethod, int updatedModifiers) throws UnexpectedThrowableException, NoAccessException {
+    public static void lockModifications(ReflectionMethod reflectionMethod, int updatedModifiers) throws UnexpectedThrowableException, NoReflectionAccessException {
         Method method = reflectionMethod.getMethod();
 
         Field modifiersField;
@@ -198,7 +198,7 @@ public final class ReflectionAccessWidener {
         try {
             modifiersField.setInt(method, method.getModifiers() & ~updatedModifiers);
         } catch (IllegalAccessException exception) {
-            throw new NoAccessException("method", method.getName());
+            throw new NoReflectionAccessException("method", method.getName());
         }
 
         modifiersField.setAccessible(false);
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/types/DependencySubsystemVector.java b/base/src/main/java/de/staropensource/sosengine/base/internal/type/DependencySubsystemVector.java
similarity index 99%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/types/DependencySubsystemVector.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/type/DependencySubsystemVector.java
index c4b474887..927d211bf 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/types/DependencySubsystemVector.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/type/DependencySubsystemVector.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.types;
+package de.staropensource.sosengine.base.internal.type;
 
 import de.staropensource.sosengine.base.implementable.SubsystemClass;
 import de.staropensource.sosengine.base.implementable.VersioningSystem;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/type/QueuedLogMessage.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/type/QueuedLogMessage.java
index 86a453a1b..b814d930a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/type/QueuedLogMessage.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.internal.types;
+package de.staropensource.sosengine.base.internal.type;
 
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/types/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/internal/type/package-info.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/internal/types/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/type/package-info.java
index ad9f2ab5c..cf35277d5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/types/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/type/package-info.java
@@ -23,4 +23,4 @@
  *
  * @since v1-alpha1
  */
-package de.staropensource.sosengine.base.internal.types;
+package de.staropensource.sosengine.base.internal.type;
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 54a5cd917..c09f829d0 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
@@ -24,7 +24,7 @@ import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.implementable.Placeholder;
 import de.staropensource.sosengine.base.event.EngineCrashEvent;
 import de.staropensource.sosengine.base.event.EngineSoftCrashEvent;
-import de.staropensource.sosengine.base.internal.placeholders.crashhandler.*;
+import de.staropensource.sosengine.base.internal.implementation.placeholder.crashhandler.*;
 import de.staropensource.sosengine.base.type.EngineState;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/InitLogger.java b/base/src/main/java/de/staropensource/sosengine/base/logging/InitLogger.java
index 64cafba5d..12dece506 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/InitLogger.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/InitLogger.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.internal.placeholders.logger.LogPath;
+import de.staropensource.sosengine.base.internal.implementation.placeholder.logger.LogPath;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -67,7 +67,7 @@ public final class InitLogger {
 
         // Replace placeholders
         // This is done manually to avoid depending on PlaceholderEngine
-        base = new de.staropensource.sosengine.base.internal.placeholders.logger.LogLevel(level).replace(base);
+        base = new de.staropensource.sosengine.base.internal.implementation.placeholder.logger.LogLevel(level).replace(base);
         base = new LogPath(issuerClass).replace(base);
         base = base.replace("%log_message%", message.replace("\n", ""));
 
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 bdc290b64..c2eb6e3c3 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
@@ -22,17 +22,17 @@ package de.staropensource.sosengine.base.logging;
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.implementable.LoggerImplementation;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import de.staropensource.sosengine.base.event.LogEvent;
-import de.staropensource.sosengine.base.internal.placeholders.logger.*;
-import de.staropensource.sosengine.base.internal.types.QueuedLogMessage;
-import de.staropensource.sosengine.base.logging.implementation.PlainLoggerImplementation;
+import de.staropensource.sosengine.base.internal.implementation.placeholder.logger.*;
+import de.staropensource.sosengine.base.internal.type.QueuedLogMessage;
+import de.staropensource.sosengine.base.implementation.logging.PlainLoggerImplementation;
 import de.staropensource.sosengine.base.type.EngineState;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
 import de.staropensource.sosengine.base.type.logging.LogRule;
 import de.staropensource.sosengine.base.type.logging.LogRuleType;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
-import de.staropensource.sosengine.base.utility.converter.EmptyShortcodeConverter;
+import de.staropensource.sosengine.base.implementation.shortcode.EmptyShortcodeConverter;
 import lombok.Getter;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
@@ -205,7 +205,7 @@ public final class Logger {
 
         // Replace logger placeholders (no colors)
         format = new LogClass(issuerClass).replace(format);
-        format = new de.staropensource.sosengine.base.internal.placeholders.logger.LogLevel(level).replace(format);
+        format = new de.staropensource.sosengine.base.internal.implementation.placeholder.logger.LogLevel(level).replace(format);
         format = new LogMetadata(issuerMetadata).replace(format);
         format = new LogOrigin(issuerOrigin).replace(format);
         format = new LogPackage(issuerClass).replace(format);
diff --git a/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionField.java b/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionField.java
index a028fed57..bbdd596a9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionField.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionField.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.reflection;
 
 import de.staropensource.sosengine.base.exception.UnexpectedCheckEndException;
 import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
-import de.staropensource.sosengine.base.exception.reflection.NoAccessException;
+import de.staropensource.sosengine.base.exception.reflection.NoReflectionAccessException;
 import de.staropensource.sosengine.base.internal.reflection.ReflectionAccessWidener;
 import de.staropensource.sosengine.base.type.reflection.VisibilityModifier;
 import lombok.Getter;
@@ -159,10 +159,10 @@ public final class ReflectionField {
      *
      * @param newValue new presence of the {@code final} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setFinal(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setFinal(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isFinal() == newValue)
             return;
@@ -182,7 +182,7 @@ public final class ReflectionField {
         try {
             modifiersField.setInt(field, modifiersField.getInt(field) & ~Modifier.FINAL);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -194,10 +194,10 @@ public final class ReflectionField {
      *
      * @param newValue new presence of the {@code static} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setStatic(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setStatic(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isStatic() == newValue)
             return;
@@ -217,7 +217,7 @@ public final class ReflectionField {
         try {
             modifiersField.setInt(field, modifiersField.getInt(field) & ~Modifier.STATIC);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -229,10 +229,10 @@ public final class ReflectionField {
      *
      * @param newValue new presence of the {@code transient} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setTransient(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setTransient(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isTransient() == newValue)
             return;
@@ -252,7 +252,7 @@ public final class ReflectionField {
         try {
             modifiersField.setInt(field, modifiersField.getInt(field) & ~Modifier.TRANSIENT);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -264,10 +264,10 @@ public final class ReflectionField {
      *
      * @param newValue new presence of the {@code volatile} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setVolatile(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setVolatile(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isVolatile() == newValue)
             return;
@@ -287,7 +287,7 @@ public final class ReflectionField {
         try {
             modifiersField.setInt(field, modifiersField.getInt(field) & ~Modifier.VOLATILE);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -341,14 +341,14 @@ public final class ReflectionField {
      * Updates the field with a new value.
      *
      * @param newValue new value
-     * @throws NoAccessException if access to the field has been denied
+     * @throws NoReflectionAccessException if access to the field has been denied
      * @since v1-alpha2
      */
-    public void setValue(Object newValue) throws NoAccessException {
+    public void setValue(Object newValue) throws NoReflectionAccessException {
         try {
             field.set(parentClass, newValue);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", getName());
+            throw new NoReflectionAccessException("field", getName());
         }
     }
 
@@ -356,14 +356,14 @@ public final class ReflectionField {
      * Updates the field with a new value.
      *
      * @return field's value
-     * @throws NoAccessException if access to the field has been denied
+     * @throws NoReflectionAccessException if access to the field has been denied
      * @since v1-alpha2
      */
-    public Object getValue() throws NoAccessException {
+    public Object getValue() throws NoReflectionAccessException {
         try {
             return field.get(parentClass);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", getName());
+            throw new NoReflectionAccessException("field", getName());
         }
     }
 }
diff --git a/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionMethod.java b/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionMethod.java
index faba44e67..00943a065 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionMethod.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/reflection/ReflectionMethod.java
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.exception.UnexpectedCheckEndException;
 import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
 import de.staropensource.sosengine.base.exception.reflection.InstanceMethodFromStaticContextException;
 import de.staropensource.sosengine.base.exception.reflection.InvalidMethodSignature;
-import de.staropensource.sosengine.base.exception.reflection.NoAccessException;
+import de.staropensource.sosengine.base.exception.reflection.NoReflectionAccessException;
 import de.staropensource.sosengine.base.exception.reflection.StaticInitializerException;
 import de.staropensource.sosengine.base.internal.reflection.ReflectionAccessWidener;
 import de.staropensource.sosengine.base.type.reflection.VisibilityModifier;
@@ -163,10 +163,10 @@ public final class ReflectionMethod {
      *
      * @param newValue new presence of the {@code final} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setFinal(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setFinal(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isFinal() == newValue)
             return;
@@ -186,7 +186,7 @@ public final class ReflectionMethod {
         try {
             modifiersField.setInt(method, modifiersField.getInt(method) & ~Modifier.FINAL);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -198,10 +198,10 @@ public final class ReflectionMethod {
      *
      * @param newValue new presence of the {@code static} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setStatic(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setStatic(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isStatic() == newValue)
             return;
@@ -221,7 +221,7 @@ public final class ReflectionMethod {
         try {
             modifiersField.setInt(method, modifiersField.getInt(method) & ~Modifier.STATIC);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -233,10 +233,10 @@ public final class ReflectionMethod {
      *
      * @param newValue new presence of the {@code abstract} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setAbstract(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setAbstract(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isAbstract() == newValue)
             return;
@@ -256,7 +256,7 @@ public final class ReflectionMethod {
         try {
             modifiersField.setInt(method, modifiersField.getInt(method) & ~Modifier.ABSTRACT);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -268,10 +268,10 @@ public final class ReflectionMethod {
      *
      * @param newValue new presence of the {@code synchronized} modifier
      * @throws UnexpectedThrowableException if the {@code modifiers} field is missing
-     * @throws NoAccessException            if access to the {@code modifiers} field has been denied
+     * @throws NoReflectionAccessException            if access to the {@code modifiers} field has been denied
      * @since v1-alpha2
      */
-    public void setSynchronized(boolean newValue) throws UnexpectedThrowableException, NoAccessException {
+    public void setSynchronized(boolean newValue) throws UnexpectedThrowableException, NoReflectionAccessException {
         // Don't do anything if the new value already matches the current value
         if (isSynchronized() == newValue)
             return;
@@ -291,7 +291,7 @@ public final class ReflectionMethod {
         try {
             modifiersField.setInt(method, modifiersField.getInt(method) & ~Modifier.SYNCHRONIZED);
         } catch (IllegalAccessException e) {
-            throw new NoAccessException("field", "modifiers");
+            throw new NoReflectionAccessException("field", "modifiers");
         }
 
         // Lock modifications
@@ -348,14 +348,14 @@ public final class ReflectionMethod {
      * @param args arguments to pass
      * @return method return value
      * @throws UnexpectedThrowableException             if the {@code modifiers} field could not be found
-     * @throws NoAccessException                        if access to the method has been denied
+     * @throws NoReflectionAccessException                        if access to the method has been denied
      * @throws InvalidMethodSignature                   if the method signature is incorrect
      * @throws InvocationTargetException                covers exceptions thrown by the method
      * @throws InstanceMethodFromStaticContextException when the target method is non-static and called from a static context
      * @throws StaticInitializerException               when an the static initializer fails
      * @since v1-alpha2
      */
-    public @Nullable Object invoke(Object... args) throws UnexpectedThrowableException, NoAccessException, InvalidMethodSignature, InvocationTargetException, InstanceMethodFromStaticContextException, StaticInitializerException {
+    public @Nullable Object invoke(Object... args) throws UnexpectedThrowableException, NoReflectionAccessException, InvalidMethodSignature, InvocationTargetException, InstanceMethodFromStaticContextException, StaticInitializerException {
         Object returnValue;
 
         // Allow access to method
@@ -366,7 +366,7 @@ public final class ReflectionMethod {
             returnValue = method.invoke(parentClass, args);
         } catch (IllegalAccessException exception) {
             //ReflectionAccessWidener.lockModifications(this, updatedModifiers);  // Lock method before throwing exception
-            throw new NoAccessException("method", getName());
+            throw new NoReflectionAccessException("method", getName());
         } catch (IllegalArgumentException exception) {
             throw new InvalidMethodSignature(getName());
         } catch (NullPointerException exception) {
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/VersionType.java b/base/src/main/java/de/staropensource/sosengine/base/type/VersionType.java
index 5e832f030..83cf71edf 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/VersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/VersionType.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.type;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
 
 /**
  * Provides all available version types specified in the StarOpenSource Versioning System v2.
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 70ff8f187..d75ab7e41 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.utility;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.implementable.Placeholder;
-import de.staropensource.sosengine.base.internal.placeholders.*;
+import de.staropensource.sosengine.base.internal.implementation.placeholder.*;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/parser/StackTraceParser.java b/base/src/main/java/de/staropensource/sosengine/base/utility/StackTraceParser.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/parser/StackTraceParser.java
rename to base/src/main/java/de/staropensource/sosengine/base/utility/StackTraceParser.java
index c45e2d1b1..f5a79de61 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/parser/StackTraceParser.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/StackTraceParser.java
@@ -17,9 +17,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.utility.parser;
+package de.staropensource.sosengine.base.utility;
 
-import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/EngineInformation.java b/base/src/main/java/de/staropensource/sosengine/base/utility/information/EngineInformation.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/EngineInformation.java
rename to base/src/main/java/de/staropensource/sosengine/base/utility/information/EngineInformation.java
index 7930e5960..c731c10fb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/EngineInformation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/information/EngineInformation.java
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.information;
+package de.staropensource.sosengine.base.utility.information;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.VersionType;
 import de.staropensource.sosengine.base.utility.PropertiesReader;
-import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
+import de.staropensource.sosengine.base.utility.StackTraceParser;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/JvmInformation.java b/base/src/main/java/de/staropensource/sosengine/base/utility/information/JvmInformation.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/JvmInformation.java
rename to base/src/main/java/de/staropensource/sosengine/base/utility/information/JvmInformation.java
index 0b8598330..7f2e621a4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/JvmInformation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/information/JvmInformation.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.dataprovider.information;
+package de.staropensource.sosengine.base.utility.information;
 
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/utility/information/package-info.java
similarity index 93%
rename from base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/utility/information/package-info.java
index 19a878f64..bbb9cbeae 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/dataprovider/information/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/information/package-info.java
@@ -22,4 +22,4 @@
  *
  * @since v1-alpha0
  */
-package de.staropensource.sosengine.base.dataprovider.information;
+package de.staropensource.sosengine.base.utility.information;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/parser/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/package-info.java
deleted file mode 100644
index b7abb086b..000000000
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/parser/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * STAROPENSOURCE ENGINE SOURCE FILE
- * Copyright (c) 2024 The StarOpenSource Engine Authors
- * 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/>.
- */
-
-/**
- * Classes which parse data and providing that data in simple ways.
- *
- * @since v1-alpha1
- */
-package de.staropensource.sosengine.base.utility.parser;
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java b/base/src/main/java/de/staropensource/sosengine/unittest/UnitConfig.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
rename to base/src/main/java/de/staropensource/sosengine/unittest/UnitConfig.java
index 36072d86d..a3d9b690e 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittest/UnitConfig.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.unittests;
+package de.staropensource.sosengine.unittest;
 
 import de.staropensource.sosengine.base.type.logging.LogLevel;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java b/base/src/main/java/de/staropensource/sosengine/unittest/UnitLogger.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
rename to base/src/main/java/de/staropensource/sosengine/unittest/UnitLogger.java
index 1edec2cae..7ef1cdb5c 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittest/UnitLogger.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.unittests;
+package de.staropensource.sosengine.unittest;
 
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.logging.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/package-info.java b/base/src/main/java/de/staropensource/sosengine/unittest/package-info.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/unittests/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/unittest/package-info.java
index f38d2e917..b28c0428c 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittest/package-info.java
@@ -23,4 +23,4 @@
  *
  * @since v1-alpha0
  */
-package de.staropensource.sosengine.unittests;
+package de.staropensource.sosengine.unittest;
diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java
index a9d831736..bc4a3fdc7 100644
--- a/base/src/main/java/module-info.java
+++ b/base/src/main/java/module-info.java
@@ -14,17 +14,17 @@ module sosengine.base {
     exports de.staropensource.sosengine.base;
     exports de.staropensource.sosengine.base.annotation;
     exports de.staropensource.sosengine.base.implementable;
-    exports de.staropensource.sosengine.base.implementable.helpers;
-    exports de.staropensource.sosengine.base.dataprovider.information;
-    exports de.staropensource.sosengine.base.dataprovider.versioning;
+    exports de.staropensource.sosengine.base.implementable.helper;
+    exports de.staropensource.sosengine.base.utility.information;
+    exports de.staropensource.sosengine.base.implementation.versioning;
     exports de.staropensource.sosengine.base.event;
     exports de.staropensource.sosengine.base.exception;
     exports de.staropensource.sosengine.base.exception.dependency;
     exports de.staropensource.sosengine.base.exception.reflection;
     exports de.staropensource.sosengine.base.exception.versioning;
-    exports de.staropensource.sosengine.base.internal.events;  // Internal: Required for subsystems
+    exports de.staropensource.sosengine.base.internal.event;  // Internal: Required for subsystems
     exports de.staropensource.sosengine.base.logging;
-    exports de.staropensource.sosengine.base.logging.implementation;
+    exports de.staropensource.sosengine.base.implementation.logging;
     exports de.staropensource.sosengine.base.reflection;
     exports de.staropensource.sosengine.base.type;
     exports de.staropensource.sosengine.base.type.immutable;
@@ -32,25 +32,24 @@ module sosengine.base {
     exports de.staropensource.sosengine.base.type.reflection;
     exports de.staropensource.sosengine.base.type.vectors;
     exports de.staropensource.sosengine.base.utility;
-    exports de.staropensource.sosengine.base.utility.converter;
-    exports de.staropensource.sosengine.base.utility.parser;
-    exports de.staropensource.sosengine.unittests;
+    exports de.staropensource.sosengine.base.implementation.shortcode;
+    exports de.staropensource.sosengine.unittest;
 
     // Reflection access
     opens de.staropensource.sosengine.base;
     opens de.staropensource.sosengine.base.annotation;
     opens de.staropensource.sosengine.base.implementable;
-    opens de.staropensource.sosengine.base.implementable.helpers;
-    opens de.staropensource.sosengine.base.dataprovider.information;
-    opens de.staropensource.sosengine.base.dataprovider.versioning;
+    opens de.staropensource.sosengine.base.implementable.helper;
+    opens de.staropensource.sosengine.base.utility.information;
+    opens de.staropensource.sosengine.base.implementation.versioning;
     opens de.staropensource.sosengine.base.event;
     opens de.staropensource.sosengine.base.exception;
     opens de.staropensource.sosengine.base.exception.dependency;
     opens de.staropensource.sosengine.base.exception.reflection;
     opens de.staropensource.sosengine.base.exception.versioning;
-    opens de.staropensource.sosengine.base.internal.events;  // Internal: Required for subsystems
+    opens de.staropensource.sosengine.base.internal.event;  // Internal: Required for subsystems
     opens de.staropensource.sosengine.base.logging;
-    opens de.staropensource.sosengine.base.logging.implementation;
+    opens de.staropensource.sosengine.base.implementation.logging;
     opens de.staropensource.sosengine.base.reflection;
     opens de.staropensource.sosengine.base.type;
     opens de.staropensource.sosengine.base.type.immutable;
@@ -58,7 +57,6 @@ module sosengine.base {
     opens de.staropensource.sosengine.base.type.reflection;
     opens de.staropensource.sosengine.base.type.vectors;
     opens de.staropensource.sosengine.base.utility;
-    opens de.staropensource.sosengine.base.utility.converter;
-    opens de.staropensource.sosengine.base.utility.parser;
-    opens de.staropensource.sosengine.unittests;
+    opens de.staropensource.sosengine.base.implementation.shortcode;
+    opens de.staropensource.sosengine.unittest;
 }
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/TestBase.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/TestBase.java
index c93b87b8f..5df680cec 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/TestBase.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/TestBase.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.srctests;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineInternals;
-import de.staropensource.sosengine.unittests.UnitLogger;
+import de.staropensource.sosengine.unittest.UnitLogger;
 import lombok.Getter;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/FourNumberVersioningSystemTest.java
similarity index 93%
rename from base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java
rename to base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/FourNumberVersioningSystemTest.java
index 2a0f513fe..aec2f792a 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/FourNumberVersioningSystemTest.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.srctests.data.versioning;
+package de.staropensource.sosengine.base.srctests.implementation.versioning;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.FourNumberVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.FourNumberVersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.srctests.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/OneNumberVersioningSystemTest.java
similarity index 89%
rename from base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java
rename to base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/OneNumberVersioningSystemTest.java
index 4ad83ecc7..5299444d0 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/OneNumberVersioningSystemTest.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.srctests.data.versioning;
+package de.staropensource.sosengine.base.srctests.implementation.versioning;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.OneNumberVersioningSystem;
-import de.staropensource.sosengine.base.dataprovider.versioning.TwoNumberVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.OneNumberVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.TwoNumberVersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.srctests.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/SemanticVersioningSystemTest.java
similarity index 94%
rename from base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java
rename to base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/SemanticVersioningSystemTest.java
index ee181a64d..ead22f2e5 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/SemanticVersioningSystemTest.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.srctests.data.versioning;
+package de.staropensource.sosengine.base.srctests.implementation.versioning;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.SemanticVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.SemanticVersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.srctests.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/StarOpenSourceVersioningSystemTest.java
similarity index 91%
rename from base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java
rename to base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/StarOpenSourceVersioningSystemTest.java
index 56f63af5c..e95ca0a21 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/StarOpenSourceVersioningSystemTest.java
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.srctests.data.versioning;
+package de.staropensource.sosengine.base.srctests.implementation.versioning;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.SemanticVersioningSystem;
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.SemanticVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.srctests.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/ThreeNumberVersioningSystemTest.java
similarity index 93%
rename from base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java
rename to base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/ThreeNumberVersioningSystemTest.java
index a2e3f30ca..b16096772 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/ThreeNumberVersioningSystemTest.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.srctests.data.versioning;
+package de.staropensource.sosengine.base.srctests.implementation.versioning;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.ThreeNumberVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.ThreeNumberVersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.srctests.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/TwoNumberVersioningSystemTest.java
similarity index 93%
rename from base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java
rename to base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/TwoNumberVersioningSystemTest.java
index ee4ad5bc6..53039ec3f 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/implementation/versioning/TwoNumberVersioningSystemTest.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.srctests.data.versioning;
+package de.staropensource.sosengine.base.srctests.implementation.versioning;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.TwoNumberVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.TwoNumberVersioningSystem;
 import de.staropensource.sosengine.base.exception.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.srctests.TestBase;
 import org.junit.jupiter.api.DisplayName;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/DependencyResolverTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/DependencyResolverTest.java
index b5fb62b03..54a90d02b 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/DependencyResolverTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/utility/DependencyResolverTest.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.srctests.utility;
 
-import de.staropensource.sosengine.base.dataprovider.versioning.OneNumberVersioningSystem;
+import de.staropensource.sosengine.base.implementation.versioning.OneNumberVersioningSystem;
 import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
 import de.staropensource.sosengine.base.exception.dependency.UnmetDependenciesException;
 import de.staropensource.sosengine.base.srctests.TestBase;
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 3574cf5f0..acf5b0dbe 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
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.srctests.utility;
 
 import de.staropensource.sosengine.base.srctests.TestBase;
-import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
+import de.staropensource.sosengine.base.utility.StackTraceParser;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLoggerProvider.java b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLoggerProvider.java
index b4b49874f..8023ebd8e 100644
--- a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLoggerProvider.java
+++ b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLoggerProvider.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.slf4j_compat;
 
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.ILoggerFactory;
diff --git a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatSubsystem.java b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatSubsystem.java
index 710229093..ef8e0e354 100644
--- a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatSubsystem.java
+++ b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatSubsystem.java
@@ -21,8 +21,8 @@ package de.staropensource.sosengine.slf4j_compat;
 
 import de.staropensource.sosengine.base.annotation.EngineSubsystem;
 import de.staropensource.sosengine.base.implementable.SubsystemClass;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.event.LogEvent;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.type.DependencyVector;
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 a63b425f3..4eee7a455 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.annotation.EventListener;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.vectors.Vec2i;
-import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
+import de.staropensource.sosengine.base.utility.StackTraceParser;
 import de.staropensource.sosengine.windowing.WindowingSubsystem;
 import de.staropensource.sosengine.windowing.event.InputEvent;
 import de.staropensource.sosengine.windowing.implementable.Window;
diff --git a/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/GlfwSubsystem.java b/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/GlfwSubsystem.java
index 720ee01df..501b49d57 100644
--- a/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/GlfwSubsystem.java
+++ b/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/GlfwSubsystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.windowing.glfw;
 
 import de.staropensource.sosengine.base.annotation.EngineSubsystem;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.DependencyVector;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/WindowingSubsystem.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/WindowingSubsystem.java
index cb6d494bb..589c89eb4 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/WindowingSubsystem.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/WindowingSubsystem.java
@@ -22,10 +22,10 @@ package de.staropensource.sosengine.windowing;
 import de.staropensource.sosengine.base.annotation.EngineSubsystem;
 import de.staropensource.sosengine.base.annotation.EventListener;
 import de.staropensource.sosengine.base.implementable.SubsystemClass;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
-import de.staropensource.sosengine.base.dataprovider.information.EngineInformation;
-import de.staropensource.sosengine.base.dataprovider.versioning.StarOpenSourceVersioningSystem;
-import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
+import de.staropensource.sosengine.base.utility.information.EngineInformation;
+import de.staropensource.sosengine.base.implementation.versioning.StarOpenSourceVersioningSystem;
+import de.staropensource.sosengine.base.internal.event.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.type.DependencyVector;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/InputEvent.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/InputEvent.java
index f1828e0f1..096907184 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/InputEvent.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/InputEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.windowing.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.windowing.WindowingSubsystemConfiguration;
 import de.staropensource.sosengine.windowing.implementable.Window;
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/RenderingErrorEvent.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/RenderingErrorEvent.java
index 7ec6538bc..ec48506c4 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/RenderingErrorEvent.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/RenderingErrorEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.windowing.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingErrorEvent.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingErrorEvent.java
index 2fcca436a..f1312c6ac 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingErrorEvent.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingErrorEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.windowing.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingShutdownEvent.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingShutdownEvent.java
index 45fbe9081..ec47a1f7f 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingShutdownEvent.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/event/WindowingShutdownEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.windowing.event;
 
 import de.staropensource.sosengine.base.implementable.Event;
-import de.staropensource.sosengine.base.implementable.helpers.EventHelper;
+import de.staropensource.sosengine.base.implementable.helper.EventHelper;
 
 /**
  * Called when the windowing API shuts down.