diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/types/VsyncMode.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/types/window/VsyncMode.java
similarity index 96%
rename from graphics/src/main/java/de/staropensource/sosengine/graphics/types/VsyncMode.java
rename to graphics/src/main/java/de/staropensource/sosengine/graphics/types/window/VsyncMode.java
index 620c05ec..abef5e47 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/types/VsyncMode.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/types/window/VsyncMode.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.graphics.types;
+package de.staropensource.sosengine.graphics.types.window;
 
 /**
  * Used for determining if and how a window's frame rate should be synchronized to the monitor's refresh rate.
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/types/WindowMode.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/types/window/WindowMode.java
similarity index 97%
rename from graphics/src/main/java/de/staropensource/sosengine/graphics/types/WindowMode.java
rename to graphics/src/main/java/de/staropensource/sosengine/graphics/types/window/WindowMode.java
index 267a4363..3b135dea 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/types/WindowMode.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/types/window/WindowMode.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.graphics.types;
+package de.staropensource.sosengine.graphics.types.window;
 
 /**
  * Determines how a window should be displayed.
diff --git a/graphics/src/main/java/module-info.java b/graphics/src/main/java/module-info.java
index 5b4f4c47..e54f0850 100644
--- a/graphics/src/main/java/module-info.java
+++ b/graphics/src/main/java/module-info.java
@@ -15,11 +15,11 @@ module sosengine.graphics {
     exports de.staropensource.sosengine.graphics;
     exports de.staropensource.sosengine.graphics.classes;
     exports de.staropensource.sosengine.graphics.events;
-    exports de.staropensource.sosengine.graphics.types;
+    exports de.staropensource.sosengine.graphics.types.window;
 
     // Reflection access
     opens de.staropensource.sosengine.graphics;
     opens de.staropensource.sosengine.graphics.classes;
     opens de.staropensource.sosengine.graphics.events;
-    opens de.staropensource.sosengine.graphics.types;
+    opens de.staropensource.sosengine.graphics.types.window;
 }