diff --git a/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java b/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java
index fce6eb90..4d575feb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java
@@ -19,8 +19,8 @@
 
 package de.staropensource.sosengine.base.annotations;
 
-import de.staropensource.sosengine.base.classes.Event;
-import de.staropensource.sosengine.base.classes.EventPriority;
+import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.events.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.annotation.*;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/Event.java b/base/src/main/java/de/staropensource/sosengine/base/classes/events/Event.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/Event.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/events/Event.java
index e622d557..8f400ef0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/Event.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/events/Event.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes;
+package de.staropensource.sosengine.base.classes.events;
 
 /**
  * Represents an event.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/EventPriority.java b/base/src/main/java/de/staropensource/sosengine/base/classes/events/EventPriority.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/EventPriority.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/events/EventPriority.java
index eab07977..fac956f7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/EventPriority.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/events/EventPriority.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes;
+package de.staropensource.sosengine.base.classes.events;
 
 import de.staropensource.sosengine.base.annotations.EventListener;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/events/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/classes/events/package-info.java
new file mode 100644
index 00000000..bade504b
--- /dev/null
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/events/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * STAROPENSOURCE ENGINE SOURCE FILE
+ * Copyright (c) 2024 The StarOpenSource Engine Contributors
+ * Licensed under the GNU Affero General Public License v3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Contains event-related interfaces and classes.
+ *
+ * @since 1-alpha1
+ */
+package de.staropensource.sosengine.base.classes.events;
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 42c133c5..46814201 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.classes.helpers;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.Event;
+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.utility.ListFormatter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/LoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/LoggerImpl.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
index 4be5e3e9..1c4dffae 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/LoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes;
+package de.staropensource.sosengine.base.classes.logging;
 
 import de.staropensource.sosengine.base.types.LogIssuer;
 import de.staropensource.sosengine.base.types.LogLevel;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/package-info.java
new file mode 100644
index 00000000..a228545f
--- /dev/null
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/logging/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * STAROPENSOURCE ENGINE SOURCE FILE
+ * Copyright (c) 2024 The StarOpenSource Engine Contributors
+ * Licensed under the GNU Affero General Public License v3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Contains logging-related interfaces and classes.
+ *
+ * @since 1-alpha1
+ */
+package de.staropensource.sosengine.base.classes.logging;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec2.java b/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/Vec2.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2.java
index 58698eb1..18185e36 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec2.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/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;
+package de.staropensource.sosengine.base.classes.types;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec2i.java b/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2i.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/Vec2i.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec2i.java
index 4d57989c..c86c5d91 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec2i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/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;
+package de.staropensource.sosengine.base.classes.types;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec3.java b/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/Vec3.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3.java
index 9ddfdcde..1e16273f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec3.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/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;
+package de.staropensource.sosengine.base.classes.types;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec3i.java b/base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3i.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/Vec3i.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/types/Vec3i.java
index 098e6b2b..4ee64dc7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/Vec3i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/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;
+package de.staropensource.sosengine.base.classes.types;
 
 import lombok.Getter;
 import lombok.Setter;
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
new file mode 100644
index 00000000..82bbd1c8
--- /dev/null
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/types/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * STAROPENSOURCE ENGINE SOURCE FILE
+ * Copyright (c) 2024 The StarOpenSource Engine Contributors
+ * Licensed under the GNU Affero General Public License v3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Contains data types.
+ *
+ * @since 1-alpha1
+ */
+package de.staropensource.sosengine.base.classes.types;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java
index 543b5a21..f2d073c5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.events;
 
-import de.staropensource.sosengine.base.classes.Event;
+import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
index f79280f7..d6ba2f4e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.events;
 
-import de.staropensource.sosengine.base.classes.Event;
+import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
index 7fc2fae9..16f1951d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.events;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.Event;
+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.helpers.EventHelper;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java
index dd5aa5b7..2dff0348 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.events;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.Event;
+import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java
index d5c6eff7..2dc2a05a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/internal/InternalEngineShutdownEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.events.internal;
 
-import de.staropensource.sosengine.base.classes.Event;
+import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/DefaultLoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/logging/DefaultLoggerImpl.java
index 1d28ce89..6e0257ba 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
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.logging;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.LoggerImpl;
+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.utility.ShortcodeConverter;
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 427a804f..c973011a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/Logger.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/Logger.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.logging;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.LoggerImpl;
+import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.events.LogEvent;
 import de.staropensource.sosengine.base.logging.placeholders.logger.*;
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 1568a899..cf18612e 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.Vec2i;
+import de.staropensource.sosengine.base.classes.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 7f1d97b3..f19cacc4 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
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.graphics.opengl;
 
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.EventPriority;
+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.LogIssuer;
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 9874e9e3..1a1fcf03 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,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.opengl.classes;
 
-import de.staropensource.sosengine.base.classes.Vec2i;
+import de.staropensource.sosengine.base.classes.types.Vec2i;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.LogIssuer;
 import de.staropensource.sosengine.graphics.events.GraphicsApiErrorEvent;
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 ee669b9a..add4873c 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.graphics;
 
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.EventPriority;
+import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.events.internal.InternalEngineShutdownEvent;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java
index 43f9d809..9ad97706 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.graphics.classes;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.EventPriority;
+import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
 import de.staropensource.sosengine.base.events.internal.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.graphics.events.GraphicsErrorEvent;
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 598b3f42..5634e89b 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.Vec2i;
+import de.staropensource.sosengine.base.classes.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 690485af..4fbd470f 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.Vec2i;
+import de.staropensource.sosengine.base.classes.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 ea3f75b0..f5354b75 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
@@ -1,6 +1,6 @@
 package de.staropensource.sosengine.graphics.events;
 
-import de.staropensource.sosengine.base.classes.Event;
+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;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java
index 4c75c4c1..e1e945bd 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.events;
 
-import de.staropensource.sosengine.base.classes.Event;
+import de.staropensource.sosengine.base.classes.events.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
index 7a1bc269..ed026ea8 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
@@ -1,6 +1,6 @@
 package de.staropensource.sosengine.graphics.events;
 
-import de.staropensource.sosengine.base.classes.Event;
+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;
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 d0cf618f..9937e716 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.Vec2i;
+import de.staropensource.sosengine.base.classes.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 2efef537..a559a676 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
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.graphics.vulkan;
 
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.EventPriority;
+import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.LogIssuer;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
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 8a214cec..b614afcf 100644
--- a/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
+++ b/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.testapp;
 
 import de.staropensource.sosengine.base.Engine;
-import de.staropensource.sosengine.base.classes.Vec2i;
+import de.staropensource.sosengine.base.classes.types.Vec2i;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.LogIssuer;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;