diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java
index 2d28be3..8a6a03e 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java
@@ -22,7 +22,7 @@ package com.pixelgamelibrary.backend.libgdx;
 import com.pixelgamelibrary.api.audio.Music;
 import com.pixelgamelibrary.api.audio.Sound;
 import com.pixelgamelibrary.api.interfaces.Audio;
-import com.pixelgamelibrary.api.storage.FileHandle;
+import com.pixelgamelibrary.api.files.FileHandle;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java
index fac48e4..9c5cb97 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java
@@ -19,10 +19,10 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 package com.pixelgamelibrary.backend.libgdx;
 
-import com.pixelgamelibrary.backend.libgdx.storage.StorageFactory;
-import com.pixelgamelibrary.api.storage.Storage;
+import com.pixelgamelibrary.backend.libgdx.files.StorageFactory;
+import com.pixelgamelibrary.api.files.Storage;
 import com.pixelgamelibrary.api.interfaces.Files;
-import com.pixelgamelibrary.backend.libgdx.assets.AssetsLibGDXStorage;
+import com.pixelgamelibrary.backend.libgdx.files.AssetsLibGDXStorage;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/AndroidStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidStorage.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/storage/AndroidStorage.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidStorage.java
index 21f2b46..ad9dcc8 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/AndroidStorage.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidStorage.java
@@ -17,7 +17,7 @@
 // <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.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.pixelgamelibrary.api.Platform;
 
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/assets/AssetsLibGDXStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXStorage.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/assets/AssetsLibGDXStorage.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXStorage.java
index 500f84d..e254896 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/assets/AssetsLibGDXStorage.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXStorage.java
@@ -1,14 +1,14 @@
-package com.pixelgamelibrary.backend.libgdx.assets;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.pixelgamelibrary.api.utils.AssetsTxt;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.pixelgamelibrary.api.Pixel;
 import com.pixelgamelibrary.api.Platform;
-import com.pixelgamelibrary.api.storage.FileType;
-import com.pixelgamelibrary.api.storage.RegularFileType;
-import com.pixelgamelibrary.api.storage.Storage;
-import com.pixelgamelibrary.api.storage.StorageType;
+import com.pixelgamelibrary.api.files.FileType;
+import com.pixelgamelibrary.api.files.RegularFileType;
+import com.pixelgamelibrary.api.files.Storage;
+import com.pixelgamelibrary.api.files.StorageType;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.Getter;
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorage.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorage.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorage.java
index 3ded022..707b03f 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorage.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorage.java
@@ -17,15 +17,15 @@
 // <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.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.badlogic.gdx.Gdx;
 import com.pixelgamelibrary.api.Pixel;
-import com.pixelgamelibrary.api.storage.FileType;
-import com.pixelgamelibrary.api.storage.RegularFileType;
-import com.pixelgamelibrary.api.storage.Storage;
-import com.pixelgamelibrary.api.storage.StorageException;
-import com.pixelgamelibrary.api.storage.StorageType;
+import com.pixelgamelibrary.api.files.FileType;
+import com.pixelgamelibrary.api.files.RegularFileType;
+import com.pixelgamelibrary.api.files.Storage;
+import com.pixelgamelibrary.api.files.StorageException;
+import com.pixelgamelibrary.api.files.StorageType;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopStorage.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopStorage.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopStorage.java
index 3023cd4..062bbc3 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopStorage.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopStorage.java
@@ -17,7 +17,7 @@
 // <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.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.pixelgamelibrary.api.Platform;
 
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/PreferencesStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesStorage.java
similarity index 93%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/storage/PreferencesStorage.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesStorage.java
index 5939e64..3eb6bd2 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/PreferencesStorage.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesStorage.java
@@ -17,12 +17,12 @@
 // <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.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Preferences;
 import com.pixelgamelibrary.api.Platform;
-import com.pixelgamelibrary.api.storage.map.MapStorage;
+import com.pixelgamelibrary.api.files.map.MapStorage;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/SimpleLocalStorageMap.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/SimpleLocalStorageMap.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/storage/SimpleLocalStorageMap.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/SimpleLocalStorageMap.java
index 15c68ad..8146ea3 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/SimpleLocalStorageMap.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/SimpleLocalStorageMap.java
@@ -17,10 +17,10 @@
 // <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.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.badlogic.gdx.Preferences;
-import com.pixelgamelibrary.api.storage.map.SimpleMap;
+import com.pixelgamelibrary.api.files.map.SimpleMap;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/StorageFactory.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/StorageFactory.java
similarity index 92%
rename from src/main/java/com/pixelgamelibrary/backend/libgdx/storage/StorageFactory.java
rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/StorageFactory.java
index 3e00e0f..3deb741 100644
--- a/src/main/java/com/pixelgamelibrary/backend/libgdx/storage/StorageFactory.java
+++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/StorageFactory.java
@@ -17,12 +17,12 @@
 // <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.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
 import com.pixelgamelibrary.api.Pixel;
 import com.pixelgamelibrary.api.Platform;
-import com.pixelgamelibrary.api.storage.Storage;
-import com.pixelgamelibrary.api.storage.StorageException;
+import com.pixelgamelibrary.api.files.Storage;
+import com.pixelgamelibrary.api.files.StorageException;
 
 /**
  *
diff --git a/src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java b/src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorageTest.java
similarity index 98%
rename from src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java
rename to src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorageTest.java
index ae5a59d..615e04d 100644
--- a/src/test/java/com/pixelgamelibrary/backend/libgdx/storage/DesktopAndroidStorageTest.java
+++ b/src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorageTest.java
@@ -1,12 +1,13 @@
-package com.pixelgamelibrary.backend.libgdx.storage;
+package com.pixelgamelibrary.backend.libgdx.files;
 
+import com.pixelgamelibrary.backend.libgdx.files.DesktopAndroidStorage;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.pixelgamelibrary.api.Pixel;
 import com.pixelgamelibrary.api.Platform;
 import com.pixelgamelibrary.api.interfaces.PixelBackend;
-import com.pixelgamelibrary.api.storage.RegularFileType;
-import com.pixelgamelibrary.api.storage.StorageException;
+import com.pixelgamelibrary.api.files.RegularFileType;
+import com.pixelgamelibrary.api.files.StorageException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;