diff --git a/src/main/java/com/pixelgamelibrary/api/WindowMode.java b/src/main/java/com/pixelgamelibrary/api/DisplayMode.java
similarity index 97%
rename from src/main/java/com/pixelgamelibrary/api/WindowMode.java
rename to src/main/java/com/pixelgamelibrary/api/DisplayMode.java
index d49704f..782f4ca 100644
--- a/src/main/java/com/pixelgamelibrary/api/WindowMode.java
+++ b/src/main/java/com/pixelgamelibrary/api/DisplayMode.java
@@ -24,7 +24,7 @@ package com.pixelgamelibrary.api;
  *
  * @author robertvokac
  */
-public enum WindowMode {
+public enum DisplayMode {
 
     WINDOW, FULLSCREEN;
 }
diff --git a/src/main/java/com/pixelgamelibrary/api/OnSetScreenListener.java b/src/main/java/com/pixelgamelibrary/api/OnSetScreenListener.java
index 0fce302..524376c 100644
--- a/src/main/java/com/pixelgamelibrary/api/OnSetScreenListener.java
+++ b/src/main/java/com/pixelgamelibrary/api/OnSetScreenListener.java
@@ -20,6 +20,8 @@
 
 package com.pixelgamelibrary.api;
 
+import com.pixelgamelibrary.api.screen.Screen;
+
 /**
  *
  * @author robertvokac
diff --git a/src/main/java/com/pixelgamelibrary/api/PixelApplication.java b/src/main/java/com/pixelgamelibrary/api/PixelApplication.java
index 38d89a7..e31c37c 100644
--- a/src/main/java/com/pixelgamelibrary/api/PixelApplication.java
+++ b/src/main/java/com/pixelgamelibrary/api/PixelApplication.java
@@ -19,6 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 package com.pixelgamelibrary.api;
 
+import com.pixelgamelibrary.api.game.Game;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/Game.java b/src/main/java/com/pixelgamelibrary/api/game/Game.java
similarity index 87%
rename from src/main/java/com/pixelgamelibrary/api/Game.java
rename to src/main/java/com/pixelgamelibrary/api/game/Game.java
index 129a484..ce5f4bd 100644
--- a/src/main/java/com/pixelgamelibrary/api/Game.java
+++ b/src/main/java/com/pixelgamelibrary/api/game/Game.java
@@ -17,7 +17,11 @@
 // <https://www.gnu.org/licenses/> or write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
-package com.pixelgamelibrary.api;
+package com.pixelgamelibrary.api.game;
+
+import com.pixelgamelibrary.api.ApplicationListener;
+import com.pixelgamelibrary.api.OnSetScreenListener;
+import com.pixelgamelibrary.api.screen.Screen;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/GameAdapter.java b/src/main/java/com/pixelgamelibrary/api/game/GameAdapter.java
similarity index 94%
rename from src/main/java/com/pixelgamelibrary/api/GameAdapter.java
rename to src/main/java/com/pixelgamelibrary/api/game/GameAdapter.java
index 47ce18b..85cff41 100644
--- a/src/main/java/com/pixelgamelibrary/api/GameAdapter.java
+++ b/src/main/java/com/pixelgamelibrary/api/game/GameAdapter.java
@@ -18,7 +18,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api;
+package com.pixelgamelibrary.api.game;
+
+import com.pixelgamelibrary.api.OnSetScreenListener;
+import com.pixelgamelibrary.api.screen.Screen;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/GameWrapper.java b/src/main/java/com/pixelgamelibrary/api/game/GameWrapper.java
similarity index 93%
rename from src/main/java/com/pixelgamelibrary/api/GameWrapper.java
rename to src/main/java/com/pixelgamelibrary/api/game/GameWrapper.java
index 4455191..d775298 100644
--- a/src/main/java/com/pixelgamelibrary/api/GameWrapper.java
+++ b/src/main/java/com/pixelgamelibrary/api/game/GameWrapper.java
@@ -18,7 +18,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api;
+package com.pixelgamelibrary.api.game;
+
+import com.pixelgamelibrary.api.OnSetScreenListener;
+import com.pixelgamelibrary.api.screen.Screen;
 
 
 /**
diff --git a/src/main/java/com/pixelgamelibrary/api/interfaces/App.java b/src/main/java/com/pixelgamelibrary/api/interfaces/App.java
index 831bcc7..1ba6b4f 100644
--- a/src/main/java/com/pixelgamelibrary/api/interfaces/App.java
+++ b/src/main/java/com/pixelgamelibrary/api/interfaces/App.java
@@ -21,7 +21,7 @@ package com.pixelgamelibrary.api.interfaces;
 
 import com.pixelgamelibrary.api.PixelFeature;
 import com.pixelgamelibrary.api.Platform;
-import com.pixelgamelibrary.api.Game;
+import com.pixelgamelibrary.api.game.Game;
 import com.pixelgamelibrary.api.utils.ClipBoard;
 import com.pixelgamelibrary.api.utils.LogLevel;
 import com.pixelgamelibrary.api.utils.Preferences;
diff --git a/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java b/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java
index ea9b0c1..84958ae 100644
--- a/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java
+++ b/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java
@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 package com.pixelgamelibrary.api.interfaces;
 
-import com.pixelgamelibrary.api.WindowMode;
+import com.pixelgamelibrary.api.DisplayMode;
 import com.pixelgamelibrary.api.utils.Monitor;
 import java.util.List;
 
@@ -29,7 +29,7 @@ import java.util.List;
  */
 public interface Graphics {
     boolean setToOriginalDisplayMode();
-    WindowMode setDisplayMode(boolean fullscreen, boolean window);
+    DisplayMode setDisplayMode(boolean fullscreen, boolean window);
     List<Monitor> getMonitors();
     
 }
diff --git a/src/main/java/com/pixelgamelibrary/api/Screen.java b/src/main/java/com/pixelgamelibrary/api/screen/Screen.java
similarity index 92%
rename from src/main/java/com/pixelgamelibrary/api/Screen.java
rename to src/main/java/com/pixelgamelibrary/api/screen/Screen.java
index 1f1b956..b0d46c1 100644
--- a/src/main/java/com/pixelgamelibrary/api/Screen.java
+++ b/src/main/java/com/pixelgamelibrary/api/screen/Screen.java
@@ -17,7 +17,9 @@
 // <https://www.gnu.org/licenses/> or write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
-package com.pixelgamelibrary.api;
+package com.pixelgamelibrary.api.screen;
+
+import com.pixelgamelibrary.api.ApplicationListener;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/ScreenAdapter.java b/src/main/java/com/pixelgamelibrary/api/screen/ScreenAdapter.java
similarity index 94%
rename from src/main/java/com/pixelgamelibrary/api/ScreenAdapter.java
rename to src/main/java/com/pixelgamelibrary/api/screen/ScreenAdapter.java
index 8e6f2eb..df02f71 100644
--- a/src/main/java/com/pixelgamelibrary/api/ScreenAdapter.java
+++ b/src/main/java/com/pixelgamelibrary/api/screen/ScreenAdapter.java
@@ -17,7 +17,9 @@
 // <https://www.gnu.org/licenses/> or write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
-package com.pixelgamelibrary.api;
+package com.pixelgamelibrary.api.screen;
+
+import com.pixelgamelibrary.api.game.Game;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/ScreenWrapper.java b/src/main/java/com/pixelgamelibrary/api/screen/ScreenWrapper.java
similarity index 97%
rename from src/main/java/com/pixelgamelibrary/api/ScreenWrapper.java
rename to src/main/java/com/pixelgamelibrary/api/screen/ScreenWrapper.java
index c54148b..cf996dc 100644
--- a/src/main/java/com/pixelgamelibrary/api/ScreenWrapper.java
+++ b/src/main/java/com/pixelgamelibrary/api/screen/ScreenWrapper.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api;
+package com.pixelgamelibrary.api.screen;
 
 
 /**
diff --git a/src/main/java/com/pixelgamelibrary/api/utils/TmpFileRegistry.java b/src/main/java/com/pixelgamelibrary/api/utils/TmpFileRegistry.java
new file mode 100644
index 0000000..a8fe664
--- /dev/null
+++ b/src/main/java/com/pixelgamelibrary/api/utils/TmpFileRegistry.java
@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////////////////////
+// Pixel: Game library.
+// Copyright (C) 2024 the original author or authors.
+//
+// This program is free software: you can redistribute it and/or
+// modify it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
+// <https://www.gnu.org/licenses/> or write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.pixelgamelibrary.api.utils;
+
+/**
+ *
+ * @author robertvokac
+ */
+public class TmpFileRegistry {
+    public TmpFileRegistry() {
+//todo
+    }
+    
+}
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java b/src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java
index 530fa42..c06dc4e 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java
@@ -19,7 +19,7 @@ import com.pixelgamelibrary.api.interfaces.Internal;
 import com.pixelgamelibrary.api.interfaces.Net;
 import com.pixelgamelibrary.api.interfaces.Utils;
 import com.pixelgamelibrary.api.interfaces.App;
-import com.pixelgamelibrary.api.Game;
+import com.pixelgamelibrary.api.game.Game;
 import com.pixelgamelibrary.api.PixelFeature;
 import com.pixelgamelibrary.api.utils.ClipBoard;
 import com.pixelgamelibrary.api.utils.LogLevel;