diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystem.java b/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystem.java
index 323ab1a..de9885f 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystem.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystem.java
@@ -35,7 +35,7 @@ import de.staropensource.engine.rendering.event.RenderingErrorEvent;
 import de.staropensource.engine.rendering.exception.NotOnMainThreadException;
 import de.staropensource.engine.rendering.renderer.Renderer;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.window.Platform;
+import de.staropensource.engine.rendering.type.Platform;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystemConfiguration.java b/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystemConfiguration.java
index 82bf30d..d413c61 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystemConfiguration.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystemConfiguration.java
@@ -23,10 +23,10 @@ import de.staropensource.engine.base.implementable.Configuration;
 import de.staropensource.engine.base.logging.Logger;
 import de.staropensource.engine.base.utility.PropertiesReader;
 import de.staropensource.engine.rendering.event.RenderingErrorEvent;
-import de.staropensource.engine.rendering.type.window.Adapter;
-import de.staropensource.engine.rendering.type.window.Platform;
-import de.staropensource.engine.rendering.type.window.Renderer;
-import de.staropensource.engine.rendering.type.window.VsyncMode;
+import de.staropensource.engine.rendering.type.Adapter;
+import de.staropensource.engine.rendering.type.Platform;
+import de.staropensource.engine.rendering.type.Renderer;
+import de.staropensource.engine.rendering.type.VsyncMode;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/callback/KeyCallback.java b/rendering/src/main/java/de/staropensource/engine/rendering/callback/KeyCallback.java
index 985161d..a2cb504 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/callback/KeyCallback.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/callback/KeyCallback.java
@@ -21,8 +21,8 @@ package de.staropensource.engine.rendering.callback;
 
 import de.staropensource.engine.rendering.type.Window;
 import de.staropensource.engine.rendering.event.InputEvent;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFWKeyCallbackI;
 
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/callback/MouseButtonCallback.java b/rendering/src/main/java/de/staropensource/engine/rendering/callback/MouseButtonCallback.java
index bf121f0..75ad13b 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/callback/MouseButtonCallback.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/callback/MouseButtonCallback.java
@@ -21,8 +21,8 @@ package de.staropensource.engine.rendering.callback;
 
 import de.staropensource.engine.rendering.type.Window;
 import de.staropensource.engine.rendering.event.InputEvent;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFWMouseButtonCallbackI;
 
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/event/InputEvent.java b/rendering/src/main/java/de/staropensource/engine/rendering/event/InputEvent.java
index 7d2a7d1..b235207 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/event/InputEvent.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/event/InputEvent.java
@@ -24,8 +24,8 @@ import de.staropensource.engine.base.implementable.helper.EventHelper;
 import de.staropensource.engine.base.logging.Logger;
 import de.staropensource.engine.rendering.RenderingSubsystemConfiguration;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/renderer/RenderingCode.java b/rendering/src/main/java/de/staropensource/engine/rendering/renderer/RenderingCode.java
index cbc4a47..5ede7e7 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/renderer/RenderingCode.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/renderer/RenderingCode.java
@@ -25,7 +25,7 @@ import de.staropensource.engine.base.utility.misc.NumberUtil;
 import de.staropensource.engine.rendering.RenderingSubsystemConfiguration;
 import de.staropensource.engine.rendering.type.FrameHandler;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.window.VsyncMode;
+import de.staropensource.engine.rendering.type.VsyncMode;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/Adapter.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/Adapter.java
similarity index 96%
rename from rendering/src/main/java/de/staropensource/engine/rendering/type/window/Adapter.java
rename to rendering/src/main/java/de/staropensource/engine/rendering/type/Adapter.java
index 0b90d4b..44c9e11 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/Adapter.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/type/Adapter.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Represents all available adapters.
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/input/Key.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/Key.java
similarity index 99%
rename from rendering/src/main/java/de/staropensource/engine/rendering/type/input/Key.java
rename to rendering/src/main/java/de/staropensource/engine/rendering/type/Key.java
index 80fab58..db034a9 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/input/Key.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/type/Key.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.input;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Contains a list of keys which can be recognized by the engine.
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/input/KeyState.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/KeyState.java
similarity index 95%
rename from rendering/src/main/java/de/staropensource/engine/rendering/type/input/KeyState.java
rename to rendering/src/main/java/de/staropensource/engine/rendering/type/KeyState.java
index d5c981b..6513db9 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/input/KeyState.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/type/KeyState.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.input;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Contains in which state a key is.
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/Platform.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/Platform.java
similarity index 96%
rename from rendering/src/main/java/de/staropensource/engine/rendering/type/window/Platform.java
rename to rendering/src/main/java/de/staropensource/engine/rendering/type/Platform.java
index fb89b89..1d3fadb 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/Platform.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/type/Platform.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Represents all available platforms.
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/Renderer.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/Renderer.java
similarity index 97%
rename from rendering/src/main/java/de/staropensource/engine/rendering/type/window/Renderer.java
rename to rendering/src/main/java/de/staropensource/engine/rendering/type/Renderer.java
index 2bffc35..703e4b6 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/Renderer.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/type/Renderer.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Represents all available renderers.
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/VsyncMode.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/VsyncMode.java
similarity index 96%
rename from rendering/src/main/java/de/staropensource/engine/rendering/type/window/VsyncMode.java
rename to rendering/src/main/java/de/staropensource/engine/rendering/type/VsyncMode.java
index 9c09c9e..f321710 100644
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/VsyncMode.java
+++ b/rendering/src/main/java/de/staropensource/engine/rendering/type/VsyncMode.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 import de.staropensource.engine.rendering.RenderingSubsystemConfiguration;
 
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/input/package-info.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/input/package-info.java
deleted file mode 100644
index c8da5c5..0000000
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/input/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/>.
- */
-
-/**
- * Data types related to input.
- *
- * @since v1-alpha9
- */
-package de.staropensource.engine.rendering.type.input;
diff --git a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/package-info.java b/rendering/src/main/java/de/staropensource/engine/rendering/type/window/package-info.java
deleted file mode 100644
index 732b6dc..0000000
--- a/rendering/src/main/java/de/staropensource/engine/rendering/type/window/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/>.
- */
-
-/**
- * Data types related to windows.
- *
- * @since v1-alpha9
- */
-package de.staropensource.engine.rendering.type.window;
diff --git a/rendering/src/main/java/module-info.java b/rendering/src/main/java/module-info.java
index 8967a86..1625da0 100644
--- a/rendering/src/main/java/module-info.java
+++ b/rendering/src/main/java/module-info.java
@@ -22,8 +22,6 @@ module sosengine.rendering {
     exports de.staropensource.engine.rendering.exception;
     exports de.staropensource.engine.rendering.renderer;
     exports de.staropensource.engine.rendering.type;
-    exports de.staropensource.engine.rendering.type.input;
-    exports de.staropensource.engine.rendering.type.window;
 
     // Reflection access
     opens de.staropensource.engine.rendering;
@@ -31,6 +29,4 @@ module sosengine.rendering {
     opens de.staropensource.engine.rendering.exception;
     opens de.staropensource.engine.rendering.renderer;
     opens de.staropensource.engine.rendering.type;
-    opens de.staropensource.engine.rendering.type.input;
-    opens de.staropensource.engine.rendering.type.window;
 }
diff --git a/testapp/build.gradle b/testapp/build.gradle
index a6983b1..fa5a2b4 100644
--- a/testapp/build.gradle
+++ b/testapp/build.gradle
@@ -73,9 +73,15 @@ jar {
 application {
     mainClass.set("de.staropensource.engine.testapp.Main")
     applicationDefaultJvmArgs = [
+            "-XX:+UnlockDiagnosticVMOptions",
+
             // Display GC log
             //"-Xlog:gc",
-            
+
+            // Log compilation of methods
+            //"-XX:+PrintCompilation",
+            //"-XX:+PrintInlining",
+
             // Set log level to DIAGNOSTIC
             "-Dsosengine.base.logLevel=diagnostic",
 
diff --git a/testapp/src/main/java/de/staropensource/engine/testapp/Main.java b/testapp/src/main/java/de/staropensource/engine/testapp/Main.java
index 859d420..d0b8263 100644
--- a/testapp/src/main/java/de/staropensource/engine/testapp/Main.java
+++ b/testapp/src/main/java/de/staropensource/engine/testapp/Main.java
@@ -29,8 +29,8 @@ import de.staropensource.engine.rendering.event.InputEvent;
 import de.staropensource.engine.rendering.renderer.Renderer;
 import de.staropensource.engine.rendering.type.FrameHandler;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;