diff --git a/src/main/java/com/pixelgamelibrary/api/app/Preferences.java b/src/main/java/com/pixelgamelibrary/api/app/Preferences.java
index 40fbe62..8189dca 100644
--- a/src/main/java/com/pixelgamelibrary/api/app/Preferences.java
+++ b/src/main/java/com/pixelgamelibrary/api/app/Preferences.java
@@ -20,7 +20,7 @@
 
 package com.pixelgamelibrary.api.app;
 
-import com.pixelgamelibrary.api.storage.map.SimpleMap;
+import com.pixelgamelibrary.api.files.map.SimpleMap;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/FileHandle.java b/src/main/java/com/pixelgamelibrary/api/files/FileHandle.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/FileHandle.java
rename to src/main/java/com/pixelgamelibrary/api/files/FileHandle.java
index 3e69a17..08fcc0b 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/FileHandle.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/FileHandle.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.api.storage;
+package com.pixelgamelibrary.api.files;
 
 import java.util.List;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/FileHandleImpl.java b/src/main/java/com/pixelgamelibrary/api/files/FileHandleImpl.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/FileHandleImpl.java
rename to src/main/java/com/pixelgamelibrary/api/files/FileHandleImpl.java
index de2a3fb..3f8cd5b 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/FileHandleImpl.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/FileHandleImpl.java
@@ -17,9 +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.storage;
+package com.pixelgamelibrary.api.files;
 
-import static com.pixelgamelibrary.api.storage.RegularFileType.TEXT;
+import static com.pixelgamelibrary.api.files.RegularFileType.TEXT;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/FileType.java b/src/main/java/com/pixelgamelibrary/api/files/FileType.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/api/storage/FileType.java
rename to src/main/java/com/pixelgamelibrary/api/files/FileType.java
index 1527215..57b4124 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/FileType.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/FileType.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage;
+package com.pixelgamelibrary.api.files;
 
 
 /**
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/RegularFileType.java b/src/main/java/com/pixelgamelibrary/api/files/RegularFileType.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/api/storage/RegularFileType.java
rename to src/main/java/com/pixelgamelibrary/api/files/RegularFileType.java
index fc9255c..3b0dd3f 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/RegularFileType.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/RegularFileType.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage;
+package com.pixelgamelibrary.api.files;
 
 
 /**
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/Storage.java b/src/main/java/com/pixelgamelibrary/api/files/Storage.java
similarity index 99%
rename from src/main/java/com/pixelgamelibrary/api/storage/Storage.java
rename to src/main/java/com/pixelgamelibrary/api/files/Storage.java
index 9d8cce5..3747938 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/Storage.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/Storage.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.api.storage;
+package com.pixelgamelibrary.api.files;
 
 import com.pixelgamelibrary.api.Platform;
 import java.util.List;
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/StorageException.java b/src/main/java/com/pixelgamelibrary/api/files/StorageException.java
similarity index 97%
rename from src/main/java/com/pixelgamelibrary/api/storage/StorageException.java
rename to src/main/java/com/pixelgamelibrary/api/files/StorageException.java
index eed99e1..973d3d7 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/StorageException.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/StorageException.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.api.storage;
+package com.pixelgamelibrary.api.files;
 
 import com.pixelgamelibrary.api.PixelException;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/StorageType.java b/src/main/java/com/pixelgamelibrary/api/files/StorageType.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/api/storage/StorageType.java
rename to src/main/java/com/pixelgamelibrary/api/files/StorageType.java
index 52c260e..cbba5de 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/StorageType.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/StorageType.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.api.storage;
+package com.pixelgamelibrary.api.files;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/command/BaseStorageCommand.java b/src/main/java/com/pixelgamelibrary/api/files/command/BaseStorageCommand.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/command/BaseStorageCommand.java
rename to src/main/java/com/pixelgamelibrary/api/files/command/BaseStorageCommand.java
index de92114..24ac533 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/command/BaseStorageCommand.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/command/BaseStorageCommand.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.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/command/CommandLineScanner.java b/src/main/java/com/pixelgamelibrary/api/files/command/CommandLineScanner.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/api/storage/command/CommandLineScanner.java
rename to src/main/java/com/pixelgamelibrary/api/files/command/CommandLineScanner.java
index 5e6454d..48b0690 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/command/CommandLineScanner.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/command/CommandLineScanner.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.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
 /**
  * The {@code CommandLineScanner} interface defines a contract for scanning input from a command line.
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommand.java b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommand.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommand.java
rename to src/main/java/com/pixelgamelibrary/api/files/command/StorageCommand.java
index b373699..364a141 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommand.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommand.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.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
 /**
  * The {@code StorageCommand} interface defines the contract for commands that can be executed within
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandLine.java b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandLine.java
similarity index 99%
rename from src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandLine.java
rename to src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandLine.java
index 83fc4c9..dddc9f2 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandLine.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandLine.java
@@ -18,9 +18,9 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
-import com.pixelgamelibrary.api.storage.Storage;
+import com.pixelgamelibrary.api.files.Storage;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineScanner.java b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandLineScanner.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineScanner.java
rename to src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandLineScanner.java
index 184be0f..eeaaa6a 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineScanner.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandLineScanner.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
 /**
  * The StorageCommandLineScanner class provides a command-line interface for interacting with
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandResult.java b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandResult.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandResult.java
rename to src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandResult.java
index bf82d6f..df372b1 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/command/StorageCommandResult.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/command/StorageCommandResult.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
 /**
  * The StorageCommandResult class encapsulates the result of executing a storage command.
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/map/MapFileType.java b/src/main/java/com/pixelgamelibrary/api/files/map/MapFileType.java
similarity index 90%
rename from src/main/java/com/pixelgamelibrary/api/storage/map/MapFileType.java
rename to src/main/java/com/pixelgamelibrary/api/files/map/MapFileType.java
index 9d666c6..6b0b48c 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/map/MapFileType.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/map/MapFileType.java
@@ -18,12 +18,12 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
-import com.pixelgamelibrary.api.storage.FileType;
-import com.pixelgamelibrary.api.storage.StorageException;
-import static com.pixelgamelibrary.api.storage.FileType.DIRECTORY;
-import static com.pixelgamelibrary.api.storage.FileType.FILE;
+import com.pixelgamelibrary.api.files.FileType;
+import com.pixelgamelibrary.api.files.StorageException;
+import static com.pixelgamelibrary.api.files.FileType.DIRECTORY;
+import static com.pixelgamelibrary.api.files.FileType.FILE;
 
 /**
  * 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/map/MapStorage.java b/src/main/java/com/pixelgamelibrary/api/files/map/MapStorage.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/map/MapStorage.java
rename to src/main/java/com/pixelgamelibrary/api/files/map/MapStorage.java
index bf65500..04844f7 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/map/MapStorage.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/map/MapStorage.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.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
 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.StorageException;
-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.StorageException;
+import com.pixelgamelibrary.api.files.Storage;
+import com.pixelgamelibrary.api.files.StorageType;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/map/MapStorageCompression.java b/src/main/java/com/pixelgamelibrary/api/files/map/MapStorageCompression.java
similarity index 96%
rename from src/main/java/com/pixelgamelibrary/api/storage/map/MapStorageCompression.java
rename to src/main/java/com/pixelgamelibrary/api/files/map/MapStorageCompression.java
index 08e6179..bd9cd6c 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/map/MapStorageCompression.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/map/MapStorageCompression.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.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/map/MemoryStorage.java b/src/main/java/com/pixelgamelibrary/api/files/map/MemoryStorage.java
similarity index 97%
rename from src/main/java/com/pixelgamelibrary/api/storage/map/MemoryStorage.java
rename to src/main/java/com/pixelgamelibrary/api/files/map/MemoryStorage.java
index 59b6bb9..15c6790 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/map/MemoryStorage.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/map/MemoryStorage.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
 import com.pixelgamelibrary.api.Platform;
 
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/map/SimpleJavaMap.java b/src/main/java/com/pixelgamelibrary/api/files/map/SimpleJavaMap.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/map/SimpleJavaMap.java
rename to src/main/java/com/pixelgamelibrary/api/files/map/SimpleJavaMap.java
index 5ccebab..5e97e95 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/map/SimpleJavaMap.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/map/SimpleJavaMap.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/main/java/com/pixelgamelibrary/api/storage/map/SimpleMap.java b/src/main/java/com/pixelgamelibrary/api/files/map/SimpleMap.java
similarity index 98%
rename from src/main/java/com/pixelgamelibrary/api/storage/map/SimpleMap.java
rename to src/main/java/com/pixelgamelibrary/api/files/map/SimpleMap.java
index 31dfdcc..344b9c2 100644
--- a/src/main/java/com/pixelgamelibrary/api/storage/map/SimpleMap.java
+++ b/src/main/java/com/pixelgamelibrary/api/files/map/SimpleMap.java
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package com.pixelgamelibrary.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/pixelgamelibrary/api/graphics/BitmapFontFactory.java b/src/main/java/com/pixelgamelibrary/api/graphics/BitmapFontFactory.java
index bddb647..f4e3f7f 100644
--- a/src/main/java/com/pixelgamelibrary/api/graphics/BitmapFontFactory.java
+++ b/src/main/java/com/pixelgamelibrary/api/graphics/BitmapFontFactory.java
@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 package com.pixelgamelibrary.api.graphics;
 
-import com.pixelgamelibrary.api.storage.FileHandle;
+import com.pixelgamelibrary.api.files.FileHandle;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/graphics/PixMapFactory.java b/src/main/java/com/pixelgamelibrary/api/graphics/PixMapFactory.java
index 426ceff..f0507b2 100644
--- a/src/main/java/com/pixelgamelibrary/api/graphics/PixMapFactory.java
+++ b/src/main/java/com/pixelgamelibrary/api/graphics/PixMapFactory.java
@@ -20,7 +20,7 @@
 
 package com.pixelgamelibrary.api.graphics;
 
-import com.pixelgamelibrary.api.storage.FileHandle;
+import com.pixelgamelibrary.api.files.FileHandle;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/graphics/TextureFactory.java b/src/main/java/com/pixelgamelibrary/api/graphics/TextureFactory.java
index 0d91263..4c8d497 100644
--- a/src/main/java/com/pixelgamelibrary/api/graphics/TextureFactory.java
+++ b/src/main/java/com/pixelgamelibrary/api/graphics/TextureFactory.java
@@ -20,7 +20,7 @@
 
 package com.pixelgamelibrary.api.graphics;
 
-import com.pixelgamelibrary.api.storage.FileHandle;
+import com.pixelgamelibrary.api.files.FileHandle;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/interfaces/Audio.java b/src/main/java/com/pixelgamelibrary/api/interfaces/Audio.java
index 4d487d9..7a494f4 100644
--- a/src/main/java/com/pixelgamelibrary/api/interfaces/Audio.java
+++ b/src/main/java/com/pixelgamelibrary/api/interfaces/Audio.java
@@ -21,7 +21,7 @@ package com.pixelgamelibrary.api.interfaces;
 
 import com.pixelgamelibrary.api.audio.Music;
 import com.pixelgamelibrary.api.audio.Sound;
-import com.pixelgamelibrary.api.storage.FileHandle;
+import com.pixelgamelibrary.api.files.FileHandle;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/interfaces/Files.java b/src/main/java/com/pixelgamelibrary/api/interfaces/Files.java
index 7c455fb..847b3a1 100644
--- a/src/main/java/com/pixelgamelibrary/api/interfaces/Files.java
+++ b/src/main/java/com/pixelgamelibrary/api/interfaces/Files.java
@@ -19,12 +19,12 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 package com.pixelgamelibrary.api.interfaces;
 
-import com.pixelgamelibrary.api.storage.FileHandle;
-import com.pixelgamelibrary.api.storage.Storage;
-import com.pixelgamelibrary.api.storage.StorageException;
-import com.pixelgamelibrary.api.storage.StorageType;
-import static com.pixelgamelibrary.api.storage.StorageType.ASSETS;
-import static com.pixelgamelibrary.api.storage.StorageType.EXTERNAL;
+import com.pixelgamelibrary.api.files.FileHandle;
+import com.pixelgamelibrary.api.files.Storage;
+import com.pixelgamelibrary.api.files.StorageException;
+import com.pixelgamelibrary.api.files.StorageType;
+import static com.pixelgamelibrary.api.files.StorageType.ASSETS;
+import static com.pixelgamelibrary.api.files.StorageType.EXTERNAL;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java b/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java
index b38f22b..afeaceb 100644
--- a/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java
+++ b/src/main/java/com/pixelgamelibrary/api/interfaces/Graphics.java
@@ -30,7 +30,7 @@ import com.pixelgamelibrary.api.graphics.SpriteBatchFactory;
 import com.pixelgamelibrary.api.graphics.Texture;
 import com.pixelgamelibrary.api.graphics.TextureFactory;
 import com.pixelgamelibrary.api.graphics.TextureRegion;
-import com.pixelgamelibrary.api.storage.FileHandle;
+import com.pixelgamelibrary.api.files.FileHandle;
 
 /**
  *
diff --git a/src/main/java/com/pixelgamelibrary/api/utils/AssetsTxt.java b/src/main/java/com/pixelgamelibrary/api/utils/AssetsTxt.java
index 6f22872..a893982 100644
--- a/src/main/java/com/pixelgamelibrary/api/utils/AssetsTxt.java
+++ b/src/main/java/com/pixelgamelibrary/api/utils/AssetsTxt.java
@@ -20,7 +20,7 @@
 package com.pixelgamelibrary.api.utils;
 
 import com.pixelgamelibrary.api.Pixel;
-import com.pixelgamelibrary.api.storage.StorageException;
+import com.pixelgamelibrary.api.files.StorageException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/FileHandleImplTest.java b/src/test/java/com/pixelgamelibrary/api/files/FileHandleImplTest.java
similarity index 93%
rename from src/test/java/com/pixelgamelibrary/api/storage/FileHandleImplTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/FileHandleImplTest.java
index ba6ff39..58c83d8 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/FileHandleImplTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/FileHandleImplTest.java
@@ -1,5 +1,10 @@
-package com.pixelgamelibrary.api.storage;
+package com.pixelgamelibrary.api.files;
 
+import com.pixelgamelibrary.api.files.Storage;
+import com.pixelgamelibrary.api.files.FileHandleImpl;
+import com.pixelgamelibrary.api.files.RegularFileType;
+import com.pixelgamelibrary.api.files.FileType;
+import com.pixelgamelibrary.api.files.FileHandle;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/command/BaseStorageCommandTest.java b/src/test/java/com/pixelgamelibrary/api/files/command/BaseStorageCommandTest.java
similarity index 87%
rename from src/test/java/com/pixelgamelibrary/api/storage/command/BaseStorageCommandTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/command/BaseStorageCommandTest.java
index 0ec8e0d..545c76f 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/command/BaseStorageCommandTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/command/BaseStorageCommandTest.java
@@ -1,5 +1,8 @@
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
+import com.pixelgamelibrary.api.files.command.StorageCommandResult;
+import com.pixelgamelibrary.api.files.command.StorageCommandLine;
+import com.pixelgamelibrary.api.files.command.BaseStorageCommand;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineScannerTest.java b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandLineScannerTest.java
similarity index 88%
rename from src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineScannerTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandLineScannerTest.java
index 1a7e4f8..e39fa7e 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineScannerTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandLineScannerTest.java
@@ -1,5 +1,9 @@
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
+import com.pixelgamelibrary.api.files.command.StorageCommandResult;
+import com.pixelgamelibrary.api.files.command.StorageCommandLineScanner;
+import com.pixelgamelibrary.api.files.command.StorageCommandLine;
+import com.pixelgamelibrary.api.files.command.CommandLineScanner;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineTest.java b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandLineTest.java
similarity index 95%
rename from src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandLineTest.java
index de5edf2..d384a99 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandLineTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandLineTest.java
@@ -1,6 +1,8 @@
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
-import com.pixelgamelibrary.api.storage.Storage;
+import com.pixelgamelibrary.api.files.command.StorageCommandResult;
+import com.pixelgamelibrary.api.files.command.StorageCommandLine;
+import com.pixelgamelibrary.api.files.Storage;
 import java.util.Arrays;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandResultTest.java b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandResultTest.java
similarity index 96%
rename from src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandResultTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandResultTest.java
index 5702905..2fcab65 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandResultTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandResultTest.java
@@ -1,5 +1,6 @@
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
+import com.pixelgamelibrary.api.files.command.StorageCommandResult;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandTest.java b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandTest.java
similarity index 85%
rename from src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandTest.java
index f5ae93c..01f935e 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/command/StorageCommandTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/command/StorageCommandTest.java
@@ -1,5 +1,9 @@
-package com.pixelgamelibrary.api.storage.command;
+package com.pixelgamelibrary.api.files.command;
 
+import com.pixelgamelibrary.api.files.command.StorageCommandResult;
+import com.pixelgamelibrary.api.files.command.StorageCommandLine;
+import com.pixelgamelibrary.api.files.command.BaseStorageCommand;
+import com.pixelgamelibrary.api.files.command.StorageCommand;
 import java.util.function.Function;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java b/src/test/java/com/pixelgamelibrary/api/files/map/MapStorageTest.java
similarity index 98%
rename from src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/map/MapStorageTest.java
index aba7a8f..ada74b6 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/map/MapStorageTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/map/MapStorageTest.java
@@ -1,5 +1,7 @@
-package com.pixelgamelibrary.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
+import com.pixelgamelibrary.api.files.map.MapStorage;
+import com.pixelgamelibrary.api.files.map.SimpleMap;
 import com.pixelgamelibrary.api.Pixel;
 import com.pixelgamelibrary.api.Platform;
 import com.pixelgamelibrary.api.interfaces.PixelBackend;
diff --git a/src/test/java/com/pixelgamelibrary/api/storage/map/SimpleJavaMapTest.java b/src/test/java/com/pixelgamelibrary/api/files/map/SimpleJavaMapTest.java
similarity index 96%
rename from src/test/java/com/pixelgamelibrary/api/storage/map/SimpleJavaMapTest.java
rename to src/test/java/com/pixelgamelibrary/api/files/map/SimpleJavaMapTest.java
index 9507ae7..b155b9b 100644
--- a/src/test/java/com/pixelgamelibrary/api/storage/map/SimpleJavaMapTest.java
+++ b/src/test/java/com/pixelgamelibrary/api/files/map/SimpleJavaMapTest.java
@@ -1,5 +1,6 @@
-package com.pixelgamelibrary.api.storage.map;
+package com.pixelgamelibrary.api.files.map;
 
+import com.pixelgamelibrary.api.files.map.SimpleJavaMap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;