MultiServer, customserver: cache: rename module

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)

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
 

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):

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):

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: