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 5bc8891a..04d91d0d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -30,7 +30,7 @@ import de.staropensource.sosengine.base.logging.CrashHandler;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.*;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
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 7506a440..74ead89b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
@@ -22,8 +22,8 @@ package de.staropensource.sosengine.base;
 import de.staropensource.sosengine.base.classes.SubsystemConfiguration;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.PropertyParser;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java b/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
index 46814201..58433485 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.annotations.EventListener;
 import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.logging.Logger;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.ListFormatter;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/LogIssuer.java b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogIssuer.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/LogIssuer.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogIssuer.java
index f57fbddd..896f720f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/LogIssuer.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogIssuer.java
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.classes.logging;
 
+import de.staropensource.sosengine.base.types.CodePart;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/LogLevel.java b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogLevel.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/LogLevel.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogLevel.java
index eed33eba..ad2ddd4d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/LogLevel.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogLevel.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.classes.logging;
 
 /**
  * Used for determining a log message's priority.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java
index b1a9cb0c..a8bdd532 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java
@@ -19,8 +19,6 @@
 
 package de.staropensource.sosengine.base.classes.logging;
 
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
index 1c4dffae..27034532 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
@@ -19,8 +19,6 @@
 
 package de.staropensource.sosengine.base.classes.logging;
 
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/types/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/classes/types/package-info.java
deleted file mode 100644
index 82bbd1c8..00000000
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/types/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * STAROPENSOURCE ENGINE SOURCE FILE
- * Copyright (c) 2024 The StarOpenSource Engine Contributors
- * Licensed under the GNU Affero General Public License v3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * Contains data types.
- *
- * @since 1-alpha1
- */
-package de.staropensource.sosengine.base.classes.types;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java b/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java
index d095fe15..bb21500d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.data.info;
 
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.types.VersionType;
 import de.staropensource.sosengine.base.utility.PropertyParser;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
index 16f1951d..ab68dd65 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
@@ -21,8 +21,8 @@ package de.staropensource.sosengine.base.events;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.classes.events.Event;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import org.jetbrains.annotations.NotNull;
 
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 40f7a32d..e7f50d6f 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,8 +24,8 @@ import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.events.EngineCrashEvent;
 import de.staropensource.sosengine.base.logging.placeholders.crashhandler.*;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/DefaultLoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/logging/DefaultLoggerImpl.java
index 6e0257ba..413a7634 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/DefaultLoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/DefaultLoggerImpl.java
@@ -21,8 +21,8 @@ package de.staropensource.sosengine.base.logging;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.ShortcodeConverter;
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
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 ed85fcf2..6bfc7877 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
@@ -27,8 +27,8 @@ import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.events.LogEvent;
 import de.staropensource.sosengine.base.logging.placeholders.logger.*;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java b/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java
index 8f7e4f90..e3ca0a18 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.logging;
 
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java b/base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java
index d0197396..efd6a941 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/QueuedLogMessage.java
@@ -19,8 +19,8 @@
 
 package de.staropensource.sosengine.base.logging;
 
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java
index e4e22878..2734ab86 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerClass.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java
index a4798851..b3c510da 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerCodePart.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java
index 3e58f480..cd9c7174 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerInfo.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java
index 2c10b23a..315bb8b0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPackage.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java
index 28c8b799..d5664d16 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/crashhandler/IssuerPath.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java
index 0af9677a..c4d15546 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogClass.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java
index fab827ee..f6d8066b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogCodePart.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java
index a32b6b7f..93c42c12 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorPrimary.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java
index 3ee08236..9bae45fc 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogColorSecondary.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java
index 0dc395ba..42a12ad8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogInfo.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java
index fe9c5cde..8af98b0c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogLevel.java
@@ -31,20 +31,20 @@ import org.jetbrains.annotations.NotNull;
 @SuppressWarnings({ "unused" })
 public final class LogLevel implements Placeholder {
     /**
-     * The {@link de.staropensource.sosengine.base.types.LogLevel} to use.
+     * The {@link de.staropensource.sosengine.base.classes.logging.LogLevel} to use.
      *
      * @since 1-alpha0
      */
     @NotNull
-    private final de.staropensource.sosengine.base.types.LogLevel level;
+    private final de.staropensource.sosengine.base.classes.logging.LogLevel level;
 
     /**
      * Constructor.
      *
-     * @param level the {@link de.staropensource.sosengine.base.types.LogLevel} to use
+     * @param level the {@link de.staropensource.sosengine.base.classes.logging.LogLevel} to use
      * @since 1-alpha0
      */
-    public LogLevel(@NotNull de.staropensource.sosengine.base.types.LogLevel level) {
+    public LogLevel(@NotNull de.staropensource.sosengine.base.classes.logging.LogLevel level) {
         this.level = level;
     }
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java
index 01784793..aa05d197 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPackage.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java
index 52ff4a14..c02776d6 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/placeholders/logger/LogPath.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java b/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java
index 110da5ea..a9d08b00 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java
@@ -19,6 +19,8 @@
 
 package de.staropensource.sosengine.base.types;
 
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+
 /**
  * Indicates whether the class belongs to the engine, application or modification.
  *
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Tristate.java b/base/src/main/java/de/staropensource/sosengine/base/types/Tristate.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/types/Tristate.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/Tristate.java
index 229b08ed..0fb0f417 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Tristate.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/Tristate.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.types;
+package de.staropensource.sosengine.base.types;
 
 /**
  * tl;dr just a boolean but it can be UNSET too.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2.java b/base/src/main/java/de/staropensource/sosengine/base/types/Vec2.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/Vec2.java
index 18185e36..eb7bf523 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/Vec2.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.types;
+package de.staropensource.sosengine.base.types;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2i.java b/base/src/main/java/de/staropensource/sosengine/base/types/Vec2i.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2i.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/Vec2i.java
index c86c5d91..2f0d3964 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/Vec2i.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.types;
+package de.staropensource.sosengine.base.types;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3.java b/base/src/main/java/de/staropensource/sosengine/base/types/Vec3.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/Vec3.java
index 1e16273f..564d7806 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/Vec3.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.types;
+package de.staropensource.sosengine.base.types;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3i.java b/base/src/main/java/de/staropensource/sosengine/base/types/Vec3i.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3i.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/Vec3i.java
index 4ee64dc7..95267fc7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/Vec3i.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.types;
+package de.staropensource.sosengine.base.types;
 
 import lombok.Getter;
 import lombok.Setter;
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 d3d19135..fb17ce5e 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
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.placeholders.*;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java b/base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java
index 24dd6c2b..e841e89b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/PropertyParser.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.utility;
 
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/ShortcodeConverter.java b/base/src/main/java/de/staropensource/sosengine/base/utility/ShortcodeConverter.java
index 7c2e6b64..f6a0f287 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/ShortcodeConverter.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/ShortcodeConverter.java
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import lombok.Getter;
 import org.fusesource.jansi.Ansi;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java b/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
index bc79f16b..118ccc03 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.unittests;
 
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 
 /**
  * Static configuration for the sos!engine unit testing helpers.
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java b/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
index a53a1e95..d0ced731 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.unittests;
 
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
index f6a67dd2..543edc37 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
@@ -1,7 +1,7 @@
 package de.staropensource.sosengine.base.srctests;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.jetbrains.annotations.NotNull;
 import org.joor.Reflect;
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java
index cf18612e..2b97212f 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlManagement.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.opengl;
 
-import de.staropensource.sosengine.base.classes.types.Vec2i;
+import de.staropensource.sosengine.base.types.Vec2i;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
 import de.staropensource.sosengine.graphics.opengl.classes.Window;
 import org.jetbrains.annotations.NotNull;
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
index f3f86907..ce8355e0 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
@@ -24,7 +24,7 @@ import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java
index 0ab72762..bcd49f64 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java
@@ -19,10 +19,10 @@
 
 package de.staropensource.sosengine.graphics.opengl.classes;
 
-import de.staropensource.sosengine.base.classes.types.Vec2i;
+import de.staropensource.sosengine.base.types.Vec2i;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.graphics.events.GraphicsApiErrorEvent;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
index c5c74166..54ca00a4 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
@@ -26,7 +26,7 @@ import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.events.internal.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.ListFormatter;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
index 84904eca..1a7c6067 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
@@ -22,7 +22,7 @@ package de.staropensource.sosengine.graphics;
 import de.staropensource.sosengine.base.classes.SubsystemConfiguration;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.PropertyParser;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java
index 5634e89b..4eefa47e 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiManagementClass.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.classes;
 
-import de.staropensource.sosengine.base.classes.types.Vec2i;
+import de.staropensource.sosengine.base.types.Vec2i;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java
index 4fbd470f..fceda4e1 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/Window.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.classes;
 
-import de.staropensource.sosengine.base.classes.types.Vec2i;
+import de.staropensource.sosengine.base.types.Vec2i;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java
index f5354b75..80f02c56 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java
@@ -2,8 +2,8 @@ package de.staropensource.sosengine.graphics.events;
 
 import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.events.LogEvent;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
index ed026ea8..9c60889a 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
@@ -2,8 +2,8 @@ package de.staropensource.sosengine.graphics.events;
 
 import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.events.LogEvent;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java
index 9937e716..708f6e00 100644
--- a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java
+++ b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanManagement.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.vulkan;
 
-import de.staropensource.sosengine.base.classes.types.Vec2i;
+import de.staropensource.sosengine.base.types.Vec2i;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
 import de.staropensource.sosengine.graphics.classes.Window;
 import org.jetbrains.annotations.NotNull;
diff --git a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java
index 2a86e5a8..27ed0342 100644
--- a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java
+++ b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.annotations.EventListener;
 import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
diff --git a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java
index 4f112304..6bda3d25 100644
--- a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java
+++ b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java
@@ -23,8 +23,8 @@ import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
-import de.staropensource.sosengine.base.types.LogLevel;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Marker;
diff --git a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java
index 1fb5ba9c..24e9f8f4 100644
--- a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java
+++ b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.classes.SubsystemMainClass;
 import de.staropensource.sosengine.base.events.LogEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import lombok.Getter;
 import org.slf4j.LoggerFactory;
 
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 e81c7ef4..1ffe7ce2 100644
--- a/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
+++ b/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
@@ -20,10 +20,10 @@
 package de.staropensource.sosengine.testapp;
 
 import de.staropensource.sosengine.base.Engine;
-import de.staropensource.sosengine.base.classes.types.Vec2i;
+import de.staropensource.sosengine.base.types.Vec2i;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.LogIssuer;
+import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;