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 7f34679d..222f1d91 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
@@ -26,7 +26,7 @@ import de.staropensource.sosengine.base.logging.CrashHandler;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.type.EngineState;
import de.staropensource.sosengine.base.type.logging.LogLevel;
-import de.staropensource.sosengine.base.type.vectors.Vec2f;
+import de.staropensource.sosengine.base.type.vector.Vec2f;
import de.staropensource.sosengine.base.utility.PropertiesReader;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2d.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2d.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2d.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2d.java
index dfc0e7e1..f9805ea2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2d.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2d.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
import de.staropensource.sosengine.base.EngineConfiguration;
import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2f.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2f.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2f.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2f.java
index 66865fcc..88d06c48 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2f.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2f.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
import de.staropensource.sosengine.base.EngineConfiguration;
import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2i.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2i.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2i.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2i.java
index 89c9599f..48485901 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec2i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec2i.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
import de.staropensource.sosengine.base.EngineConfiguration;
import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3d.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3d.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3d.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3d.java
index d055711f..2d3fd0b7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3d.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3d.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
import de.staropensource.sosengine.base.EngineConfiguration;
import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3f.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3f.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3f.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3f.java
index 5c138220..6a534ef0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3f.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3f.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
import de.staropensource.sosengine.base.EngineConfiguration;
import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3i.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3i.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3i.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3i.java
index 73f4c56b..e475ab14 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/Vec3i.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/Vec3i.java
@@ -17,7 +17,7 @@
* along with this program. If not, see .
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
import de.staropensource.sosengine.base.EngineConfiguration;
import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/type/vector/package-info.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/type/vectors/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/type/vector/package-info.java
index f01b6ef9..5e95f698 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/type/vectors/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/type/vector/package-info.java
@@ -22,4 +22,4 @@
*
* @since v1-alpha1
*/
-package de.staropensource.sosengine.base.type.vectors;
+package de.staropensource.sosengine.base.type.vector;
diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java
index bc4a3fdc..ef9ffed8 100644
--- a/base/src/main/java/module-info.java
+++ b/base/src/main/java/module-info.java
@@ -30,7 +30,7 @@ module sosengine.base {
exports de.staropensource.sosengine.base.type.immutable;
exports de.staropensource.sosengine.base.type.logging;
exports de.staropensource.sosengine.base.type.reflection;
- exports de.staropensource.sosengine.base.type.vectors;
+ exports de.staropensource.sosengine.base.type.vector;
exports de.staropensource.sosengine.base.utility;
exports de.staropensource.sosengine.base.implementation.shortcode;
exports de.staropensource.sosengine.unittest;
@@ -55,7 +55,7 @@ module sosengine.base {
opens de.staropensource.sosengine.base.type.immutable;
opens de.staropensource.sosengine.base.type.logging;
opens de.staropensource.sosengine.base.type.reflection;
- opens de.staropensource.sosengine.base.type.vectors;
+ opens de.staropensource.sosengine.base.type.vector;
opens de.staropensource.sosengine.base.utility;
opens de.staropensource.sosengine.base.implementation.shortcode;
opens de.staropensource.sosengine.unittest;
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 4eee7a45..974aad78 100644
--- a/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
+++ b/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
@@ -22,7 +22,7 @@ package de.staropensource.sosengine.testapp;
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.type.vector.Vec2i;
import de.staropensource.sosengine.base.utility.StackTraceParser;
import de.staropensource.sosengine.windowing.WindowingSubsystem;
import de.staropensource.sosengine.windowing.event.InputEvent;
diff --git a/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwMonitor.java b/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwMonitor.java
index 5a80c987..0628d337 100644
--- a/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwMonitor.java
+++ b/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwMonitor.java
@@ -19,7 +19,7 @@
package de.staropensource.sosengine.windowing.glfw.implementable;
-import de.staropensource.sosengine.base.type.vectors.Vec2i;
+import de.staropensource.sosengine.base.type.vector.Vec2i;
import de.staropensource.sosengine.windowing.implementable.Monitor;
import de.staropensource.sosengine.windowing.exception.InvalidMonitorException;
import lombok.SneakyThrows;
diff --git a/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwWindow.java b/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwWindow.java
index bbea485b..43eb51e0 100644
--- a/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwWindow.java
+++ b/windowing/glfw/src/main/java/de/staropensource/sosengine/windowing/glfw/implementable/GlfwWindow.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.windowing.glfw.implementable;
import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
import de.staropensource.sosengine.base.type.Tristate;
-import de.staropensource.sosengine.base.type.vectors.Vec2i;
+import de.staropensource.sosengine.base.type.vector.Vec2i;
import de.staropensource.sosengine.base.utility.Miscellaneous;
import de.staropensource.sosengine.windowing.WindowingSubsystemConfiguration;
import de.staropensource.sosengine.windowing.implementable.Monitor;
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Monitor.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Monitor.java
index e90dfb74..18b24caa 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Monitor.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Monitor.java
@@ -20,7 +20,7 @@
package de.staropensource.sosengine.windowing.implementable;
import de.staropensource.sosengine.base.logging.LoggerInstance;
-import de.staropensource.sosengine.base.type.vectors.Vec2i;
+import de.staropensource.sosengine.base.type.vector.Vec2i;
import de.staropensource.sosengine.windowing.WindowingSubsystem;
import de.staropensource.sosengine.windowing.exception.InvalidMonitorException;
import de.staropensource.sosengine.windowing.exception.NoMonitorsFoundException;
diff --git a/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Window.java b/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Window.java
index 1c24dd3a..e7f94cc5 100644
--- a/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Window.java
+++ b/windowing/src/main/java/de/staropensource/sosengine/windowing/implementable/Window.java
@@ -22,7 +22,7 @@ package de.staropensource.sosengine.windowing.implementable;
import de.staropensource.sosengine.base.exception.UnexpectedThrowableException;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.type.Tristate;
-import de.staropensource.sosengine.base.type.vectors.Vec2i;
+import de.staropensource.sosengine.base.type.vector.Vec2i;
import de.staropensource.sosengine.windowing.WindowingSubsystem;
import de.staropensource.sosengine.windowing.type.window.WindowMode;
import lombok.AccessLevel;