diff --git a/MultiServer.py b/MultiServer.py
index c109206a19..eb9f592548 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -45,7 +45,7 @@ from Utils import version_tuple, restricted_loads, Version, async_start, get_int
 from NetUtils import Endpoint, ClientStatus, NetworkItem, decode, encode, NetworkPlayer, Permission, NetworkSlot, \
     SlotType, LocationStore, MultiData, Hint, HintStatus, GamesPackage
 from BaseClasses import ItemClassification
-from apmw.multiserver.gamespackage.cache import GamesPackageCache
+from apmw.multiserver.gamespackagecache import GamesPackageCache
 
 
 min_client_version = Version(0, 5, 0)
diff --git a/WebHostLib/customserver.py b/WebHostLib/customserver.py
index 5402607d81..a8553a21d7 100644
--- a/WebHostLib/customserver.py
+++ b/WebHostLib/customserver.py
@@ -26,7 +26,7 @@ from MultiServer import (
 )
 from Utils import restricted_loads, cache_argsless
 from NetUtils import GamesPackage
-from apmw.webhost.customserver.gamespackage.cache import DBGamesPackageCache
+from apmw.webhost.customserver.gamespackagecache import DBGamesPackageCache
 from .locker import Locker
 from .models import Command, Room, db
 
diff --git a/apmw/multiserver/gamespackage/__init__.py b/apmw/multiserver/gamespackage/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apmw/multiserver/gamespackage/cache.py b/apmw/multiserver/gamespackagecache.py
similarity index 100%
rename from apmw/multiserver/gamespackage/cache.py
rename to apmw/multiserver/gamespackagecache.py
diff --git a/apmw/webhost/customserver/gamespackage/__init__.py b/apmw/webhost/customserver/gamespackage/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apmw/webhost/customserver/gamespackage/cache.py b/apmw/webhost/customserver/gamespackagecache.py
similarity index 94%
rename from apmw/webhost/customserver/gamespackage/cache.py
rename to apmw/webhost/customserver/gamespackagecache.py
index a453c1922d..c58af4b4c6 100644
--- a/apmw/webhost/customserver/gamespackage/cache.py
+++ b/apmw/webhost/customserver/gamespackagecache.py
@@ -2,7 +2,7 @@ from typing_extensions import override
 
 from NetUtils import GamesPackage
 from Utils import restricted_loads
-from apmw.multiserver.gamespackage.cache import GamesPackageCache, ItemNameGroups, LocationNameGroups
+from apmw.multiserver.gamespackagecache import GamesPackageCache, ItemNameGroups, LocationNameGroups
 
 
 class DBGamesPackageCache(GamesPackageCache):
diff --git a/test/multiserver/test_gamespackage_cache.py b/test/multiserver/test_gamespackage_cache.py
index e764a4e8e8..440a46a08d 100644
--- a/test/multiserver/test_gamespackage_cache.py
+++ b/test/multiserver/test_gamespackage_cache.py
@@ -6,7 +6,7 @@ from typing_extensions import override
 
 import NetUtils
 from NetUtils import GamesPackage
-from apmw.multiserver.gamespackage.cache import GamesPackageCache
+from apmw.multiserver.gamespackagecache import GamesPackageCache
 
 
 class GamesPackageCacheTest(TestCase):
diff --git a/test/webhost_customserver/test_gamespackage_cache.py b/test/webhost_customserver/test_gamespackage_cache.py
index 32497526d5..58ea2e37f9 100644
--- a/test/webhost_customserver/test_gamespackage_cache.py
+++ b/test/webhost_customserver/test_gamespackage_cache.py
@@ -7,7 +7,7 @@ from test.multiserver.test_gamespackage_cache import GamesPackageCacheTest
 
 import Utils
 from NetUtils import GamesPackage
-from apmw.webhost.customserver.gamespackage.cache import DBGamesPackageCache
+from apmw.webhost.customserver.gamespackagecache import DBGamesPackageCache
 
 
 class FakeGameDataPackage: