diff --git a/.efrocachemap b/.efrocachemap
index b0ce461f..48afcdae 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -4072,50 +4072,50 @@
   "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b",
   "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877",
   "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde",
-  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/50/2a/99c316ae5605f34de961e57b99b8",
-  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/4c/9b/14991a9cc44edaa4c11376b586db",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6d/51/aac3bb4940b17bb85c7d65fe8215",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e3/1c/672e0c37120e234641b1ec70ba8e",
-  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/14/b9/169ebbb5a2a307a122d8c62850df",
-  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/00/f1/983296ec4ecf069c174ded7d6e5d",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b7/38/a79b4fd357f9586f6f1f9a31cb6e",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/85/95/6c64b5f5bf1e1558d01cfa8c89ee",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/aa/5c/698f1eacae4732d73144e0cdff4d",
-  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/43/0a/d9ec4e8c194e08bb2146af7a8d53",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/aa/7f/66beb4dacfa426bf8f1644f79a4f",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ff/3a/216ae04c015938874c1a31db65c9",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/39/17/b8b8e01b0c36b4f68ff546eca302",
-  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a5/27/4c7232faab170704a57b7be15442",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/89/3a/9a36daf94b5d576ab05b839668d5",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/fc/18/c23b046de337751bb865e1339990",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0a/a8/bfa215787ac45f95372fdfaefd03",
-  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/77/e1/a1beb6525d16a58c37c47a7edfa5",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/3d/1a/ebc11fdfb17a45a73183f9d292e9",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0d/ca/0125a4173cead9f20ed4708b0a7f",
-  "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/1e/7a/b0fcb7d586eb58087ab5bb84e553",
-  "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/b8/22/f9d3995d4d213cbc4fd7b2557065",
-  "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/c5/5c/adaab9f771d775da294ac4098805",
-  "build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/da/d9/b5f1419047e1b1e0ceebea8d7dcf",
-  "build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/58/d1/ba04098b61a8c51095b57bb2b0bb",
-  "build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/40/16/6274450a7b639ae02288cbb17ca0",
-  "build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/41/20/977193b2eae712929b01e42e9e00",
-  "build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/93/40/13568452f463bcead1a7c7923247",
-  "build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/c0/56/f4c3aaee3262b857e87cdb135080",
-  "build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/5b/64/2b1a0999396f87fd808fc3d6583a",
-  "build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f6/7b/c5976f5a91b4f6168bfa007855df",
-  "build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/cc/96/b8a1558fde8da1e70dee20e830d9",
-  "build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/91/8f/18a61f013ebf513e3d2534d1b30e",
-  "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ae/24/eaafd0f23ac832b592b1be8996a6",
-  "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/18/ec/e8627a4f475fdf832b715ff4400a",
-  "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/57/7c/5f0d634096ef11b0799685afd22e",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/82/56/6418d82655eea56b28c89c5b340b",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/c9/d6/1f01f67964236d68a6e44b2925a4",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a1/b7/894d9e92ab239dee9009a8294fbf",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/40/64/dc637d74def20adc1cd7f3902f57",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/8a/b8/41d23c85cf10583e5fc2e0001580",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/29/da/f32fdd76e918b8ee889199e78cc4",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/bc/39/9efcbde9068d68eddc8f83e14ecf",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/42/50/4610cf8e572de50482a179e2da7d",
+  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/27/dc/4461ec2c763316d0f738fbf72e6b",
+  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/23/1e/35d837927c1715e936f41ff0c4d7",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1e/96/6b0a986344ff771d9ce82d58eae9",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/34/b7/9d49ff2ab653b3e462d237e6a1cd",
+  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1b/09/d19d7965237783341bc46a5fdbf6",
+  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/95/fb/51828c82315a5e91c5f8a2e678f4",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d7/f8/b7288e653ce7c0362f37a593c5e6",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/14/01/f40276b9d4dd8e84ba580ca6fd45",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/37/3a/beb0e2a42e30415f58c480cc95be",
+  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/61/f4/b30550e367475bd2d67c528f56b7",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e2/a4/00bacbbd429e054be3a99221d790",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/fa/f2/644aab7337cf5244a6f67378c64c",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/c5/51/a126f6c9229eddf2ea2b49ce0411",
+  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/9f/61/c9ec84831c096b443f0073af2044",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/89/7b/190ec36b4a9df1f203fe1045d12e",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/88/b2/47314eda637619d4ce37c99adbb2",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/3d/5c/517d4615e73b042f3daa8c54666e",
+  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/17/ff/9644c1a371811284532d9318d242",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ec/84/097506824e9dc267b0d82d713143",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/eb/72/24622b15642dd28f9e0377f6f45d",
+  "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/66/b7/4be2fcf57b9bc9cb12d97d6ac298",
+  "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4d/31/1654791c0ae8eb78b517b548f2f7",
+  "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/62/04/d4b18d10e866785b23756d48f91c",
+  "build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/e8/cf/a780e3f8bde8b2ff58b33ff9ceef",
+  "build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/dd/a0/cd002bc6817fdda826c0e01bf714",
+  "build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/bb/7a/eb3cabeaf7e3d823d6e24b829a45",
+  "build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/78/92/4c036866d152edc05854e4fcaa64",
+  "build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ed/c6/b4e7c39c236857ca991904cb78f3",
+  "build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a5/a8/9e0b4aa407d210ac7452c23f972c",
+  "build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8d/28/415334e71f7f2436e137a8565893",
+  "build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/e1/5b/162ceaf3624d4fba331ef3501250",
+  "build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f4/2f/dc4ca51233cacc5e6a8becad7dc2",
+  "build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/04/3d/7bb7aea8097a31b1746cbb883beb",
+  "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a7/38/f5ebf21a44b3968a1623ae839721",
+  "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/b7/fa/1f32d0fedf5e54092d434bff20ed",
+  "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d2/5a/08f06543729620d0d08b31b4c0a4",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/54/26/ff90fc304b6dccaa16520ec64c7e",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/09/22/674953cef241287d44f6f8166886",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a1/a6/5303ac4c045520c1a9c9cf412157",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/00/74/1bdb26aa39cac30211ae080e3ce9",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/77/26/caa7f379c5f32e2f96edda7cfe0e",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ec/e3/0b00701c99c191a863877fc60aa5",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/41/58/71125ca7e4e993fbc7f3ba289fcc",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/81/c2/d83668721b23f4f2742c44a008e8",
   "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
   "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
   "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 467af7ee..e43d8ce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.20 (build 21054, api 8, 2023-06-06)
+### 1.7.20 (build 21055, api 8, 2023-06-07)
 
 - This seems like a good time for a `refactoring` release in anticipation of
   changes coming in 1.8. Basically this means that a lot of things will be
@@ -262,6 +262,14 @@
   stuff.
 - For similar reasons, moved the `ba*.app.cloud` subsystem to
   `ba*.app.plus.cloud`.
+- The big single ballistica standard library Python package containing all the
+  built in games, actors, windows, etc. (bastd) has been split out into parts
+  associated with bascenev1 (bascenev1lib) and bauiv1 (bauiv1lib). This way,
+  when bascenev2 comes along, it can have its own unique associated library of
+  stuff (bascenev2lib). To upgrade existing code, go through and replace
+  instances of `bastd.ui` with `bauiv1lib` and all other instances of `bastd`
+  with `bascenev1lib`. That should mostly do it. As a random tip: check out the
+  `tools/pcommand mypy_files` as a handy tool to help get your mods updated.
 
 ### 1.7.19 (build 20997, api 7, 2023-01-19)
 
diff --git a/Makefile b/Makefile
index 5f4334b0..9da033be 100644
--- a/Makefile
+++ b/Makefile
@@ -615,10 +615,18 @@ spinoff-test-template_fs:
 spinoff-test-ui_v1:
 	tools/pcommand spinoff_test ui_v1 $(SPINOFF_TEST_EXTRA_ARGS)
 
+# Build and check a spinoff project with only the ui_v1_lib feature-set.
+spinoff-test-ui_v1_lib:
+	tools/pcommand spinoff_test ui_v1_lib $(SPINOFF_TEST_EXTRA_ARGS)
+
 # Build and check a spinoff project with only the scene_v1 feature-set.
 spinoff-test-scene_v1:
 	tools/pcommand spinoff_test scene_v1 $(SPINOFF_TEST_EXTRA_ARGS)
 
+# Build and check a spinoff project with only the scene_v1_lib feature-set.
+spinoff-test-scene_v1_lib:
+	tools/pcommand spinoff_test scene_v1_lib $(SPINOFF_TEST_EXTRA_ARGS)
+
 # Blow away all spinoff-test builds.
 spinoff-test-clean:
 	rm -rf build/spinofftest
diff --git a/config/featuresets/featureset_classic.py b/config/featuresets/featureset_classic.py
index e53c839d..a95027c8 100644
--- a/config/featuresets/featureset_classic.py
+++ b/config/featuresets/featureset_classic.py
@@ -12,7 +12,7 @@ from batools.featureset import FeatureSet
 # Grab the FeatureSet we should apply to.
 fset = FeatureSet.get_active()
 
-fset.requirements = {'base', 'scene_v1', 'ui_v1', 'std'}
+fset.requirements = {'core', 'base', 'scene_v1', 'scene_v1_lib', 'ui_v1'}
 
 # We provide 'babase.app.classic'.
 fset.has_python_app_subsystem = True
diff --git a/config/featuresets/featureset_plus.py b/config/featuresets/featureset_plus.py
index 4443089b..72526b07 100644
--- a/config/featuresets/featureset_plus.py
+++ b/config/featuresets/featureset_plus.py
@@ -1,6 +1,6 @@
 # Released under the MIT License. See LICENSE for details.
 #
-# pylint: disable=missing-docstring, invalid-name
+# pylint: disable=missing-module-docstring, invalid-name
 from __future__ import annotations
 
 # This file is exec'ed by the spinoff system, allowing us to define
@@ -12,7 +12,7 @@ from batools.featureset import FeatureSet
 # Grab the FeatureSet we should apply to.
 fset = FeatureSet.get_active()
 
-fset.requirements = {'base'}
+fset.requirements = {'core', 'base'}
 fset.soft_requirements = {'classic'}
 
 fset.internal = True
diff --git a/config/featuresets/featureset_scene_v1.py b/config/featuresets/featureset_scene_v1.py
index 2ded931d..81f19b18 100644
--- a/config/featuresets/featureset_scene_v1.py
+++ b/config/featuresets/featureset_scene_v1.py
@@ -12,4 +12,4 @@ from batools.featureset import FeatureSet
 # Grab the FeatureSet we should apply to.
 fset = FeatureSet.get_active()
 
-fset.requirements = {'base', 'std', 'classic'}
+fset.requirements = {'core', 'base', 'classic', 'scene_v1_lib'}
diff --git a/config/featuresets/featureset_std.py b/config/featuresets/featureset_scene_v1_lib.py
similarity index 89%
rename from config/featuresets/featureset_std.py
rename to config/featuresets/featureset_scene_v1_lib.py
index f94b144e..c3621120 100644
--- a/config/featuresets/featureset_std.py
+++ b/config/featuresets/featureset_scene_v1_lib.py
@@ -14,4 +14,4 @@ fset = FeatureSet.get_active()
 
 fset.has_native_python_module = False
 
-fset.requirements = {'core', 'base', 'scene_v1', 'ui_v1'}
+fset.requirements = {'core', 'base', 'scene_v1'}
diff --git a/config/featuresets/featureset_template_fs.py b/config/featuresets/featureset_template_fs.py
index 843df767..6ac0496b 100644
--- a/config/featuresets/featureset_template_fs.py
+++ b/config/featuresets/featureset_template_fs.py
@@ -12,4 +12,4 @@ from batools.featureset import FeatureSet
 # Grab the FeatureSet we should apply to.
 fset = FeatureSet.get_active()
 
-fset.requirements = {'base'}
+fset.requirements = {'core', 'base'}
diff --git a/config/featuresets/featureset_ui_v1.py b/config/featuresets/featureset_ui_v1.py
index ef301aae..d53c7a13 100644
--- a/config/featuresets/featureset_ui_v1.py
+++ b/config/featuresets/featureset_ui_v1.py
@@ -12,7 +12,7 @@ from batools.featureset import FeatureSet
 # Grab the FeatureSet we should apply to.
 fset = FeatureSet.get_active()
 
-fset.requirements = {'base'}
+fset.requirements = {'core', 'base'}
 
 # We'd prefer our name's title form to be 'UI V1', not the default 'Ui V1'.
 fset.name_title = 'UI V1'
diff --git a/config/featuresets/featureset_ui_v1_lib.py b/config/featuresets/featureset_ui_v1_lib.py
new file mode 100644
index 00000000..77554932
--- /dev/null
+++ b/config/featuresets/featureset_ui_v1_lib.py
@@ -0,0 +1,17 @@
+# Released under the MIT License. See LICENSE for details.
+#
+# pylint: disable=missing-docstring, invalid-name
+from __future__ import annotations
+
+# This file is exec'ed by the spinoff system, allowing us to define
+# values and behavior for this feature-set here in a programmatic way
+# that can also be type-checked alongside other project Python code.
+
+from batools.featureset import FeatureSet
+
+# Grab the FeatureSet we should apply to.
+fset = FeatureSet.get_active()
+
+fset.has_native_python_module = False
+
+fset.requirements = {'core', 'base', 'ui_v1'}
diff --git a/config/toolconfigsrc/mypy.ini b/config/toolconfigsrc/mypy.ini
index 61feb823..5f65e91e 100644
--- a/config/toolconfigsrc/mypy.ini
+++ b/config/toolconfigsrc/mypy.ini
@@ -18,7 +18,7 @@ ignore_missing_imports = True
 [mypy-xml.*]
 ignore_missing_imports = True
 
-[mypy-bastd.mapdata.*]
+[mypy-bascenev1lib.mapdata.*]
 ignore_errors = True
 
 [mypy-astroid.*]
diff --git a/src/assets/.asset_manifest_public.json b/src/assets/.asset_manifest_public.json
index 5180433c..e1420658 100644
--- a/src/assets/.asset_manifest_public.json
+++ b/src/assets/.asset_manifest_public.json
@@ -191,354 +191,152 @@
  "ba_data/python/bascenev1/_team.py",
  "ba_data/python/bascenev1/_teamgame.py",
  "ba_data/python/bascenev1/internal.py",
- "ba_data/python/bastd/__init__.py",
- "ba_data/python/bastd/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/__pycache__/gameutils.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/__pycache__/mainmenu.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/__pycache__/maps.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/__pycache__/tutorial.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__init__.py",
- "ba_data/python/bastd/activity/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/coopjoin.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/coopscore.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/drawscore.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/dualteamscore.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/freeforallvictory.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/multiteamjoin.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/multiteamscore.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/__pycache__/multiteamvictory.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/activity/coopjoin.py",
- "ba_data/python/bastd/activity/coopscore.py",
- "ba_data/python/bastd/activity/drawscore.py",
- "ba_data/python/bastd/activity/dualteamscore.py",
- "ba_data/python/bastd/activity/freeforallvictory.py",
- "ba_data/python/bastd/activity/multiteamjoin.py",
- "ba_data/python/bastd/activity/multiteamscore.py",
- "ba_data/python/bastd/activity/multiteamvictory.py",
- "ba_data/python/bastd/actor/__init__.py",
- "ba_data/python/bastd/actor/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/background.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/bomb.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/controlsguide.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/flag.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/image.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/onscreencountdown.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/onscreentimer.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/playerspaz.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/popuptext.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/powerupbox.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/respawnicon.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/scoreboard.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/spawner.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/spaz.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/spazappearance.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/spazbot.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/spazfactory.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/text.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/tipstext.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/__pycache__/zoomtext.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/actor/background.py",
- "ba_data/python/bastd/actor/bomb.py",
- "ba_data/python/bastd/actor/controlsguide.py",
- "ba_data/python/bastd/actor/flag.py",
- "ba_data/python/bastd/actor/image.py",
- "ba_data/python/bastd/actor/onscreencountdown.py",
- "ba_data/python/bastd/actor/onscreentimer.py",
- "ba_data/python/bastd/actor/playerspaz.py",
- "ba_data/python/bastd/actor/popuptext.py",
- "ba_data/python/bastd/actor/powerupbox.py",
- "ba_data/python/bastd/actor/respawnicon.py",
- "ba_data/python/bastd/actor/scoreboard.py",
- "ba_data/python/bastd/actor/spawner.py",
- "ba_data/python/bastd/actor/spaz.py",
- "ba_data/python/bastd/actor/spazappearance.py",
- "ba_data/python/bastd/actor/spazbot.py",
- "ba_data/python/bastd/actor/spazfactory.py",
- "ba_data/python/bastd/actor/text.py",
- "ba_data/python/bastd/actor/tipstext.py",
- "ba_data/python/bastd/actor/zoomtext.py",
- "ba_data/python/bastd/game/__init__.py",
- "ba_data/python/bastd/game/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/assault.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/capturetheflag.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/chosenone.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/conquest.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/deathmatch.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/easteregghunt.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/elimination.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/football.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/hockey.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/keepaway.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/kingofthehill.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/meteorshower.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/ninjafight.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/onslaught.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/race.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/runaround.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/targetpractice.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/__pycache__/thelaststand.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/game/assault.py",
- "ba_data/python/bastd/game/capturetheflag.py",
- "ba_data/python/bastd/game/chosenone.py",
- "ba_data/python/bastd/game/conquest.py",
- "ba_data/python/bastd/game/deathmatch.py",
- "ba_data/python/bastd/game/easteregghunt.py",
- "ba_data/python/bastd/game/elimination.py",
- "ba_data/python/bastd/game/football.py",
- "ba_data/python/bastd/game/hockey.py",
- "ba_data/python/bastd/game/keepaway.py",
- "ba_data/python/bastd/game/kingofthehill.py",
- "ba_data/python/bastd/game/meteorshower.py",
- "ba_data/python/bastd/game/ninjafight.py",
- "ba_data/python/bastd/game/onslaught.py",
- "ba_data/python/bastd/game/race.py",
- "ba_data/python/bastd/game/runaround.py",
- "ba_data/python/bastd/game/targetpractice.py",
- "ba_data/python/bastd/game/thelaststand.py",
- "ba_data/python/bastd/gameutils.py",
- "ba_data/python/bastd/keyboard/__init__.py",
- "ba_data/python/bastd/keyboard/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/keyboard/__pycache__/englishkeyboard.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/keyboard/englishkeyboard.py",
- "ba_data/python/bastd/mainmenu.py",
- "ba_data/python/bastd/mapdata/__init__.py",
- "ba_data/python/bastd/mapdata/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/big_g.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/bridgit.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/courtyard.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/crag_castle.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/doom_shroom.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/football_stadium.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/happy_thoughts.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/hockey_stadium.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/lake_frigid.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/monkey_face.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/rampage.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/roundabout.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/step_right_up.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/the_pad.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/tip_top.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/tower_d.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/__pycache__/zig_zag.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/mapdata/big_g.py",
- "ba_data/python/bastd/mapdata/bridgit.py",
- "ba_data/python/bastd/mapdata/courtyard.py",
- "ba_data/python/bastd/mapdata/crag_castle.py",
- "ba_data/python/bastd/mapdata/doom_shroom.py",
- "ba_data/python/bastd/mapdata/football_stadium.py",
- "ba_data/python/bastd/mapdata/happy_thoughts.py",
- "ba_data/python/bastd/mapdata/hockey_stadium.py",
- "ba_data/python/bastd/mapdata/lake_frigid.py",
- "ba_data/python/bastd/mapdata/monkey_face.py",
- "ba_data/python/bastd/mapdata/rampage.py",
- "ba_data/python/bastd/mapdata/roundabout.py",
- "ba_data/python/bastd/mapdata/step_right_up.py",
- "ba_data/python/bastd/mapdata/the_pad.py",
- "ba_data/python/bastd/mapdata/tip_top.py",
- "ba_data/python/bastd/mapdata/tower_d.py",
- "ba_data/python/bastd/mapdata/zig_zag.py",
- "ba_data/python/bastd/maps.py",
- "ba_data/python/bastd/session/__init__.py",
- "ba_data/python/bastd/session/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/tutorial.py",
- "ba_data/python/bastd/ui/__init__.py",
- "ba_data/python/bastd/ui/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/achievements.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/appinvite.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/characterpicker.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/colorpicker.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/config.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/configerror.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/confirm.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/continues.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/creditslist.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/debug.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/feedback.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/fileselector.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/getcurrency.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/getremote.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/helpui.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/iconpicker.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/kiosk.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/mainmenu.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/party.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/partyqueue.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/play.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/playoptions.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/popup.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/promocode.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/purchase.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/qrcode.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/radiogroup.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/report.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/resourcetypeinfo.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/serverdialog.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/specialoffer.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/tabs.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/teamnamescolors.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/tournamententry.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/tournamentscores.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/trophies.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/url.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/v2upgrade.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/__pycache__/watch.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/__init__.py",
- "ba_data/python/bastd/ui/account/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/__pycache__/link.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/__pycache__/settings.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/__pycache__/unlink.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/__pycache__/v2proxy.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/__pycache__/viewer.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/account/link.py",
- "ba_data/python/bastd/ui/account/settings.py",
- "ba_data/python/bastd/ui/account/unlink.py",
- "ba_data/python/bastd/ui/account/v2proxy.py",
- "ba_data/python/bastd/ui/account/viewer.py",
- "ba_data/python/bastd/ui/achievements.py",
- "ba_data/python/bastd/ui/appinvite.py",
- "ba_data/python/bastd/ui/characterpicker.py",
- "ba_data/python/bastd/ui/colorpicker.py",
- "ba_data/python/bastd/ui/config.py",
- "ba_data/python/bastd/ui/configerror.py",
- "ba_data/python/bastd/ui/confirm.py",
- "ba_data/python/bastd/ui/continues.py",
- "ba_data/python/bastd/ui/coop/__init__.py",
- "ba_data/python/bastd/ui/coop/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/coop/__pycache__/browser.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/coop/__pycache__/gamebutton.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/coop/__pycache__/level.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/coop/__pycache__/tournamentbutton.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/coop/browser.py",
- "ba_data/python/bastd/ui/coop/gamebutton.py",
- "ba_data/python/bastd/ui/coop/level.py",
- "ba_data/python/bastd/ui/coop/tournamentbutton.py",
- "ba_data/python/bastd/ui/creditslist.py",
- "ba_data/python/bastd/ui/debug.py",
- "ba_data/python/bastd/ui/feedback.py",
- "ba_data/python/bastd/ui/fileselector.py",
- "ba_data/python/bastd/ui/gather/__init__.py",
- "ba_data/python/bastd/ui/gather/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/gather/__pycache__/abouttab.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/gather/__pycache__/manualtab.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/gather/__pycache__/nearbytab.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/gather/__pycache__/privatetab.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/gather/__pycache__/publictab.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/gather/abouttab.py",
- "ba_data/python/bastd/ui/gather/manualtab.py",
- "ba_data/python/bastd/ui/gather/nearbytab.py",
- "ba_data/python/bastd/ui/gather/privatetab.py",
- "ba_data/python/bastd/ui/gather/publictab.py",
- "ba_data/python/bastd/ui/getcurrency.py",
- "ba_data/python/bastd/ui/getremote.py",
- "ba_data/python/bastd/ui/helpui.py",
- "ba_data/python/bastd/ui/iconpicker.py",
- "ba_data/python/bastd/ui/kiosk.py",
- "ba_data/python/bastd/ui/league/__init__.py",
- "ba_data/python/bastd/ui/league/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/league/__pycache__/rankbutton.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/league/__pycache__/rankwindow.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/league/rankbutton.py",
- "ba_data/python/bastd/ui/league/rankwindow.py",
- "ba_data/python/bastd/ui/mainmenu.py",
- "ba_data/python/bastd/ui/party.py",
- "ba_data/python/bastd/ui/partyqueue.py",
- "ba_data/python/bastd/ui/play.py",
- "ba_data/python/bastd/ui/playlist/__init__.py",
- "ba_data/python/bastd/ui/playlist/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/addgame.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/browser.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/customizebrowser.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/edit.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/editcontroller.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/editgame.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/mapselect.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/__pycache__/share.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/playlist/addgame.py",
- "ba_data/python/bastd/ui/playlist/browser.py",
- "ba_data/python/bastd/ui/playlist/customizebrowser.py",
- "ba_data/python/bastd/ui/playlist/edit.py",
- "ba_data/python/bastd/ui/playlist/editcontroller.py",
- "ba_data/python/bastd/ui/playlist/editgame.py",
- "ba_data/python/bastd/ui/playlist/mapselect.py",
- "ba_data/python/bastd/ui/playlist/share.py",
- "ba_data/python/bastd/ui/playoptions.py",
- "ba_data/python/bastd/ui/popup.py",
- "ba_data/python/bastd/ui/profile/__init__.py",
- "ba_data/python/bastd/ui/profile/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/profile/__pycache__/browser.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/profile/__pycache__/edit.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/profile/__pycache__/upgrade.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/profile/browser.py",
- "ba_data/python/bastd/ui/profile/edit.py",
- "ba_data/python/bastd/ui/profile/upgrade.py",
- "ba_data/python/bastd/ui/promocode.py",
- "ba_data/python/bastd/ui/purchase.py",
- "ba_data/python/bastd/ui/qrcode.py",
- "ba_data/python/bastd/ui/radiogroup.py",
- "ba_data/python/bastd/ui/report.py",
- "ba_data/python/bastd/ui/resourcetypeinfo.py",
- "ba_data/python/bastd/ui/serverdialog.py",
- "ba_data/python/bastd/ui/settings/__init__.py",
- "ba_data/python/bastd/ui/settings/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/advanced.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/allsettings.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/audio.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/controls.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/gamepad.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/gamepadadvanced.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/gamepadselect.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/graphics.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/nettesting.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/plugins.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/pluginsettings.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/remoteapp.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/testing.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/__pycache__/vrtesting.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/settings/advanced.py",
- "ba_data/python/bastd/ui/settings/allsettings.py",
- "ba_data/python/bastd/ui/settings/audio.py",
- "ba_data/python/bastd/ui/settings/controls.py",
- "ba_data/python/bastd/ui/settings/gamepad.py",
- "ba_data/python/bastd/ui/settings/gamepadadvanced.py",
- "ba_data/python/bastd/ui/settings/gamepadselect.py",
- "ba_data/python/bastd/ui/settings/graphics.py",
- "ba_data/python/bastd/ui/settings/keyboard.py",
- "ba_data/python/bastd/ui/settings/nettesting.py",
- "ba_data/python/bastd/ui/settings/plugins.py",
- "ba_data/python/bastd/ui/settings/pluginsettings.py",
- "ba_data/python/bastd/ui/settings/remoteapp.py",
- "ba_data/python/bastd/ui/settings/testing.py",
- "ba_data/python/bastd/ui/settings/touchscreen.py",
- "ba_data/python/bastd/ui/settings/vrtesting.py",
- "ba_data/python/bastd/ui/soundtrack/__init__.py",
- "ba_data/python/bastd/ui/soundtrack/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/soundtrack/__pycache__/browser.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/soundtrack/__pycache__/edit.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/soundtrack/__pycache__/entrytypeselect.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/soundtrack/__pycache__/macmusicapp.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/soundtrack/browser.py",
- "ba_data/python/bastd/ui/soundtrack/edit.py",
- "ba_data/python/bastd/ui/soundtrack/entrytypeselect.py",
- "ba_data/python/bastd/ui/soundtrack/macmusicapp.py",
- "ba_data/python/bastd/ui/specialoffer.py",
- "ba_data/python/bastd/ui/store/__init__.py",
- "ba_data/python/bastd/ui/store/__pycache__/__init__.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/store/__pycache__/browser.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/store/__pycache__/button.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/store/__pycache__/item.cpython-311.opt-1.pyc",
- "ba_data/python/bastd/ui/store/browser.py",
- "ba_data/python/bastd/ui/store/button.py",
- "ba_data/python/bastd/ui/store/item.py",
- "ba_data/python/bastd/ui/tabs.py",
- "ba_data/python/bastd/ui/teamnamescolors.py",
- "ba_data/python/bastd/ui/tournamententry.py",
- "ba_data/python/bastd/ui/tournamentscores.py",
- "ba_data/python/bastd/ui/trophies.py",
- "ba_data/python/bastd/ui/url.py",
- "ba_data/python/bastd/ui/v2upgrade.py",
- "ba_data/python/bastd/ui/watch.py",
+ "ba_data/python/bascenev1lib/__init__.py",
+ "ba_data/python/bascenev1lib/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/__pycache__/gameutils.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/__pycache__/mainmenu.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/__pycache__/maps.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/__pycache__/tutorial.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__init__.py",
+ "ba_data/python/bascenev1lib/activity/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/coopjoin.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/coopscore.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/drawscore.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/dualteamscore.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/freeforallvictory.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/multiteamjoin.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/multiteamscore.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/__pycache__/multiteamvictory.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/activity/coopjoin.py",
+ "ba_data/python/bascenev1lib/activity/coopscore.py",
+ "ba_data/python/bascenev1lib/activity/drawscore.py",
+ "ba_data/python/bascenev1lib/activity/dualteamscore.py",
+ "ba_data/python/bascenev1lib/activity/freeforallvictory.py",
+ "ba_data/python/bascenev1lib/activity/multiteamjoin.py",
+ "ba_data/python/bascenev1lib/activity/multiteamscore.py",
+ "ba_data/python/bascenev1lib/activity/multiteamvictory.py",
+ "ba_data/python/bascenev1lib/actor/__init__.py",
+ "ba_data/python/bascenev1lib/actor/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/background.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/bomb.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/controlsguide.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/flag.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/image.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/onscreencountdown.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/onscreentimer.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/playerspaz.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/popuptext.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/powerupbox.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/respawnicon.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/scoreboard.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/spawner.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/spaz.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/spazappearance.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/spazbot.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/spazfactory.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/text.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/tipstext.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/__pycache__/zoomtext.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/actor/background.py",
+ "ba_data/python/bascenev1lib/actor/bomb.py",
+ "ba_data/python/bascenev1lib/actor/controlsguide.py",
+ "ba_data/python/bascenev1lib/actor/flag.py",
+ "ba_data/python/bascenev1lib/actor/image.py",
+ "ba_data/python/bascenev1lib/actor/onscreencountdown.py",
+ "ba_data/python/bascenev1lib/actor/onscreentimer.py",
+ "ba_data/python/bascenev1lib/actor/playerspaz.py",
+ "ba_data/python/bascenev1lib/actor/popuptext.py",
+ "ba_data/python/bascenev1lib/actor/powerupbox.py",
+ "ba_data/python/bascenev1lib/actor/respawnicon.py",
+ "ba_data/python/bascenev1lib/actor/scoreboard.py",
+ "ba_data/python/bascenev1lib/actor/spawner.py",
+ "ba_data/python/bascenev1lib/actor/spaz.py",
+ "ba_data/python/bascenev1lib/actor/spazappearance.py",
+ "ba_data/python/bascenev1lib/actor/spazbot.py",
+ "ba_data/python/bascenev1lib/actor/spazfactory.py",
+ "ba_data/python/bascenev1lib/actor/text.py",
+ "ba_data/python/bascenev1lib/actor/tipstext.py",
+ "ba_data/python/bascenev1lib/actor/zoomtext.py",
+ "ba_data/python/bascenev1lib/game/__init__.py",
+ "ba_data/python/bascenev1lib/game/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/assault.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/capturetheflag.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/chosenone.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/conquest.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/deathmatch.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/easteregghunt.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/elimination.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/football.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/hockey.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/keepaway.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/kingofthehill.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/meteorshower.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/ninjafight.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/onslaught.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/race.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/runaround.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/targetpractice.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/__pycache__/thelaststand.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/game/assault.py",
+ "ba_data/python/bascenev1lib/game/capturetheflag.py",
+ "ba_data/python/bascenev1lib/game/chosenone.py",
+ "ba_data/python/bascenev1lib/game/conquest.py",
+ "ba_data/python/bascenev1lib/game/deathmatch.py",
+ "ba_data/python/bascenev1lib/game/easteregghunt.py",
+ "ba_data/python/bascenev1lib/game/elimination.py",
+ "ba_data/python/bascenev1lib/game/football.py",
+ "ba_data/python/bascenev1lib/game/hockey.py",
+ "ba_data/python/bascenev1lib/game/keepaway.py",
+ "ba_data/python/bascenev1lib/game/kingofthehill.py",
+ "ba_data/python/bascenev1lib/game/meteorshower.py",
+ "ba_data/python/bascenev1lib/game/ninjafight.py",
+ "ba_data/python/bascenev1lib/game/onslaught.py",
+ "ba_data/python/bascenev1lib/game/race.py",
+ "ba_data/python/bascenev1lib/game/runaround.py",
+ "ba_data/python/bascenev1lib/game/targetpractice.py",
+ "ba_data/python/bascenev1lib/game/thelaststand.py",
+ "ba_data/python/bascenev1lib/gameutils.py",
+ "ba_data/python/bascenev1lib/mainmenu.py",
+ "ba_data/python/bascenev1lib/mapdata/__init__.py",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/big_g.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/bridgit.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/courtyard.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/crag_castle.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/doom_shroom.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/football_stadium.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/happy_thoughts.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/hockey_stadium.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/lake_frigid.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/monkey_face.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/rampage.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/roundabout.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/step_right_up.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/the_pad.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/tip_top.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/tower_d.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/__pycache__/zig_zag.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/mapdata/big_g.py",
+ "ba_data/python/bascenev1lib/mapdata/bridgit.py",
+ "ba_data/python/bascenev1lib/mapdata/courtyard.py",
+ "ba_data/python/bascenev1lib/mapdata/crag_castle.py",
+ "ba_data/python/bascenev1lib/mapdata/doom_shroom.py",
+ "ba_data/python/bascenev1lib/mapdata/football_stadium.py",
+ "ba_data/python/bascenev1lib/mapdata/happy_thoughts.py",
+ "ba_data/python/bascenev1lib/mapdata/hockey_stadium.py",
+ "ba_data/python/bascenev1lib/mapdata/lake_frigid.py",
+ "ba_data/python/bascenev1lib/mapdata/monkey_face.py",
+ "ba_data/python/bascenev1lib/mapdata/rampage.py",
+ "ba_data/python/bascenev1lib/mapdata/roundabout.py",
+ "ba_data/python/bascenev1lib/mapdata/step_right_up.py",
+ "ba_data/python/bascenev1lib/mapdata/the_pad.py",
+ "ba_data/python/bascenev1lib/mapdata/tip_top.py",
+ "ba_data/python/bascenev1lib/mapdata/tower_d.py",
+ "ba_data/python/bascenev1lib/mapdata/zig_zag.py",
+ "ba_data/python/bascenev1lib/maps.py",
+ "ba_data/python/bascenev1lib/session/__init__.py",
+ "ba_data/python/bascenev1lib/session/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bascenev1lib/tutorial.py",
  "ba_data/python/batemplatefs/__init__.py",
  "ba_data/python/batemplatefs/__pycache__/__init__.cpython-311.opt-1.pyc",
  "ba_data/python/batemplatefs/__pycache__/_hooks.cpython-311.opt-1.pyc",
@@ -555,6 +353,208 @@
  "ba_data/python/bauiv1/onscreenkeyboard.py",
  "ba_data/python/bauiv1/ui/__init__.py",
  "ba_data/python/bauiv1/ui/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__init__.py",
+ "ba_data/python/bauiv1lib/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/achievements.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/appinvite.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/characterpicker.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/colorpicker.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/config.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/configerror.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/confirm.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/continues.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/creditslist.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/debug.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/feedback.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/fileselector.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/getcurrency.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/getremote.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/helpui.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/iconpicker.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/kiosk.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/mainmenu.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/party.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/partyqueue.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/play.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/playoptions.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/popup.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/promocode.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/purchase.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/qrcode.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/radiogroup.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/report.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/resourcetypeinfo.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/serverdialog.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/specialoffer.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/tabs.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/teamnamescolors.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/tournamententry.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/tournamentscores.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/trophies.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/url.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/v2upgrade.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/__pycache__/watch.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/__init__.py",
+ "ba_data/python/bauiv1lib/account/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/__pycache__/link.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/__pycache__/settings.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/__pycache__/unlink.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/__pycache__/v2proxy.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/__pycache__/viewer.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/account/link.py",
+ "ba_data/python/bauiv1lib/account/settings.py",
+ "ba_data/python/bauiv1lib/account/unlink.py",
+ "ba_data/python/bauiv1lib/account/v2proxy.py",
+ "ba_data/python/bauiv1lib/account/viewer.py",
+ "ba_data/python/bauiv1lib/achievements.py",
+ "ba_data/python/bauiv1lib/appinvite.py",
+ "ba_data/python/bauiv1lib/characterpicker.py",
+ "ba_data/python/bauiv1lib/colorpicker.py",
+ "ba_data/python/bauiv1lib/config.py",
+ "ba_data/python/bauiv1lib/configerror.py",
+ "ba_data/python/bauiv1lib/confirm.py",
+ "ba_data/python/bauiv1lib/continues.py",
+ "ba_data/python/bauiv1lib/coop/__init__.py",
+ "ba_data/python/bauiv1lib/coop/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/coop/__pycache__/browser.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/coop/__pycache__/gamebutton.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/coop/__pycache__/level.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/coop/__pycache__/tournamentbutton.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/coop/browser.py",
+ "ba_data/python/bauiv1lib/coop/gamebutton.py",
+ "ba_data/python/bauiv1lib/coop/level.py",
+ "ba_data/python/bauiv1lib/coop/tournamentbutton.py",
+ "ba_data/python/bauiv1lib/creditslist.py",
+ "ba_data/python/bauiv1lib/debug.py",
+ "ba_data/python/bauiv1lib/feedback.py",
+ "ba_data/python/bauiv1lib/fileselector.py",
+ "ba_data/python/bauiv1lib/gather/__init__.py",
+ "ba_data/python/bauiv1lib/gather/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/gather/__pycache__/abouttab.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/gather/__pycache__/manualtab.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/gather/__pycache__/nearbytab.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/gather/__pycache__/privatetab.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/gather/__pycache__/publictab.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/gather/abouttab.py",
+ "ba_data/python/bauiv1lib/gather/manualtab.py",
+ "ba_data/python/bauiv1lib/gather/nearbytab.py",
+ "ba_data/python/bauiv1lib/gather/privatetab.py",
+ "ba_data/python/bauiv1lib/gather/publictab.py",
+ "ba_data/python/bauiv1lib/getcurrency.py",
+ "ba_data/python/bauiv1lib/getremote.py",
+ "ba_data/python/bauiv1lib/helpui.py",
+ "ba_data/python/bauiv1lib/iconpicker.py",
+ "ba_data/python/bauiv1lib/keyboard/__init__.py",
+ "ba_data/python/bauiv1lib/keyboard/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/keyboard/__pycache__/englishkeyboard.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/keyboard/englishkeyboard.py",
+ "ba_data/python/bauiv1lib/kiosk.py",
+ "ba_data/python/bauiv1lib/league/__init__.py",
+ "ba_data/python/bauiv1lib/league/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/league/__pycache__/rankbutton.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/league/__pycache__/rankwindow.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/league/rankbutton.py",
+ "ba_data/python/bauiv1lib/league/rankwindow.py",
+ "ba_data/python/bauiv1lib/mainmenu.py",
+ "ba_data/python/bauiv1lib/party.py",
+ "ba_data/python/bauiv1lib/partyqueue.py",
+ "ba_data/python/bauiv1lib/play.py",
+ "ba_data/python/bauiv1lib/playlist/__init__.py",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/addgame.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/browser.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/customizebrowser.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/edit.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/editcontroller.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/editgame.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/mapselect.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/__pycache__/share.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/playlist/addgame.py",
+ "ba_data/python/bauiv1lib/playlist/browser.py",
+ "ba_data/python/bauiv1lib/playlist/customizebrowser.py",
+ "ba_data/python/bauiv1lib/playlist/edit.py",
+ "ba_data/python/bauiv1lib/playlist/editcontroller.py",
+ "ba_data/python/bauiv1lib/playlist/editgame.py",
+ "ba_data/python/bauiv1lib/playlist/mapselect.py",
+ "ba_data/python/bauiv1lib/playlist/share.py",
+ "ba_data/python/bauiv1lib/playoptions.py",
+ "ba_data/python/bauiv1lib/popup.py",
+ "ba_data/python/bauiv1lib/profile/__init__.py",
+ "ba_data/python/bauiv1lib/profile/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/profile/__pycache__/browser.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/profile/__pycache__/edit.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/profile/__pycache__/upgrade.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/profile/browser.py",
+ "ba_data/python/bauiv1lib/profile/edit.py",
+ "ba_data/python/bauiv1lib/profile/upgrade.py",
+ "ba_data/python/bauiv1lib/promocode.py",
+ "ba_data/python/bauiv1lib/purchase.py",
+ "ba_data/python/bauiv1lib/qrcode.py",
+ "ba_data/python/bauiv1lib/radiogroup.py",
+ "ba_data/python/bauiv1lib/report.py",
+ "ba_data/python/bauiv1lib/resourcetypeinfo.py",
+ "ba_data/python/bauiv1lib/serverdialog.py",
+ "ba_data/python/bauiv1lib/settings/__init__.py",
+ "ba_data/python/bauiv1lib/settings/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/advanced.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/allsettings.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/audio.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/controls.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/gamepad.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/gamepadadvanced.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/gamepadselect.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/graphics.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/keyboard.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/nettesting.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/plugins.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/pluginsettings.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/remoteapp.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/testing.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/touchscreen.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/__pycache__/vrtesting.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/settings/advanced.py",
+ "ba_data/python/bauiv1lib/settings/allsettings.py",
+ "ba_data/python/bauiv1lib/settings/audio.py",
+ "ba_data/python/bauiv1lib/settings/controls.py",
+ "ba_data/python/bauiv1lib/settings/gamepad.py",
+ "ba_data/python/bauiv1lib/settings/gamepadadvanced.py",
+ "ba_data/python/bauiv1lib/settings/gamepadselect.py",
+ "ba_data/python/bauiv1lib/settings/graphics.py",
+ "ba_data/python/bauiv1lib/settings/keyboard.py",
+ "ba_data/python/bauiv1lib/settings/nettesting.py",
+ "ba_data/python/bauiv1lib/settings/plugins.py",
+ "ba_data/python/bauiv1lib/settings/pluginsettings.py",
+ "ba_data/python/bauiv1lib/settings/remoteapp.py",
+ "ba_data/python/bauiv1lib/settings/testing.py",
+ "ba_data/python/bauiv1lib/settings/touchscreen.py",
+ "ba_data/python/bauiv1lib/settings/vrtesting.py",
+ "ba_data/python/bauiv1lib/soundtrack/__init__.py",
+ "ba_data/python/bauiv1lib/soundtrack/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/soundtrack/__pycache__/browser.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/soundtrack/__pycache__/edit.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/soundtrack/__pycache__/entrytypeselect.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/soundtrack/__pycache__/macmusicapp.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/soundtrack/browser.py",
+ "ba_data/python/bauiv1lib/soundtrack/edit.py",
+ "ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py",
+ "ba_data/python/bauiv1lib/soundtrack/macmusicapp.py",
+ "ba_data/python/bauiv1lib/specialoffer.py",
+ "ba_data/python/bauiv1lib/store/__init__.py",
+ "ba_data/python/bauiv1lib/store/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/store/__pycache__/browser.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/store/__pycache__/button.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/store/__pycache__/item.cpython-311.opt-1.pyc",
+ "ba_data/python/bauiv1lib/store/browser.py",
+ "ba_data/python/bauiv1lib/store/button.py",
+ "ba_data/python/bauiv1lib/store/item.py",
+ "ba_data/python/bauiv1lib/tabs.py",
+ "ba_data/python/bauiv1lib/teamnamescolors.py",
+ "ba_data/python/bauiv1lib/tournamententry.py",
+ "ba_data/python/bauiv1lib/tournamentscores.py",
+ "ba_data/python/bauiv1lib/trophies.py",
+ "ba_data/python/bauiv1lib/url.py",
+ "ba_data/python/bauiv1lib/v2upgrade.py",
+ "ba_data/python/bauiv1lib/watch.py",
  "ba_data/python/efro/__init__.py",
  "ba_data/python/efro/__pycache__/__init__.cpython-311.opt-1.pyc",
  "ba_data/python/efro/__pycache__/call.cpython-311.opt-1.pyc",
diff --git a/src/assets/Makefile b/src/assets/Makefile
index 8e9795e2..439718ea 100644
--- a/src/assets/Makefile
+++ b/src/assets/Makefile
@@ -232,180 +232,79 @@ SCRIPT_TARGETS_PY_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/bascenev1/_team.py \
   $(BUILD_DIR)/ba_data/python/bascenev1/_teamgame.py \
   $(BUILD_DIR)/ba_data/python/bascenev1/internal.py \
-  $(BUILD_DIR)/ba_data/python/bastd/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/coopjoin.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/coopscore.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/drawscore.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/dualteamscore.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/freeforallvictory.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/multiteamjoin.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/multiteamscore.py \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/multiteamvictory.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/background.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/bomb.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/controlsguide.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/flag.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/image.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/onscreencountdown.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/onscreentimer.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/playerspaz.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/popuptext.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/powerupbox.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/respawnicon.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/scoreboard.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/spawner.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/spaz.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/spazappearance.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/spazbot.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/spazfactory.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/text.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/tipstext.py \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/zoomtext.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/assault.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/capturetheflag.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/chosenone.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/conquest.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/deathmatch.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/easteregghunt.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/elimination.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/football.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/hockey.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/keepaway.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/kingofthehill.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/meteorshower.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/ninjafight.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/onslaught.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/race.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/runaround.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/targetpractice.py \
-  $(BUILD_DIR)/ba_data/python/bastd/game/thelaststand.py \
-  $(BUILD_DIR)/ba_data/python/bastd/gameutils.py \
-  $(BUILD_DIR)/ba_data/python/bastd/keyboard/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/keyboard/englishkeyboard.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mainmenu.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/big_g.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/bridgit.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/courtyard.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/crag_castle.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/doom_shroom.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/football_stadium.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/happy_thoughts.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/hockey_stadium.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/lake_frigid.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/monkey_face.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/rampage.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/roundabout.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/step_right_up.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/the_pad.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/tip_top.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/tower_d.py \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/zig_zag.py \
-  $(BUILD_DIR)/ba_data/python/bastd/maps.py \
-  $(BUILD_DIR)/ba_data/python/bastd/session/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/tutorial.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/link.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/settings.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/unlink.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/v2proxy.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/viewer.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/achievements.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/appinvite.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/characterpicker.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/colorpicker.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/config.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/configerror.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/confirm.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/continues.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/browser.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/gamebutton.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/level.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/tournamentbutton.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/creditslist.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/debug.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/feedback.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/fileselector.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/abouttab.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/manualtab.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/nearbytab.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/privatetab.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/publictab.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/getcurrency.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/getremote.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/helpui.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/iconpicker.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/kiosk.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/league/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/league/rankbutton.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/league/rankwindow.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/mainmenu.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/party.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/partyqueue.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/play.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/addgame.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/browser.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/customizebrowser.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/edit.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/editcontroller.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/editgame.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/mapselect.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/share.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playoptions.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/popup.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/browser.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/edit.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/upgrade.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/promocode.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/purchase.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/qrcode.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/radiogroup.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/report.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/resourcetypeinfo.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/serverdialog.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/advanced.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/allsettings.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/audio.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/controls.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/gamepad.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/gamepadadvanced.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/gamepadselect.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/graphics.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/keyboard.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/nettesting.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/plugins.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/pluginsettings.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/remoteapp.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/testing.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/touchscreen.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/vrtesting.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/browser.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/edit.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/entrytypeselect.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/macmusicapp.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/specialoffer.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/__init__.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/browser.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/button.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/item.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/tabs.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/teamnamescolors.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/tournamententry.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/tournamentscores.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/trophies.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/url.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/v2upgrade.py \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/watch.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/coopjoin.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/coopscore.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/drawscore.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/dualteamscore.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/freeforallvictory.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/multiteamjoin.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/multiteamscore.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/multiteamvictory.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/background.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/bomb.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/controlsguide.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/flag.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/image.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/onscreencountdown.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/onscreentimer.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/playerspaz.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/popuptext.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/powerupbox.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/respawnicon.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/scoreboard.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/spawner.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/spaz.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/spazappearance.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/spazbot.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/spazfactory.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/text.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/tipstext.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/zoomtext.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/assault.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/capturetheflag.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/chosenone.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/conquest.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/deathmatch.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/easteregghunt.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/elimination.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/football.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/hockey.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/keepaway.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/kingofthehill.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/meteorshower.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/ninjafight.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/onslaught.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/race.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/runaround.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/targetpractice.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/thelaststand.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/gameutils.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mainmenu.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/big_g.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/bridgit.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/courtyard.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/crag_castle.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/doom_shroom.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/football_stadium.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/happy_thoughts.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/hockey_stadium.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/lake_frigid.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/monkey_face.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/rampage.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/roundabout.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/step_right_up.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/the_pad.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/tip_top.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/tower_d.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/zig_zag.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/maps.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/session/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/tutorial.py \
   $(BUILD_DIR)/ba_data/python/batemplatefs/__init__.py \
   $(BUILD_DIR)/ba_data/python/batemplatefs/_hooks.py \
   $(BUILD_DIR)/ba_data/python/batemplatefs/_subsystem.py \
@@ -414,6 +313,107 @@ SCRIPT_TARGETS_PY_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/bauiv1/modutils.py \
   $(BUILD_DIR)/ba_data/python/bauiv1/onscreenkeyboard.py \
   $(BUILD_DIR)/ba_data/python/bauiv1/ui/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/link.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/settings.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/unlink.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/v2proxy.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/viewer.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/achievements.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/appinvite.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/characterpicker.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/colorpicker.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/config.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/configerror.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/confirm.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/continues.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/browser.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/gamebutton.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/level.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/tournamentbutton.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/creditslist.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/debug.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/feedback.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/fileselector.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/abouttab.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/manualtab.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/nearbytab.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/privatetab.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/publictab.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/getcurrency.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/getremote.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/helpui.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/iconpicker.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/keyboard/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/keyboard/englishkeyboard.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/kiosk.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/league/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/league/rankbutton.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/league/rankwindow.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/mainmenu.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/party.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/partyqueue.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/play.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/addgame.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/browser.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/customizebrowser.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/edit.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/editcontroller.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/editgame.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/mapselect.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/share.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playoptions.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/popup.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/browser.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/edit.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/upgrade.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/promocode.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/purchase.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/qrcode.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/radiogroup.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/report.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/resourcetypeinfo.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/serverdialog.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/advanced.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/allsettings.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/audio.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/controls.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/gamepad.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/gamepadadvanced.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/gamepadselect.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/graphics.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/keyboard.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/nettesting.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/plugins.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/pluginsettings.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/remoteapp.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/testing.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/touchscreen.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/vrtesting.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/browser.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/edit.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/specialoffer.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/__init__.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/browser.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/button.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/item.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/tabs.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/teamnamescolors.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/tournamententry.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/tournamentscores.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/trophies.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/url.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/v2upgrade.py \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/watch.py \
   $(BUILD_DIR)/server_package/ballisticakit_server.py
 
 SCRIPT_TARGETS_PYC_PUBLIC = \
@@ -504,180 +504,79 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/bascenev1/__pycache__/_team.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/bascenev1/__pycache__/_teamgame.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/bascenev1/__pycache__/internal.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/coopjoin.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/coopscore.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/drawscore.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/dualteamscore.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/freeforallvictory.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/multiteamjoin.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/multiteamscore.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/activity/__pycache__/multiteamvictory.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/background.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/bomb.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/controlsguide.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/flag.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/image.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/onscreencountdown.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/onscreentimer.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/playerspaz.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/popuptext.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/powerupbox.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/respawnicon.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/scoreboard.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/spawner.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/spaz.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/spazappearance.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/spazbot.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/spazfactory.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/text.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/tipstext.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/actor/__pycache__/zoomtext.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/assault.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/capturetheflag.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/chosenone.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/conquest.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/deathmatch.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/easteregghunt.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/elimination.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/football.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/hockey.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/keepaway.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/kingofthehill.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/meteorshower.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/ninjafight.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/onslaught.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/race.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/runaround.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/targetpractice.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/game/__pycache__/thelaststand.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/__pycache__/gameutils.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/keyboard/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/keyboard/__pycache__/englishkeyboard.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/__pycache__/mainmenu.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/big_g.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/bridgit.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/courtyard.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/crag_castle.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/doom_shroom.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/football_stadium.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/happy_thoughts.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/hockey_stadium.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/lake_frigid.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/monkey_face.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/rampage.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/roundabout.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/step_right_up.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/the_pad.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/tip_top.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/tower_d.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/mapdata/__pycache__/zig_zag.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/__pycache__/maps.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/session/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/__pycache__/tutorial.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__pycache__/link.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__pycache__/settings.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__pycache__/unlink.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__pycache__/v2proxy.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/account/__pycache__/viewer.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/achievements.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/appinvite.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/characterpicker.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/colorpicker.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/config.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/configerror.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/confirm.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/continues.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/__pycache__/browser.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/__pycache__/gamebutton.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/__pycache__/level.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/coop/__pycache__/tournamentbutton.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/creditslist.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/debug.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/feedback.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/fileselector.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__pycache__/abouttab.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__pycache__/manualtab.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__pycache__/nearbytab.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__pycache__/privatetab.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/gather/__pycache__/publictab.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/getcurrency.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/getremote.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/helpui.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/iconpicker.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/kiosk.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/league/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/league/__pycache__/rankbutton.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/league/__pycache__/rankwindow.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/mainmenu.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/party.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/partyqueue.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/play.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/addgame.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/browser.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/customizebrowser.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/edit.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/editcontroller.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/editgame.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/mapselect.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/playlist/__pycache__/share.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/playoptions.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/popup.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/__pycache__/browser.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/__pycache__/edit.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/profile/__pycache__/upgrade.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/promocode.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/purchase.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/qrcode.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/radiogroup.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/report.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/resourcetypeinfo.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/serverdialog.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/advanced.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/allsettings.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/audio.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/controls.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/gamepad.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/gamepadadvanced.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/gamepadselect.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/graphics.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/keyboard.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/nettesting.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/plugins.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/pluginsettings.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/remoteapp.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/testing.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/touchscreen.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/settings/__pycache__/vrtesting.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/__pycache__/browser.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/__pycache__/edit.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/__pycache__/entrytypeselect.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/soundtrack/__pycache__/macmusicapp.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/specialoffer.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/__pycache__/__init__.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/__pycache__/browser.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/__pycache__/button.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/store/__pycache__/item.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/tabs.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/teamnamescolors.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/tournamententry.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/tournamentscores.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/trophies.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/url.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/v2upgrade.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/bastd/ui/__pycache__/watch.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/coopjoin.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/coopscore.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/drawscore.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/dualteamscore.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/freeforallvictory.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/multiteamjoin.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/multiteamscore.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/activity/__pycache__/multiteamvictory.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/background.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/bomb.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/controlsguide.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/flag.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/image.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/onscreencountdown.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/onscreentimer.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/playerspaz.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/popuptext.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/powerupbox.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/respawnicon.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/scoreboard.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/spawner.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/spaz.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/spazappearance.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/spazbot.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/spazfactory.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/text.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/tipstext.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/actor/__pycache__/zoomtext.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/assault.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/capturetheflag.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/chosenone.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/conquest.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/deathmatch.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/easteregghunt.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/elimination.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/football.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/hockey.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/keepaway.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/kingofthehill.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/meteorshower.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/ninjafight.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/onslaught.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/race.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/runaround.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/targetpractice.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/game/__pycache__/thelaststand.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/__pycache__/gameutils.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/__pycache__/mainmenu.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/big_g.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/bridgit.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/courtyard.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/crag_castle.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/doom_shroom.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/football_stadium.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/happy_thoughts.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/hockey_stadium.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/lake_frigid.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/monkey_face.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/rampage.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/roundabout.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/step_right_up.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/the_pad.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/tip_top.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/tower_d.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/mapdata/__pycache__/zig_zag.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/__pycache__/maps.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/session/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bascenev1lib/__pycache__/tutorial.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/batemplatefs/__pycache__/__init__.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/batemplatefs/__pycache__/_hooks.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/batemplatefs/__pycache__/_subsystem.cpython-311.opt-1.pyc \
@@ -686,6 +585,107 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/bauiv1/__pycache__/modutils.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/bauiv1/__pycache__/onscreenkeyboard.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/bauiv1/ui/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__pycache__/link.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__pycache__/settings.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__pycache__/unlink.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__pycache__/v2proxy.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/account/__pycache__/viewer.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/achievements.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/appinvite.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/characterpicker.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/colorpicker.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/config.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/configerror.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/confirm.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/continues.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/__pycache__/browser.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/__pycache__/gamebutton.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/__pycache__/level.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/coop/__pycache__/tournamentbutton.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/creditslist.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/debug.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/feedback.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/fileselector.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__pycache__/abouttab.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__pycache__/manualtab.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__pycache__/nearbytab.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__pycache__/privatetab.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/gather/__pycache__/publictab.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/getcurrency.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/getremote.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/helpui.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/iconpicker.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/keyboard/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/keyboard/__pycache__/englishkeyboard.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/kiosk.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/league/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/league/__pycache__/rankbutton.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/league/__pycache__/rankwindow.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/mainmenu.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/party.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/partyqueue.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/play.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/addgame.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/browser.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/customizebrowser.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/edit.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/editcontroller.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/editgame.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/mapselect.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/playlist/__pycache__/share.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/playoptions.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/popup.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/__pycache__/browser.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/__pycache__/edit.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/profile/__pycache__/upgrade.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/promocode.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/purchase.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/qrcode.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/radiogroup.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/report.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/resourcetypeinfo.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/serverdialog.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/advanced.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/allsettings.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/audio.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/controls.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/gamepad.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/gamepadadvanced.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/gamepadselect.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/graphics.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/keyboard.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/nettesting.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/plugins.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/pluginsettings.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/remoteapp.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/testing.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/touchscreen.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/settings/__pycache__/vrtesting.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/__pycache__/browser.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/__pycache__/edit.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/__pycache__/entrytypeselect.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/soundtrack/__pycache__/macmusicapp.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/specialoffer.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/__pycache__/browser.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/__pycache__/button.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/store/__pycache__/item.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/tabs.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/teamnamescolors.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/tournamententry.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/tournamentscores.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/trophies.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/url.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/v2upgrade.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/bauiv1lib/__pycache__/watch.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/server_package/__pycache__/ballisticakit_server.cpython-311.opt-1.pyc
 
 # Rule to copy src asset scripts to dst.
diff --git a/src/assets/ba_data/python/baclassic/_achievement.py b/src/assets/ba_data/python/baclassic/_achievement.py
index 0b5a6988..b7933f85 100644
--- a/src/assets/ba_data/python/baclassic/_achievement.py
+++ b/src/assets/ba_data/python/baclassic/_achievement.py
@@ -892,8 +892,8 @@ class Achievement:
         from babase._language import Lstr
         from babase._mgen.enums import SpecialChar
         from bascenev1._coopsession import CoopSession
-        from bastd.actor.image import Image
-        from bastd.actor.text import Text
+        from bascenev1lib.actor.image import Image
+        from bascenev1lib.actor.text import Text
 
         # Yeah this needs cleaning up.
         if style == 'post_game':
@@ -1231,8 +1231,8 @@ class Achievement:
         from babase._general import WeakCall
         from babase._language import Lstr
         from babase._mgen.enums import SpecialChar
-        from bastd.actor.text import Text
-        from bastd.actor.image import Image
+        from bascenev1lib.actor.text import Text
+        from bascenev1lib.actor.image import Image
         from bascenev1 import _gameutils
         from bascenev1._messages import DieMessage
 
diff --git a/src/assets/ba_data/python/baclassic/_appdelegate.py b/src/assets/ba_data/python/baclassic/_appdelegate.py
index e12c872d..e8dcd67d 100644
--- a/src/assets/ba_data/python/baclassic/_appdelegate.py
+++ b/src/assets/ba_data/python/baclassic/_appdelegate.py
@@ -32,7 +32,7 @@ class AppDelegate:
         when done.
         """
         # Replace the main window once we come up successfully.
-        from bastd.ui.playlist.editgame import PlaylistEditGameWindow
+        from bauiv1lib.playlist.editgame import PlaylistEditGameWindow
 
         assert _babase.app.classic is not None
         _babase.app.classic.ui.clear_main_menu_window(transition='out_left')
diff --git a/src/assets/ba_data/python/baclassic/_benchmark.py b/src/assets/ba_data/python/baclassic/_benchmark.py
index cda5f4da..3ed6532e 100644
--- a/src/assets/ba_data/python/baclassic/_benchmark.py
+++ b/src/assets/ba_data/python/baclassic/_benchmark.py
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 def run_cpu_benchmark() -> None:
     """Run a cpu benchmark."""
     # pylint: disable=cyclic-import
-    from bastd import tutorial
+    from bascenev1lib import tutorial
     from bascenev1._session import Session
 
     class BenchmarkSession(Session):
diff --git a/src/assets/ba_data/python/baclassic/_store.py b/src/assets/ba_data/python/baclassic/_store.py
index 5cbc764b..846d6ebd 100644
--- a/src/assets/ba_data/python/baclassic/_store.py
+++ b/src/assets/ba_data/python/baclassic/_store.py
@@ -82,15 +82,15 @@ class StoreSubsystem:
         """
         # pylint: disable=cyclic-import
         from babase._mgen.enums import SpecialChar
-        from bastd import maps
+        from bascenev1lib import maps
 
         assert _babase.app.classic is not None
 
         if _babase.app.classic.store_items is None:
-            from bastd.game import ninjafight
-            from bastd.game import meteorshower
-            from bastd.game import targetpractice
-            from bastd.game import easteregghunt
+            from bascenev1lib.game import ninjafight
+            from bascenev1lib.game import meteorshower
+            from bascenev1lib.game import targetpractice
+            from bascenev1lib.game import easteregghunt
 
             # IMPORTANT - need to keep this synced with the master server.
             # (doing so manually for now)
diff --git a/src/assets/ba_data/python/baclassic/_subsystem.py b/src/assets/ba_data/python/baclassic/_subsystem.py
index 567605db..7a1da5e0 100644
--- a/src/assets/ba_data/python/baclassic/_subsystem.py
+++ b/src/assets/ba_data/python/baclassic/_subsystem.py
@@ -34,7 +34,7 @@ if TYPE_CHECKING:
     import babase
     import bauiv1
     import baclassic
-    from bastd.actor import spazappearance
+    from bascenev1lib.actor import spazappearance
     from baclassic._appdelegate import AppDelegate
     from baclassic._servermode import ServerController
     from baclassic._net import MasterServerCallback
@@ -172,8 +172,8 @@ class ClassicSubsystem(AppSubsystem):
         # pylint: disable=too-many-locals
         from bascenev1 import _campaign
         from bascenev1 import _map
-        from bastd.actor import spazappearance
-        from bastd import maps as stdmaps
+        from bascenev1lib.actor import spazappearance
+        from bascenev1lib import maps as stdmaps
         from babase._apputils import handle_leftover_v1_cloud_log_file
         from baclassic._appdelegate import AppDelegate
         import bauiv1 as bui
@@ -239,7 +239,7 @@ class ClassicSubsystem(AppSubsystem):
             plus = bui.app.plus
             assert plus is not None
 
-            from bastd.ui.specialoffer import show_offer
+            from bauiv1lib.specialoffer import show_offer
 
             if (
                 'pendingSpecialOffer' in cfg
@@ -340,7 +340,7 @@ class ClassicSubsystem(AppSubsystem):
     ) -> bool:
         """High level way to launch a local co-op session."""
         # pylint: disable=cyclic-import
-        from bastd.ui.coop.level import CoopLevelLockedWindow
+        from bauiv1lib.coop.level import CoopLevelLockedWindow
 
         assert _babase.app.classic is not None
 
@@ -379,7 +379,7 @@ class ClassicSubsystem(AppSubsystem):
                 bascenev1.new_host_session(_coopsession.CoopSession)
             except Exception:
                 logging.exception('Error creating coopsession after fade end.')
-                from bastd.mainmenu import MainMenuSession
+                from bascenev1lib.mainmenu import MainMenuSession
 
                 bascenev1.new_host_session(MainMenuSession)
 
@@ -392,7 +392,7 @@ class ClassicSubsystem(AppSubsystem):
         """Attempt to cleanly get back to the main menu."""
         # pylint: disable=cyclic-import
         from baclassic import _benchmark
-        from bastd.mainmenu import MainMenuSession
+        from bascenev1lib.mainmenu import MainMenuSession
 
         plus = _babase.app.plus
         assert plus is not None
@@ -626,7 +626,7 @@ class ClassicSubsystem(AppSubsystem):
     def show_config_error_window(self) -> bool:
         """(internal)"""
         if self.platform in ('mac', 'linux', 'windows'):
-            from bastd.ui.configerror import ConfigErrorWindow
+            from bauiv1lib.configerror import ConfigErrorWindow
 
             _babase.pushcall(ConfigErrorWindow)
             return True
@@ -652,19 +652,19 @@ class ClassicSubsystem(AppSubsystem):
     def v2_upgrade_window(self, login_name: str, code: str) -> None:
         """(internal)"""
 
-        from bastd.ui.v2upgrade import V2UpgradeWindow
+        from bauiv1lib.v2upgrade import V2UpgradeWindow
 
         V2UpgradeWindow(login_name, code)
 
     def account_link_code_window(self, data: dict[str, Any]) -> None:
         """(internal)"""
-        from bastd.ui.account.link import AccountLinkCodeWindow
+        from bauiv1lib.account.link import AccountLinkCodeWindow
 
         AccountLinkCodeWindow(data)
 
     def server_dialog(self, delay: float, data: dict[str, Any]) -> None:
         """(internal)"""
-        from bastd.ui.serverdialog import (
+        from bauiv1lib.serverdialog import (
             ServerDialogData,
             ServerDialogWindow,
         )
@@ -685,7 +685,7 @@ class ClassicSubsystem(AppSubsystem):
 
     def ticket_icon_press(self) -> None:
         """(internal)"""
-        from bastd.ui.resourcetypeinfo import ResourceTypeInfoWindow
+        from bauiv1lib.resourcetypeinfo import ResourceTypeInfoWindow
 
         ResourceTypeInfoWindow(
             origin_widget=_bauiv1.get_special_widget('tickets_info_button')
@@ -693,7 +693,7 @@ class ClassicSubsystem(AppSubsystem):
 
     def party_icon_activate(self, origin: Sequence[float]) -> None:
         """(internal)"""
-        from bastd.ui.party import PartyWindow
+        from bauiv1lib.party import PartyWindow
         from babase import app
 
         assert not app.headless_mode
@@ -711,7 +711,7 @@ class ClassicSubsystem(AppSubsystem):
 
     def device_menu_press(self, device_id: int | None) -> None:
         """(internal)"""
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
         from bauiv1 import set_ui_input_device
 
         assert _babase.app is not None
@@ -726,19 +726,19 @@ class ClassicSubsystem(AppSubsystem):
 
     def show_url_window(self, address: str) -> None:
         """(internal)"""
-        from bastd.ui.url import ShowURLWindow
+        from bauiv1lib.url import ShowURLWindow
 
         ShowURLWindow(address)
 
     def quit_window(self) -> None:
         """(internal)"""
-        from bastd.ui.confirm import QuitWindow
+        from bauiv1lib.confirm import QuitWindow
 
         QuitWindow()
 
     def get_draw_score_screen_activity(self) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.drawscore import DrawScoreScreenActivity
+        from bascenev1lib.activity.drawscore import DrawScoreScreenActivity
 
         return DrawScoreScreenActivity
 
@@ -746,7 +746,7 @@ class ClassicSubsystem(AppSubsystem):
         self,
     ) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.multiteamvictory import (
+        from bascenev1lib.activity.multiteamvictory import (
             TeamSeriesVictoryScoreScreenActivity,
         )
 
@@ -756,7 +756,9 @@ class ClassicSubsystem(AppSubsystem):
         self,
     ) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.dualteamscore import TeamVictoryScoreScreenActivity
+        from bascenev1lib.activity.dualteamscore import (
+            TeamVictoryScoreScreenActivity,
+        )
 
         return TeamVictoryScoreScreenActivity
 
@@ -764,7 +766,7 @@ class ClassicSubsystem(AppSubsystem):
         self,
     ) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.freeforallvictory import (
+        from bascenev1lib.activity.freeforallvictory import (
             FreeForAllVictoryScoreScreenActivity,
         )
 
@@ -772,25 +774,25 @@ class ClassicSubsystem(AppSubsystem):
 
     def get_coop_join_activity(self) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.coopjoin import CoopJoinActivity
+        from bascenev1lib.activity.coopjoin import CoopJoinActivity
 
         return CoopJoinActivity
 
     def get_coop_score_screen(self) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.coopscore import CoopScoreScreen
+        from bascenev1lib.activity.coopscore import CoopScoreScreen
 
         return CoopScoreScreen
 
     def get_multi_team_join_activity(self) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.activity.multiteamjoin import MultiTeamJoinActivity
+        from bascenev1lib.activity.multiteamjoin import MultiTeamJoinActivity
 
         return MultiTeamJoinActivity
 
     def get_tutorial_activity(self) -> type[bascenev1.Activity]:
         """(internal)"""
-        from bastd.tutorial import TutorialActivity
+        from bascenev1lib.tutorial import TutorialActivity
 
         return TutorialActivity
 
@@ -805,7 +807,7 @@ class ClassicSubsystem(AppSubsystem):
         on_close_call: Callable[[], Any] | None = None,
     ) -> None:
         """(internal)"""
-        from bastd.ui.tournamententry import TournamentEntryWindow
+        from bauiv1lib.tournamententry import TournamentEntryWindow
 
         TournamentEntryWindow(
             tournament_id,
@@ -819,7 +821,7 @@ class ClassicSubsystem(AppSubsystem):
 
     def get_main_menu_session(self) -> type[bascenev1.Session]:
         """(internal)"""
-        from bastd.mainmenu import MainMenuSession
+        from bascenev1lib.mainmenu import MainMenuSession
 
         return MainMenuSession
 
@@ -831,7 +833,7 @@ class ClassicSubsystem(AppSubsystem):
         cancel_call: Callable[[], Any],
     ) -> None:
         """(internal)"""
-        from bastd.ui.continues import ContinuesWindow
+        from bauiv1lib.continues import ContinuesWindow
 
         ContinuesWindow(activity, cost, continue_call, cancel_call)
 
@@ -843,7 +845,7 @@ class ClassicSubsystem(AppSubsystem):
         origin_widget: bauiv1.Widget | None = None,
     ) -> None:
         """(internal)"""
-        from bastd.ui.profile.browser import ProfileBrowserWindow
+        from bauiv1lib.profile.browser import ProfileBrowserWindow
 
         ProfileBrowserWindow(
             transition, in_main_menu, selected_profile, origin_widget
diff --git a/src/assets/ba_data/python/baclassic/macmusicapp.py b/src/assets/ba_data/python/baclassic/macmusicapp.py
index 3cc8b215..ba6be1bc 100644
--- a/src/assets/ba_data/python/baclassic/macmusicapp.py
+++ b/src/assets/ba_data/python/baclassic/macmusicapp.py
@@ -33,7 +33,7 @@ class MacMusicAppMusicPlayer(MusicPlayer):
         selection_target_name: str,
     ) -> Any:
         # pylint: disable=cyclic-import
-        from bastd.ui.soundtrack import entrytypeselect as etsel
+        from bauiv1lib.soundtrack import entrytypeselect as etsel
 
         return etsel.SoundtrackEntryTypeSelectWindow(
             callback, current_entry, selection_target_name
diff --git a/src/assets/ba_data/python/baclassic/osmusic.py b/src/assets/ba_data/python/baclassic/osmusic.py
index 44ef9746..c5adbcd1 100644
--- a/src/assets/ba_data/python/baclassic/osmusic.py
+++ b/src/assets/ba_data/python/baclassic/osmusic.py
@@ -38,7 +38,7 @@ class OSMusicPlayer(MusicPlayer):
         selection_target_name: str,
     ) -> Any:
         # pylint: disable=cyclic-import
-        from bastd.ui.soundtrack.entrytypeselect import (
+        from bauiv1lib.soundtrack.entrytypeselect import (
             SoundtrackEntryTypeSelectWindow,
         )
 
diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py
index 6c559b2a..96f69d41 100644
--- a/src/assets/ba_data/python/baenv.py
+++ b/src/assets/ba_data/python/baenv.py
@@ -28,7 +28,7 @@ if TYPE_CHECKING:
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21054
+TARGET_BALLISTICA_BUILD = 21055
 TARGET_BALLISTICA_VERSION = '1.7.20'
 
 _g_env_config: EnvConfig | None = None
diff --git a/src/assets/ba_data/python/bascenev1/_activitytypes.py b/src/assets/ba_data/python/bascenev1/_activitytypes.py
index e71ca45c..3b54b043 100644
--- a/src/assets/ba_data/python/bascenev1/_activitytypes.py
+++ b/src/assets/ba_data/python/bascenev1/_activitytypes.py
@@ -80,8 +80,8 @@ class JoinActivity(Activity[EmptyPlayer, EmptyTeam]):
 
     def on_transition_in(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.actor.tipstext import TipsText
-        from bastd.actor.background import Background
+        from bascenev1lib.actor.tipstext import TipsText
+        from bascenev1lib.actor.background import Background
 
         super().on_transition_in()
         self._background = Background(
@@ -113,7 +113,7 @@ class TransitionActivity(Activity[EmptyPlayer, EmptyTeam]):
 
     def on_transition_in(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.actor.background import Background
+        from bascenev1lib.actor.background import Background
 
         super().on_transition_in()
         self._background = Background(
@@ -166,8 +166,8 @@ class ScoreScreenActivity(Activity[EmptyPlayer, EmptyTeam]):
         _bascenev1.timer(time_till_assign, WeakCall(self._safe_assign, player))
 
     def on_transition_in(self) -> None:
-        from bastd.actor.tipstext import TipsText
-        from bastd.actor.background import Background
+        from bascenev1lib.actor.tipstext import TipsText
+        from bascenev1lib.actor.background import Background
 
         super().on_transition_in()
         self._background = Background(
@@ -179,7 +179,7 @@ class ScoreScreenActivity(Activity[EmptyPlayer, EmptyTeam]):
 
     def on_begin(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.actor.text import Text
+        from bascenev1lib.actor.text import Text
         from babase import _language
 
         super().on_begin()
diff --git a/src/assets/ba_data/python/bascenev1/_actor.py b/src/assets/ba_data/python/bascenev1/_actor.py
index d75ce5ea..f8e73225 100644
--- a/src/assets/ba_data/python/bascenev1/_actor.py
+++ b/src/assets/ba_data/python/bascenev1/_actor.py
@@ -35,7 +35,7 @@ class Actor:
     Sounds, etc. into a high-level cohesive unit.
 
     Some example actors include the Bomb, Flag, and Spaz classes that
-    live in the bastd.actor.* modules.
+    live in the bascenev1lib.actor.* modules.
 
     One key feature of Actors is that they generally 'die'
     (killing off or transitioning out their nodes) when the last Python
@@ -43,7 +43,7 @@ class Actor:
 
     ##### Example
     >>> # Create a flag Actor in our game activity:
-    ... from bastd.actor.flag import Flag
+    ... from bascenev1lib.actor.flag import Flag
     ... self.flag = Flag(position=(0, 10, 0))
     ...
     ... # Later, destroy the flag.
diff --git a/src/assets/ba_data/python/bascenev1/_campaign.py b/src/assets/ba_data/python/bascenev1/_campaign.py
index 30d580e5..b3a57699 100644
--- a/src/assets/ba_data/python/bascenev1/_campaign.py
+++ b/src/assets/ba_data/python/bascenev1/_campaign.py
@@ -105,15 +105,15 @@ def init_campaigns() -> None:
     """Fill out initial default Campaigns."""
     # pylint: disable=cyclic-import
     from bascenev1._level import Level
-    from bastd.game.onslaught import OnslaughtGame
-    from bastd.game.football import FootballCoopGame
-    from bastd.game.runaround import RunaroundGame
-    from bastd.game.thelaststand import TheLastStandGame
-    from bastd.game.race import RaceGame
-    from bastd.game.targetpractice import TargetPracticeGame
-    from bastd.game.meteorshower import MeteorShowerGame
-    from bastd.game.easteregghunt import EasterEggHuntGame
-    from bastd.game.ninjafight import NinjaFightGame
+    from bascenev1lib.game.onslaught import OnslaughtGame
+    from bascenev1lib.game.football import FootballCoopGame
+    from bascenev1lib.game.runaround import RunaroundGame
+    from bascenev1lib.game.thelaststand import TheLastStandGame
+    from bascenev1lib.game.race import RaceGame
+    from bascenev1lib.game.targetpractice import TargetPracticeGame
+    from bascenev1lib.game.meteorshower import MeteorShowerGame
+    from bascenev1lib.game.easteregghunt import EasterEggHuntGame
+    from bascenev1lib.game.ninjafight import NinjaFightGame
 
     # TODO: Campaigns should be load-on-demand; not all imported at launch
     # like this.
diff --git a/src/assets/ba_data/python/bascenev1/_coopgame.py b/src/assets/ba_data/python/bascenev1/_coopgame.py
index 5dddd624..fc340def 100644
--- a/src/assets/ba_data/python/bascenev1/_coopgame.py
+++ b/src/assets/ba_data/python/bascenev1/_coopgame.py
@@ -13,7 +13,7 @@ from bascenev1._gameactivity import GameActivity
 
 if TYPE_CHECKING:
     from typing import Sequence
-    from bastd.actor.playerspaz import PlayerSpaz
+    from bascenev1lib.actor.playerspaz import PlayerSpaz
     import babase
     import bascenev1
 
@@ -94,7 +94,7 @@ class CoopGameActivity(GameActivity[PlayerT, TeamT]):
     def _show_remaining_achievements(self) -> None:
         # pylint: disable=cyclic-import
         from babase._language import Lstr
-        from bastd.actor.text import Text
+        from bascenev1lib.actor.text import Text
 
         assert _babase.app.classic is not None
         ts_h_offs = 30
diff --git a/src/assets/ba_data/python/bascenev1/_gameactivity.py b/src/assets/ba_data/python/bascenev1/_gameactivity.py
index 6180e75c..aa2c97b9 100644
--- a/src/assets/ba_data/python/bascenev1/_gameactivity.py
+++ b/src/assets/ba_data/python/bascenev1/_gameactivity.py
@@ -23,8 +23,8 @@ from bascenev1 import _music
 if TYPE_CHECKING:
     from typing import Any, Callable, Sequence
 
-    from bastd.actor.playerspaz import PlayerSpaz
-    from bastd.actor.bomb import TNTSpawner
+    from bascenev1lib.actor.playerspaz import PlayerSpaz
+    from bascenev1lib.actor.bomb import TNTSpawner
     import babase
     import bascenev1
 
@@ -541,7 +541,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
     def handlemessage(self, msg: Any) -> Any:
         if isinstance(msg, PlayerDiedMessage):
             # pylint: disable=cyclic-import
-            from bastd.actor.spaz import Spaz
+            from bascenev1lib.actor.spaz import Spaz
 
             player = msg.getplayer(self.playertype)
             killer = msg.getkillerplayer(self.playertype)
@@ -667,7 +667,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
     def _show_info(self) -> None:
         """Show the game description."""
         from bascenev1._gameutils import animate
-        from bastd.actor.zoomtext import ZoomText
+        from bascenev1lib.actor.zoomtext import ZoomText
 
         name = self.get_instance_display_string()
         ZoomText(
@@ -906,7 +906,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
         respawn_time = round(max(1.0, respawn_time), 0)
 
         if player.actor and not self.has_ended():
-            from bastd.actor.respawnicon import RespawnIcon
+            from bascenev1lib.actor.respawnicon import RespawnIcon
 
             player.customdata['respawn_timer'] = _bascenev1.Timer(
                 respawn_time, WeakCall(self.spawn_player_if_exists, player)
@@ -947,7 +947,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
         from babase import _math
         from bascenev1._gameutils import animate
         from bascenev1._coopsession import CoopSession
-        from bastd.actor.playerspaz import PlayerSpaz
+        from bascenev1lib.actor.playerspaz import PlayerSpaz
 
         name = player.getname()
         color = player.color
@@ -1002,7 +1002,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
     def setup_standard_powerup_drops(self, enable_tnt: bool = True) -> None:
         """Create standard powerup drops for the current map."""
         # pylint: disable=cyclic-import
-        from bastd.actor.powerupbox import DEFAULT_POWERUP_INTERVAL
+        from bascenev1lib.actor.powerupbox import DEFAULT_POWERUP_INTERVAL
 
         self._powerup_drop_timer = _bascenev1.Timer(
             DEFAULT_POWERUP_INTERVAL,
@@ -1016,7 +1016,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
 
     def _standard_drop_powerup(self, index: int, expire: bool = True) -> None:
         # pylint: disable=cyclic-import
-        from bastd.actor.powerupbox import PowerupBox, PowerupBoxFactory
+        from bascenev1lib.actor.powerupbox import PowerupBox, PowerupBoxFactory
 
         PowerupBox(
             position=self.map.powerup_spawn_points[index],
@@ -1035,7 +1035,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
     def _setup_standard_tnt_drops(self) -> None:
         """Standard tnt drop."""
         # pylint: disable=cyclic-import
-        from bastd.actor.bomb import TNTSpawner
+        from bascenev1lib.actor.bomb import TNTSpawner
 
         for i, point in enumerate(self.map.tnt_points):
             assert self._tnt_spawners is not None
@@ -1270,7 +1270,7 @@ class GameActivity(Activity[PlayerT, TeamT]):
     ) -> None:
         """Zooming text used to announce game names and winners."""
         # pylint: disable=cyclic-import
-        from bastd.actor.zoomtext import ZoomText
+        from bascenev1lib.actor.zoomtext import ZoomText
 
         # Reserve a spot on the screen (in case we get multiple of these so
         # they don't overlap).
diff --git a/src/assets/ba_data/python/bascenev1/_lobby.py b/src/assets/ba_data/python/bascenev1/_lobby.py
index aa86aa8f..a290c0ae 100644
--- a/src/assets/ba_data/python/bascenev1/_lobby.py
+++ b/src/assets/ba_data/python/bascenev1/_lobby.py
@@ -1010,7 +1010,7 @@ class Lobby:
     def reload_profiles(self) -> None:
         """Reload available player profiles."""
         # pylint: disable=cyclic-import
-        from bastd.actor.spazappearance import get_appearances
+        from bascenev1lib.actor.spazappearance import get_appearances
 
         assert _babase.app.classic is not None
 
diff --git a/src/assets/ba_data/python/bascenev1/_playlist.py b/src/assets/ba_data/python/bascenev1/_playlist.py
index cf0b90f8..cde65258 100644
--- a/src/assets/ba_data/python/bascenev1/_playlist.py
+++ b/src/assets/ba_data/python/bascenev1/_playlist.py
@@ -81,84 +81,108 @@ def filter_playlist(
                 'Happy_Thoughts.HappyThoughtsGame',
                 'bsAssault.AssaultGame',
                 'bs_assault.AssaultGame',
+                'bastd.game.assault.AssaultGame',
             ):
-                entry['type'] = 'bastd.game.assault.AssaultGame'
+                entry['type'] = 'bascenev1lib.game.assault.AssaultGame'
             if entry['type'] in (
                 'King_of_the_Hill.KingOfTheHillGame',
                 'bsKingOfTheHill.KingOfTheHillGame',
                 'bs_king_of_the_hill.KingOfTheHillGame',
+                'bastd.game.kingofthehill.KingOfTheHillGame',
             ):
-                entry['type'] = 'bastd.game.kingofthehill.KingOfTheHillGame'
+                entry[
+                    'type'
+                ] = 'bascenev1lib.game.kingofthehill.KingOfTheHillGame'
             if entry['type'] in (
                 'Capture_the_Flag.CTFGame',
                 'bsCaptureTheFlag.CTFGame',
                 'bs_capture_the_flag.CTFGame',
+                'bastd.game.capturetheflag.CaptureTheFlagGame',
             ):
-                entry['type'] = 'bastd.game.capturetheflag.CaptureTheFlagGame'
+                entry[
+                    'type'
+                ] = 'bascenev1lib.game.capturetheflag.CaptureTheFlagGame'
             if entry['type'] in (
                 'Death_Match.DeathMatchGame',
                 'bsDeathMatch.DeathMatchGame',
                 'bs_death_match.DeathMatchGame',
+                'bastd.game.deathmatch.DeathMatchGame',
             ):
-                entry['type'] = 'bastd.game.deathmatch.DeathMatchGame'
+                entry['type'] = 'bascenev1lib.game.deathmatch.DeathMatchGame'
             if entry['type'] in (
                 'ChosenOne.ChosenOneGame',
                 'bsChosenOne.ChosenOneGame',
                 'bs_chosen_one.ChosenOneGame',
+                'bastd.game.chosenone.ChosenOneGame',
             ):
-                entry['type'] = 'bastd.game.chosenone.ChosenOneGame'
+                entry['type'] = 'bascenev1lib.game.chosenone.ChosenOneGame'
             if entry['type'] in (
                 'Conquest.Conquest',
                 'Conquest.ConquestGame',
                 'bsConquest.ConquestGame',
                 'bs_conquest.ConquestGame',
+                'bastd.game.conquest.ConquestGame',
             ):
-                entry['type'] = 'bastd.game.conquest.ConquestGame'
+                entry['type'] = 'bascenev1lib.game.conquest.ConquestGame'
             if entry['type'] in (
                 'Elimination.EliminationGame',
                 'bsElimination.EliminationGame',
                 'bs_elimination.EliminationGame',
+                'bastd.game.elimination.EliminationGame',
             ):
-                entry['type'] = 'bastd.game.elimination.EliminationGame'
+                entry['type'] = 'bascenev1lib.game.elimination.EliminationGame'
             if entry['type'] in (
                 'Football.FootballGame',
                 'bsFootball.FootballTeamGame',
                 'bs_football.FootballTeamGame',
+                'bastd.game.football.FootballTeamGame',
             ):
-                entry['type'] = 'bastd.game.football.FootballTeamGame'
+                entry['type'] = 'bascenev1lib.game.football.FootballTeamGame'
             if entry['type'] in (
                 'Hockey.HockeyGame',
                 'bsHockey.HockeyGame',
                 'bs_hockey.HockeyGame',
+                'bastd.game.hockey.HockeyGame',
             ):
-                entry['type'] = 'bastd.game.hockey.HockeyGame'
+                entry['type'] = 'bascenev1lib.game.hockey.HockeyGame'
             if entry['type'] in (
                 'Keep_Away.KeepAwayGame',
                 'bsKeepAway.KeepAwayGame',
                 'bs_keep_away.KeepAwayGame',
+                'bastd.game.keepaway.KeepAwayGame',
             ):
-                entry['type'] = 'bastd.game.keepaway.KeepAwayGame'
+                entry['type'] = 'bascenev1lib.game.keepaway.KeepAwayGame'
             if entry['type'] in (
                 'Race.RaceGame',
                 'bsRace.RaceGame',
                 'bs_race.RaceGame',
+                'bastd.game.race.RaceGame',
             ):
-                entry['type'] = 'bastd.game.race.RaceGame'
+                entry['type'] = 'bascenev1lib.game.race.RaceGame'
             if entry['type'] in (
                 'bsEasterEggHunt.EasterEggHuntGame',
                 'bs_easter_egg_hunt.EasterEggHuntGame',
+                'bastd.game.easteregghunt.EasterEggHuntGame',
             ):
-                entry['type'] = 'bastd.game.easteregghunt.EasterEggHuntGame'
+                entry[
+                    'type'
+                ] = 'bascenev1lib.game.easteregghunt.EasterEggHuntGame'
             if entry['type'] in (
                 'bsMeteorShower.MeteorShowerGame',
                 'bs_meteor_shower.MeteorShowerGame',
+                'bastd.game.meteorshower.MeteorShowerGame',
             ):
-                entry['type'] = 'bastd.game.meteorshower.MeteorShowerGame'
+                entry[
+                    'type'
+                ] = 'bascenev1lib.game.meteorshower.MeteorShowerGame'
             if entry['type'] in (
                 'bsTargetPractice.TargetPracticeGame',
                 'bs_target_practice.TargetPracticeGame',
+                'bastd.game.targetpractice.TargetPracticeGame',
             ):
-                entry['type'] = 'bastd.game.targetpractice.TargetPracticeGame'
+                entry[
+                    'type'
+                ] = 'bascenev1lib.game.targetpractice.TargetPracticeGame'
 
             gameclass = getclass(entry['type'], GameActivity)
 
diff --git a/src/assets/ba_data/python/bascenev1/_stats.py b/src/assets/ba_data/python/bascenev1/_stats.py
index f48939a4..8924500a 100644
--- a/src/assets/ba_data/python/bascenev1/_stats.py
+++ b/src/assets/ba_data/python/bascenev1/_stats.py
@@ -204,7 +204,7 @@ class PlayerRecord:
             scale2: float,
             sound2: bascenev1.Sound | None,
         ) -> None:
-            from bastd.actor.popuptext import PopupText
+            from bascenev1lib.actor.popuptext import PopupText
 
             # Only award this if they're still alive and we can get
             # a current position for them.
@@ -368,7 +368,7 @@ class Stats:
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
-        from bastd.actor.popuptext import PopupText
+        from bascenev1lib.actor.popuptext import PopupText
         from babase import _math
         from babase._language import Lstr
         from bascenev1._gameactivity import GameActivity
diff --git a/src/assets/ba_data/python/bascenev1/_teamgame.py b/src/assets/ba_data/python/bascenev1/_teamgame.py
index d8ada009..76574c33 100644
--- a/src/assets/ba_data/python/bascenev1/_teamgame.py
+++ b/src/assets/ba_data/python/bascenev1/_teamgame.py
@@ -15,7 +15,7 @@ from bascenev1._dualteamsession import DualTeamSession
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
-    from bastd.actor.playerspaz import PlayerSpaz
+    from bascenev1lib.actor.playerspaz import PlayerSpaz
     import babase
     import bascenev1
 
@@ -57,7 +57,7 @@ class TeamGameActivity(GameActivity[PlayerT, TeamT]):
     def on_transition_in(self) -> None:
         # pylint: disable=cyclic-import
         from bascenev1._coopsession import CoopSession
-        from bastd.actor.controlsguide import ControlsGuide
+        from bascenev1lib.actor.controlsguide import ControlsGuide
 
         super().on_transition_in()
 
diff --git a/src/assets/ba_data/python/bastd/__init__.py b/src/assets/ba_data/python/bascenev1lib/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/__init__.py
rename to src/assets/ba_data/python/bascenev1lib/__init__.py
diff --git a/src/assets/ba_data/python/bastd/activity/__init__.py b/src/assets/ba_data/python/bascenev1lib/activity/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/activity/__init__.py
rename to src/assets/ba_data/python/bascenev1lib/activity/__init__.py
diff --git a/src/assets/ba_data/python/bastd/activity/coopjoin.py b/src/assets/ba_data/python/bascenev1lib/activity/coopjoin.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/activity/coopjoin.py
rename to src/assets/ba_data/python/bascenev1lib/activity/coopjoin.py
index a35082d9..7e301cc6 100644
--- a/src/assets/ba_data/python/bastd/activity/coopjoin.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/coopjoin.py
@@ -25,8 +25,8 @@ class CoopJoinActivity(bs.JoinActivity):
         assert isinstance(session, bs.CoopSession)
 
     def on_transition_in(self) -> None:
-        from bastd.actor.controlsguide import ControlsGuide
-        from bastd.actor.text import Text
+        from bascenev1lib.actor.controlsguide import ControlsGuide
+        from bascenev1lib.actor.text import Text
 
         super().on_transition_in()
         assert isinstance(self.session, bs.CoopSession)
@@ -49,7 +49,7 @@ class CoopJoinActivity(bs.JoinActivity):
         babase.pushcall(self._show_remaining_achievements)
 
     def _show_remaining_achievements(self) -> None:
-        from bastd.actor.text import Text
+        from bascenev1lib.actor.text import Text
 
         # We only show achievements and challenges for CoopGameActivities.
         session = self.session
diff --git a/src/assets/ba_data/python/bastd/activity/coopscore.py b/src/assets/ba_data/python/bascenev1lib/activity/coopscore.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/activity/coopscore.py
rename to src/assets/ba_data/python/bascenev1lib/activity/coopscore.py
index 56528e1a..d9a36992 100644
--- a/src/assets/ba_data/python/bastd/activity/coopscore.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/coopscore.py
@@ -9,8 +9,8 @@ import random
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.actor.text import Text
-from bastd.actor.zoomtext import ZoomText
+from bascenev1lib.actor.text import Text
+from bascenev1lib.actor.zoomtext import ZoomText
 import bascenev1 as bs
 import bauiv1 as bui
 
@@ -18,8 +18,8 @@ if TYPE_CHECKING:
     from typing import Any, Sequence
 
     import baclassic
-    from bastd.ui.store.button import StoreButton
-    from bastd.ui.league.rankbutton import LeagueRankButton
+    from bauiv1lib.store.button import StoreButton
+    from bauiv1lib.league.rankbutton import LeagueRankButton
 
 
 class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
@@ -198,7 +198,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
                 bui.containerwidget(edit=self._root_ui, transition='out_left')
 
     def on_transition_in(self) -> None:
-        from bastd.actor import background  # FIXME NO BSSTD
+        from bascenev1lib.actor import background  # FIXME NO BSSTD
 
         bs.set_analytics_screen('Coop Score Screen')
         super().on_transition_in()
@@ -207,7 +207,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
         )
 
     def _ui_menu(self) -> None:
-        from bastd.ui import specialoffer
+        from bauiv1lib import specialoffer
 
         if specialoffer.show_offer():
             return
@@ -216,8 +216,8 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
             bs.timer(0.1, bs.Call(bs.WeakCall(self.session.end)))
 
     def _ui_restart(self) -> None:
-        from bastd.ui.tournamententry import TournamentEntryWindow
-        from bastd.ui import specialoffer
+        from bauiv1lib.tournamententry import TournamentEntryWindow
+        from bauiv1lib import specialoffer
 
         if specialoffer.show_offer():
             return
@@ -268,7 +268,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
                 self.end({'outcome': 'restart'})
 
     def _ui_next(self) -> None:
-        from bastd.ui.specialoffer import show_offer
+        from bauiv1lib.specialoffer import show_offer
 
         if show_offer():
             return
@@ -346,8 +346,8 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
     def show_ui(self) -> None:
         """Show the UI for restarting, playing the next Level, etc."""
         # pylint: disable=too-many-locals
-        from bastd.ui.store.button import StoreButton
-        from bastd.ui.league.rankbutton import LeagueRankButton
+        from bauiv1lib.store.button import StoreButton
+        from bauiv1lib.league.rankbutton import LeagueRankButton
 
         assert bui.app.classic is not None
 
@@ -1346,7 +1346,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
                     ).autoretain()
 
     def _show_tips(self) -> None:
-        from bastd.actor.tipstext import TipsText
+        from bascenev1lib.actor.tipstext import TipsText
 
         TipsText(offs_y=30).autoretain()
 
diff --git a/src/assets/ba_data/python/bastd/activity/drawscore.py b/src/assets/ba_data/python/bascenev1lib/activity/drawscore.py
similarity index 88%
rename from src/assets/ba_data/python/bastd/activity/drawscore.py
rename to src/assets/ba_data/python/bascenev1lib/activity/drawscore.py
index c75a70dc..991e5289 100644
--- a/src/assets/ba_data/python/bastd/activity/drawscore.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/drawscore.py
@@ -7,8 +7,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import babase
-from bastd.activity.multiteamscore import MultiTeamScoreScreenActivity
-from bastd.actor.zoomtext import ZoomText
+from bascenev1lib.activity.multiteamscore import MultiTeamScoreScreenActivity
+from bascenev1lib.actor.zoomtext import ZoomText
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/activity/dualteamscore.py b/src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/activity/dualteamscore.py
rename to src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py
index 30ffc916..8d665031 100644
--- a/src/assets/ba_data/python/bastd/activity/dualteamscore.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/dualteamscore.py
@@ -8,8 +8,8 @@ from typing import TYPE_CHECKING
 
 import babase
 import bascenev1 as bs
-from bastd.activity.multiteamscore import MultiTeamScoreScreenActivity
-from bastd.actor.zoomtext import ZoomText
+from bascenev1lib.activity.multiteamscore import MultiTeamScoreScreenActivity
+from bascenev1lib.actor.zoomtext import ZoomText
 
 if TYPE_CHECKING:
     pass
diff --git a/src/assets/ba_data/python/bastd/activity/freeforallvictory.py b/src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/activity/freeforallvictory.py
rename to src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py
index 7e4c5b46..45d116ac 100644
--- a/src/assets/ba_data/python/bastd/activity/freeforallvictory.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/freeforallvictory.py
@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.activity.multiteamscore import MultiTeamScoreScreenActivity
+from bascenev1lib.activity.multiteamscore import MultiTeamScoreScreenActivity
 import bascenev1 as bs
 
 if TYPE_CHECKING:
@@ -26,8 +26,8 @@ class FreeForAllVictoryScoreScreenActivity(MultiTeamScoreScreenActivity):
     def on_begin(self) -> None:
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
-        from bastd.actor.text import Text
-        from bastd.actor.image import Image
+        from bascenev1lib.actor.text import Text
+        from bascenev1lib.actor.image import Image
 
         bs.set_analytics_screen('FreeForAll Score Screen')
         super().on_begin()
diff --git a/src/assets/ba_data/python/bastd/activity/multiteamjoin.py b/src/assets/ba_data/python/bascenev1lib/activity/multiteamjoin.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/activity/multiteamjoin.py
rename to src/assets/ba_data/python/bascenev1lib/activity/multiteamjoin.py
index db050da0..28f4f978 100644
--- a/src/assets/ba_data/python/bastd/activity/multiteamjoin.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/multiteamjoin.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING
 
 import babase
 import bascenev1 as bs
-from bastd.actor.text import Text
+from bascenev1lib.actor.text import Text
 
 if TYPE_CHECKING:
     pass
@@ -22,7 +22,7 @@ class MultiTeamJoinActivity(bs.JoinActivity):
         self._next_up_text: Text | None = None
 
     def on_transition_in(self) -> None:
-        from bastd.actor.controlsguide import ControlsGuide
+        from bascenev1lib.actor.controlsguide import ControlsGuide
 
         super().on_transition_in()
         ControlsGuide(delay=1.0).autoretain()
diff --git a/src/assets/ba_data/python/bastd/activity/multiteamscore.py b/src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/activity/multiteamscore.py
rename to src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py
index d4dbd672..dfd498a1 100644
--- a/src/assets/ba_data/python/bastd/activity/multiteamscore.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py
@@ -7,8 +7,8 @@ from typing import TYPE_CHECKING
 
 import babase
 import bascenev1 as bs
-from bastd.actor.text import Text
-from bastd.actor.image import Image
+from bascenev1lib.actor.text import Text
+from bascenev1lib.actor.image import Image
 
 if TYPE_CHECKING:
     pass
diff --git a/src/assets/ba_data/python/bastd/activity/multiteamvictory.py b/src/assets/ba_data/python/bascenev1lib/activity/multiteamvictory.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/activity/multiteamvictory.py
rename to src/assets/ba_data/python/bascenev1lib/activity/multiteamvictory.py
index ded23027..42e0e638 100644
--- a/src/assets/ba_data/python/bastd/activity/multiteamvictory.py
+++ b/src/assets/ba_data/python/bascenev1lib/activity/multiteamvictory.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING
 
 import babase
 import bascenev1 as bs
-from bastd.activity.multiteamscore import MultiTeamScoreScreenActivity
+from bascenev1lib.activity.multiteamscore import MultiTeamScoreScreenActivity
 
 if TYPE_CHECKING:
     pass
@@ -32,8 +32,8 @@ class TeamSeriesVictoryScoreScreenActivity(MultiTeamScoreScreenActivity):
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
-        from bastd.actor.text import Text
-        from bastd.actor.image import Image
+        from bascenev1lib.actor.text import Text
+        from bascenev1lib.actor.image import Image
 
         babase.set_analytics_screen(
             'FreeForAll Series Victory Screen'
@@ -409,7 +409,7 @@ class TeamSeriesVictoryScoreScreenActivity(MultiTeamScoreScreenActivity):
         bs.timer(15.0, babase.WeakCall(self._show_tips))
 
     def _show_tips(self) -> None:
-        from bastd.actor.tipstext import TipsText
+        from bascenev1lib.actor.tipstext import TipsText
 
         self._tips_text = TipsText(offs_y=70)
 
@@ -419,8 +419,8 @@ class TeamSeriesVictoryScoreScreenActivity(MultiTeamScoreScreenActivity):
             bs.setmusic(bs.MusicType.VICTORY)
 
     def _show_winner(self, team: bs.SessionTeam) -> None:
-        from bastd.actor.image import Image
-        from bastd.actor.zoomtext import ZoomText
+        from bascenev1lib.actor.image import Image
+        from bascenev1lib.actor.zoomtext import ZoomText
 
         if not self._is_ffa:
             offs_v = 0.0
diff --git a/src/assets/ba_data/python/bastd/actor/__init__.py b/src/assets/ba_data/python/bascenev1lib/actor/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/__init__.py
rename to src/assets/ba_data/python/bascenev1lib/actor/__init__.py
diff --git a/src/assets/ba_data/python/bastd/actor/background.py b/src/assets/ba_data/python/bascenev1lib/actor/background.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/background.py
rename to src/assets/ba_data/python/bascenev1lib/actor/background.py
diff --git a/src/assets/ba_data/python/bastd/actor/bomb.py b/src/assets/ba_data/python/bascenev1lib/actor/bomb.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/bomb.py
rename to src/assets/ba_data/python/bascenev1lib/actor/bomb.py
index ac99c424..45237574 100644
--- a/src/assets/ba_data/python/bastd/actor/bomb.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/bomb.py
@@ -11,7 +11,7 @@ import random
 from typing import TYPE_CHECKING, TypeVar
 
 import bascenev1 as bs
-from bastd.gameutils import SharedObjects
+from bascenev1lib.gameutils import SharedObjects
 
 if TYPE_CHECKING:
     from typing import Any, Sequence, Callable
@@ -25,7 +25,7 @@ class BombFactory:
     Category: **Gameplay Classes**
 
     A single instance of this is shared between all bombs
-    and can be retrieved via bastd.actor.bomb.get_factory().
+    and can be retrieved via bascenev1lib.actor.bomb.get_factory().
     """
 
     bomb_mesh: bs.Mesh
@@ -130,7 +130,7 @@ class BombFactory:
 
     @classmethod
     def get(cls) -> BombFactory:
-        """Get/create a shared bastd.actor.bomb.BombFactory object."""
+        """Get/create a shared bascenev1lib.actor.bomb.BombFactory object."""
         activity = bs.getactivity()
         factory = activity.customdata.get(cls._STORENAME)
         if factory is None:
@@ -146,7 +146,7 @@ class BombFactory:
     def __init__(self) -> None:
         """Instantiate a BombFactory.
 
-        You shouldn't need to do this; call bastd.actor.bomb.get_factory()
+        You shouldn't need to do this; call bascenev1lib.actor.bomb.get_factory()
         to get a shared instance.
         """
         shared = SharedObjects.get()
diff --git a/src/assets/ba_data/python/bastd/actor/controlsguide.py b/src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/controlsguide.py
rename to src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py
diff --git a/src/assets/ba_data/python/bastd/actor/flag.py b/src/assets/ba_data/python/bascenev1lib/actor/flag.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/flag.py
rename to src/assets/ba_data/python/bascenev1lib/actor/flag.py
index 191f8944..7c8f5364 100644
--- a/src/assets/ba_data/python/bastd/actor/flag.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/flag.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from bastd.gameutils import SharedObjects
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/actor/image.py b/src/assets/ba_data/python/bascenev1lib/actor/image.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/image.py
rename to src/assets/ba_data/python/bascenev1lib/actor/image.py
diff --git a/src/assets/ba_data/python/bastd/actor/onscreencountdown.py b/src/assets/ba_data/python/bascenev1lib/actor/onscreencountdown.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/onscreencountdown.py
rename to src/assets/ba_data/python/bascenev1lib/actor/onscreencountdown.py
diff --git a/src/assets/ba_data/python/bastd/actor/onscreentimer.py b/src/assets/ba_data/python/bascenev1lib/actor/onscreentimer.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/onscreentimer.py
rename to src/assets/ba_data/python/bascenev1lib/actor/onscreentimer.py
diff --git a/src/assets/ba_data/python/bastd/actor/playerspaz.py b/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/playerspaz.py
rename to src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
index 525173d2..928d5ecb 100644
--- a/src/assets/ba_data/python/bastd/actor/playerspaz.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, TypeVar, overload
 
 import babase
 import bascenev1 as bs
-from bastd.actor.spaz import Spaz
+from bascenev1lib.actor.spaz import Spaz
 
 if TYPE_CHECKING:
     from typing import Any, Sequence, Literal
diff --git a/src/assets/ba_data/python/bastd/actor/popuptext.py b/src/assets/ba_data/python/bascenev1lib/actor/popuptext.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/popuptext.py
rename to src/assets/ba_data/python/bascenev1lib/actor/popuptext.py
diff --git a/src/assets/ba_data/python/bastd/actor/powerupbox.py b/src/assets/ba_data/python/bascenev1lib/actor/powerupbox.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/powerupbox.py
rename to src/assets/ba_data/python/bascenev1lib/actor/powerupbox.py
index 165a31b8..43bd55d5 100644
--- a/src/assets/ba_data/python/bastd/actor/powerupbox.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/powerupbox.py
@@ -8,7 +8,7 @@ import random
 from typing import TYPE_CHECKING
 
 import bascenev1 as bs
-from bastd.gameutils import SharedObjects
+from bascenev1lib.gameutils import SharedObjects
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
diff --git a/src/assets/ba_data/python/bastd/actor/respawnicon.py b/src/assets/ba_data/python/bascenev1lib/actor/respawnicon.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/respawnicon.py
rename to src/assets/ba_data/python/bascenev1lib/actor/respawnicon.py
diff --git a/src/assets/ba_data/python/bastd/actor/scoreboard.py b/src/assets/ba_data/python/bascenev1lib/actor/scoreboard.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/scoreboard.py
rename to src/assets/ba_data/python/bascenev1lib/actor/scoreboard.py
diff --git a/src/assets/ba_data/python/bastd/actor/spawner.py b/src/assets/ba_data/python/bascenev1lib/actor/spawner.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/spawner.py
rename to src/assets/ba_data/python/bascenev1lib/actor/spawner.py
diff --git a/src/assets/ba_data/python/bastd/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/spaz.py
rename to src/assets/ba_data/python/bascenev1lib/actor/spaz.py
index b19d0105..b88d40a6 100644
--- a/src/assets/ba_data/python/bastd/actor/spaz.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py
@@ -9,10 +9,10 @@ import random
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.actor.bomb import Bomb, Blast
-from bastd.actor.powerupbox import PowerupBoxFactory
-from bastd.actor.spazfactory import SpazFactory
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.bomb import Bomb, Blast
+from bascenev1lib.actor.powerupbox import PowerupBoxFactory
+from bascenev1lib.actor.spazfactory import SpazFactory
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/actor/spazappearance.py b/src/assets/ba_data/python/bascenev1lib/actor/spazappearance.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/spazappearance.py
rename to src/assets/ba_data/python/bascenev1lib/actor/spazappearance.py
diff --git a/src/assets/ba_data/python/bastd/actor/spazbot.py b/src/assets/ba_data/python/bascenev1lib/actor/spazbot.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/spazbot.py
rename to src/assets/ba_data/python/bascenev1lib/actor/spazbot.py
index 8c0a5237..75d0eeb3 100644
--- a/src/assets/ba_data/python/bastd/actor/spazbot.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/spazbot.py
@@ -11,11 +11,11 @@ import logging
 from typing import TYPE_CHECKING
 
 import bascenev1 as bs
-from bastd.actor.spaz import Spaz
+from bascenev1lib.actor.spaz import Spaz
 
 if TYPE_CHECKING:
     from typing import Any, Sequence, Callable
-    from bastd.actor.flag import Flag
+    from bascenev1lib.actor.flag import Flag
 
 LITE_BOT_COLOR = (1.2, 0.9, 0.2)
 LITE_BOT_HIGHLIGHT = (1.0, 0.5, 0.6)
@@ -945,7 +945,7 @@ class SpazBotSet:
         on_spawn_call: Callable[[SpazBot], Any] | None = None,
     ) -> None:
         """Spawn a bot from this set."""
-        from bastd.actor import spawner
+        from bascenev1lib.actor import spawner
 
         spawner.Spawner(
             pt=pos,
diff --git a/src/assets/ba_data/python/bastd/actor/spazfactory.py b/src/assets/ba_data/python/bascenev1lib/actor/spazfactory.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/actor/spazfactory.py
rename to src/assets/ba_data/python/bascenev1lib/actor/spazfactory.py
index c3da0a6b..a3f524bc 100644
--- a/src/assets/ba_data/python/bastd/actor/spazfactory.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/spazfactory.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import bascenev1 as bs
-from bastd.gameutils import SharedObjects
+from bascenev1lib.gameutils import SharedObjects
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
@@ -92,7 +92,7 @@ class SpazFactory:
 
         # FIXME: should probably put these somewhere common so we don't
         # have to import them from a module that imports us.
-        from bastd.actor.spaz import (
+        from bascenev1lib.actor.spaz import (
             PickupMessage,
             PunchHitMessage,
             CurseExplodeMessage,
diff --git a/src/assets/ba_data/python/bastd/actor/text.py b/src/assets/ba_data/python/bascenev1lib/actor/text.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/text.py
rename to src/assets/ba_data/python/bascenev1lib/actor/text.py
diff --git a/src/assets/ba_data/python/bastd/actor/tipstext.py b/src/assets/ba_data/python/bascenev1lib/actor/tipstext.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/tipstext.py
rename to src/assets/ba_data/python/bascenev1lib/actor/tipstext.py
diff --git a/src/assets/ba_data/python/bastd/actor/zoomtext.py b/src/assets/ba_data/python/bascenev1lib/actor/zoomtext.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/actor/zoomtext.py
rename to src/assets/ba_data/python/bascenev1lib/actor/zoomtext.py
diff --git a/src/assets/ba_data/python/bastd/game/__init__.py b/src/assets/ba_data/python/bascenev1lib/game/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/game/__init__.py
rename to src/assets/ba_data/python/bascenev1lib/game/__init__.py
diff --git a/src/assets/ba_data/python/bastd/game/assault.py b/src/assets/ba_data/python/bascenev1lib/game/assault.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/game/assault.py
rename to src/assets/ba_data/python/bascenev1lib/game/assault.py
index 77f210d1..1af92497 100644
--- a/src/assets/ba_data/python/bastd/game/assault.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/assault.py
@@ -10,10 +10,10 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.flag import Flag
-from bastd.actor.scoreboard import Scoreboard
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.flag import Flag
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/capturetheflag.py b/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/game/capturetheflag.py
rename to src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
index 8b6625c6..12110454 100644
--- a/src/assets/ba_data/python/bastd/game/capturetheflag.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
@@ -10,9 +10,9 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.flag import (
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.flag import (
     FlagFactory,
     Flag,
     FlagPickedUpMessage,
diff --git a/src/assets/ba_data/python/bastd/game/chosenone.py b/src/assets/ba_data/python/bascenev1lib/game/chosenone.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/chosenone.py
rename to src/assets/ba_data/python/bascenev1lib/game/chosenone.py
index dbe04d24..598efa8a 100644
--- a/src/assets/ba_data/python/bastd/game/chosenone.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/chosenone.py
@@ -10,10 +10,10 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.actor.flag import Flag
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.flag import Flag
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/conquest.py b/src/assets/ba_data/python/bascenev1lib/game/conquest.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/game/conquest.py
rename to src/assets/ba_data/python/bascenev1lib/game/conquest.py
index a7c236de..f4a4bd77 100644
--- a/src/assets/ba_data/python/bastd/game/conquest.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/conquest.py
@@ -10,16 +10,16 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-from bastd.actor.flag import Flag
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.flag import Flag
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
 
-    from bastd.actor.respawnicon import RespawnIcon
+    from bascenev1lib.actor.respawnicon import RespawnIcon
 
 
 class ConquestFlag(Flag):
diff --git a/src/assets/ba_data/python/bastd/game/deathmatch.py b/src/assets/ba_data/python/bascenev1lib/game/deathmatch.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/deathmatch.py
rename to src/assets/ba_data/python/bascenev1lib/game/deathmatch.py
index 51b3a37e..7ea29209 100644
--- a/src/assets/ba_data/python/bastd/game/deathmatch.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/deathmatch.py
@@ -9,8 +9,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/easteregghunt.py b/src/assets/ba_data/python/bascenev1lib/game/easteregghunt.py
similarity index 95%
rename from src/assets/ba_data/python/bastd/game/easteregghunt.py
rename to src/assets/ba_data/python/bascenev1lib/game/easteregghunt.py
index f3e37824..94f51461 100644
--- a/src/assets/ba_data/python/bastd/game/easteregghunt.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/easteregghunt.py
@@ -10,13 +10,13 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-from bastd.actor.bomb import Bomb
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.spazbot import SpazBotSet, BouncyBot, SpazBotDiedMessage
-from bastd.actor.onscreencountdown import OnScreenCountdown
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.respawnicon import RespawnIcon
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.bomb import Bomb
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.spazbot import SpazBotSet, BouncyBot, SpazBotDiedMessage
+from bascenev1lib.actor.onscreencountdown import OnScreenCountdown
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.respawnicon import RespawnIcon
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
@@ -99,7 +99,7 @@ class EasterEggHuntGame(bs.TeamGameActivity[Player, Team]):
 
     # Called when our game actually starts.
     def on_begin(self) -> None:
-        from bastd.maps import TowerD
+        from bascenev1lib.maps import TowerD
 
         # There's a player-wall on the tower-d level to prevent
         # players from getting up on the stairs.. we wanna kill that.
diff --git a/src/assets/ba_data/python/bastd/game/elimination.py b/src/assets/ba_data/python/bascenev1lib/game/elimination.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/game/elimination.py
rename to src/assets/ba_data/python/bascenev1lib/game/elimination.py
index 397abed2..35e995e6 100644
--- a/src/assets/ba_data/python/bastd/game/elimination.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/elimination.py
@@ -10,8 +10,8 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.actor.spazfactory import SpazFactory
-from bastd.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.spazfactory import SpazFactory
+from bascenev1lib.actor.scoreboard import Scoreboard
 import bascenev1 as bs
 
 if TYPE_CHECKING:
@@ -480,7 +480,7 @@ class EliminationGame(bs.TeamGameActivity[Player, Team]):
         return actor
 
     def _print_lives(self, player: Player) -> None:
-        from bastd.actor import popuptext
+        from bascenev1lib.actor import popuptext
 
         # We get called in a timer so it's possible our player has left/etc.
         if not player or not player.is_alive() or not player.node:
diff --git a/src/assets/ba_data/python/bastd/game/football.py b/src/assets/ba_data/python/bascenev1lib/game/football.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/football.py
rename to src/assets/ba_data/python/bascenev1lib/game/football.py
index b12bae25..0634d97b 100644
--- a/src/assets/ba_data/python/bastd/game/football.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/football.py
@@ -12,19 +12,19 @@ import random
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.actor.bomb import TNTSpawner
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.respawnicon import RespawnIcon
-from bastd.actor.powerupbox import PowerupBoxFactory, PowerupBox
-from bastd.actor.flag import (
+from bascenev1lib.actor.bomb import TNTSpawner
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.respawnicon import RespawnIcon
+from bascenev1lib.actor.powerupbox import PowerupBoxFactory, PowerupBox
+from bascenev1lib.actor.flag import (
     FlagFactory,
     Flag,
     FlagPickedUpMessage,
     FlagDroppedMessage,
     FlagDiedMessage,
 )
-from bastd.actor.spazbot import (
+from bascenev1lib.actor.spazbot import (
     SpazBotDiedMessage,
     SpazBotPunchedMessage,
     SpazBotSet,
@@ -44,8 +44,8 @@ import bascenev1 as bs
 if TYPE_CHECKING:
     from typing import Any, Sequence
 
-    from bastd.actor.spaz import Spaz
-    from bastd.actor.spazbot import SpazBot
+    from bascenev1lib.actor.spaz import Spaz
+    from bascenev1lib.actor.spazbot import SpazBot
 
 
 class FootballFlag(Flag):
@@ -483,7 +483,7 @@ class FootballCoopGame(bs.CoopGameActivity[Player, Team]):
     def on_begin(self) -> None:
         # FIXME: Split this up a bit.
         # pylint: disable=too-many-statements
-        from bastd.actor import controlsguide
+        from bascenev1lib.actor import controlsguide
 
         super().on_begin()
 
diff --git a/src/assets/ba_data/python/bastd/game/hockey.py b/src/assets/ba_data/python/bascenev1lib/game/hockey.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/hockey.py
rename to src/assets/ba_data/python/bascenev1lib/game/hockey.py
index d91d4564..02d7f6f4 100644
--- a/src/assets/ba_data/python/bastd/game/hockey.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/hockey.py
@@ -9,10 +9,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.powerupbox import PowerupBoxFactory
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.powerupbox import PowerupBoxFactory
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/keepaway.py b/src/assets/ba_data/python/bascenev1lib/game/keepaway.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/keepaway.py
rename to src/assets/ba_data/python/bascenev1lib/game/keepaway.py
index f8d33308..145510b5 100644
--- a/src/assets/ba_data/python/bastd/game/keepaway.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/keepaway.py
@@ -11,9 +11,9 @@ import logging
 from enum import Enum
 from typing import TYPE_CHECKING
 
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.flag import (
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.flag import (
     Flag,
     FlagDroppedMessage,
     FlagDiedMessage,
diff --git a/src/assets/ba_data/python/bastd/game/kingofthehill.py b/src/assets/ba_data/python/bascenev1lib/game/kingofthehill.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/kingofthehill.py
rename to src/assets/ba_data/python/bascenev1lib/game/kingofthehill.py
index dee5431d..dffccd23 100644
--- a/src/assets/ba_data/python/bastd/game/kingofthehill.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/kingofthehill.py
@@ -11,10 +11,10 @@ import weakref
 from enum import Enum
 from typing import TYPE_CHECKING
 
-from bastd.actor.flag import Flag
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.flag import Flag
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/meteorshower.py b/src/assets/ba_data/python/bascenev1lib/game/meteorshower.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/meteorshower.py
rename to src/assets/ba_data/python/bascenev1lib/game/meteorshower.py
index fc538e25..dc3b642b 100644
--- a/src/assets/ba_data/python/bastd/game/meteorshower.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/meteorshower.py
@@ -10,8 +10,8 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-from bastd.actor.bomb import Bomb
-from bastd.actor.onscreentimer import OnScreenTimer
+from bascenev1lib.actor.bomb import Bomb
+from bascenev1lib.actor.onscreentimer import OnScreenTimer
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/ninjafight.py b/src/assets/ba_data/python/bascenev1lib/game/ninjafight.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/game/ninjafight.py
rename to src/assets/ba_data/python/bascenev1lib/game/ninjafight.py
index b0dc3f53..5cedc5cb 100644
--- a/src/assets/ba_data/python/bastd/game/ninjafight.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/ninjafight.py
@@ -10,8 +10,12 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-from bastd.actor.spazbot import SpazBotSet, ChargerBot, SpazBotDiedMessage
-from bastd.actor.onscreentimer import OnScreenTimer
+from bascenev1lib.actor.spazbot import (
+    SpazBotSet,
+    ChargerBot,
+    SpazBotDiedMessage,
+)
+from bascenev1lib.actor.onscreentimer import OnScreenTimer
 import bascenev1 as bs
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/game/onslaught.py b/src/assets/ba_data/python/bascenev1lib/game/onslaught.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/game/onslaught.py
rename to src/assets/ba_data/python/bascenev1lib/game/onslaught.py
index 450d12ca..f79ca59f 100644
--- a/src/assets/ba_data/python/bastd/game/onslaught.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/onslaught.py
@@ -17,13 +17,13 @@ from enum import Enum, unique
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from bastd.actor.popuptext import PopupText
-from bastd.actor.bomb import TNTSpawner
-from bastd.actor.playerspaz import PlayerSpazHurtMessage
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.controlsguide import ControlsGuide
-from bastd.actor.powerupbox import PowerupBox, PowerupBoxFactory
-from bastd.actor.spazbot import (
+from bascenev1lib.actor.popuptext import PopupText
+from bascenev1lib.actor.bomb import TNTSpawner
+from bascenev1lib.actor.playerspaz import PlayerSpazHurtMessage
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.controlsguide import ControlsGuide
+from bascenev1lib.actor.powerupbox import PowerupBox, PowerupBoxFactory
+from bascenev1lib.actor.spazbot import (
     SpazBotDiedMessage,
     SpazBotSet,
     ChargerBot,
@@ -49,7 +49,7 @@ import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
-    from bastd.actor.spazbot import SpazBot
+    from bascenev1lib.actor.spazbot import SpazBot
 
 
 @dataclass
diff --git a/src/assets/ba_data/python/bastd/game/race.py b/src/assets/ba_data/python/bascenev1lib/game/race.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/race.py
rename to src/assets/ba_data/python/bascenev1lib/game/race.py
index a4791398..872b4f49 100644
--- a/src/assets/ba_data/python/bastd/game/race.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/race.py
@@ -12,16 +12,16 @@ import logging
 from typing import TYPE_CHECKING
 from dataclasses import dataclass
 
-from bastd.actor.bomb import Bomb
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.scoreboard import Scoreboard
-from bastd.gameutils import SharedObjects
+from bascenev1lib.actor.bomb import Bomb
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.gameutils import SharedObjects
 import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
 
-    from bastd.actor.onscreentimer import OnScreenTimer
+    from bascenev1lib.actor.onscreentimer import OnScreenTimer
 
 
 @dataclass
@@ -443,7 +443,7 @@ class RaceGame(bs.TeamGameActivity[Player, Team]):
             )
 
     def on_begin(self) -> None:
-        from bastd.actor.onscreentimer import OnScreenTimer
+        from bascenev1lib.actor.onscreentimer import OnScreenTimer
 
         super().on_begin()
         self.setup_standard_time_limit(self._time_limit)
diff --git a/src/assets/ba_data/python/bastd/game/runaround.py b/src/assets/ba_data/python/bascenev1lib/game/runaround.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/game/runaround.py
rename to src/assets/ba_data/python/bascenev1lib/game/runaround.py
index c0738d37..356769d9 100644
--- a/src/assets/ba_data/python/bastd/game/runaround.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/runaround.py
@@ -16,13 +16,13 @@ from enum import Enum
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from bastd.actor.popuptext import PopupText
-from bastd.actor.bomb import TNTSpawner
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.respawnicon import RespawnIcon
-from bastd.actor.powerupbox import PowerupBox, PowerupBoxFactory
-from bastd.gameutils import SharedObjects
-from bastd.actor.spazbot import (
+from bascenev1lib.actor.popuptext import PopupText
+from bascenev1lib.actor.bomb import TNTSpawner
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.respawnicon import RespawnIcon
+from bascenev1lib.actor.powerupbox import PowerupBox, PowerupBoxFactory
+from bascenev1lib.gameutils import SharedObjects
+from bascenev1lib.actor.spazbot import (
     SpazBotSet,
     SpazBot,
     SpazBotDiedMessage,
diff --git a/src/assets/ba_data/python/bastd/game/targetpractice.py b/src/assets/ba_data/python/bascenev1lib/game/targetpractice.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/game/targetpractice.py
rename to src/assets/ba_data/python/bascenev1lib/game/targetpractice.py
index 9dd11882..b7fb73e3 100644
--- a/src/assets/ba_data/python/bastd/game/targetpractice.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/targetpractice.py
@@ -10,16 +10,16 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.onscreencountdown import OnScreenCountdown
-from bastd.actor.bomb import Bomb
-from bastd.actor.popuptext import PopupText
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.onscreencountdown import OnScreenCountdown
+from bascenev1lib.actor.bomb import Bomb
+from bascenev1lib.actor.popuptext import PopupText
 import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
 
-    from bastd.actor.bomb import Blast
+    from bascenev1lib.actor.bomb import Blast
 
 
 class Player(bs.Player['Team']):
diff --git a/src/assets/ba_data/python/bastd/game/thelaststand.py b/src/assets/ba_data/python/bascenev1lib/game/thelaststand.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/game/thelaststand.py
rename to src/assets/ba_data/python/bascenev1lib/game/thelaststand.py
index afe60117..5eb32fac 100644
--- a/src/assets/ba_data/python/bastd/game/thelaststand.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/thelaststand.py
@@ -9,11 +9,11 @@ import logging
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from bastd.actor.playerspaz import PlayerSpaz
-from bastd.actor.bomb import TNTSpawner
-from bastd.actor.scoreboard import Scoreboard
-from bastd.actor.powerupbox import PowerupBoxFactory, PowerupBox
-from bastd.actor.spazbot import (
+from bascenev1lib.actor.playerspaz import PlayerSpaz
+from bascenev1lib.actor.bomb import TNTSpawner
+from bascenev1lib.actor.scoreboard import Scoreboard
+from bascenev1lib.actor.powerupbox import PowerupBoxFactory, PowerupBox
+from bascenev1lib.actor.spazbot import (
     SpazBotSet,
     SpazBotDiedMessage,
     BomberBot,
@@ -33,7 +33,7 @@ import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Any, Sequence
-    from bastd.actor.spazbot import SpazBot
+    from bascenev1lib.actor.spazbot import SpazBot
 
 
 @dataclass
@@ -168,7 +168,7 @@ class TheLastStandGame(bs.CoopGameActivity[Player, Team]):
         self, standard_points: bool = False, force_first: str | None = None
     ) -> None:
         """Generic powerup drop."""
-        from bastd.actor import powerupbox
+        from bascenev1lib.actor import powerupbox
 
         if standard_points:
             pts = self.map.powerup_spawn_points
diff --git a/src/assets/ba_data/python/bastd/gameutils.py b/src/assets/ba_data/python/bascenev1lib/gameutils.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/gameutils.py
rename to src/assets/ba_data/python/bascenev1lib/gameutils.py
diff --git a/src/assets/ba_data/python/bastd/mainmenu.py b/src/assets/ba_data/python/bascenev1lib/mainmenu.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/mainmenu.py
rename to src/assets/ba_data/python/bascenev1lib/mainmenu.py
index 0f4229a9..c797095c 100644
--- a/src/assets/ba_data/python/bastd/mainmenu.py
+++ b/src/assets/ba_data/python/bascenev1lib/mainmenu.py
@@ -343,7 +343,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
                     self._got_news(news)
 
             def _change_phrase(self) -> None:
-                from bastd.actor.text import Text
+                from bascenev1lib.actor.text import Text
 
                 app = bs.app
                 assert app.classic is not None
@@ -488,7 +488,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
 
         # Bring up the last place we were, or start at the main menu otherwise.
         with bs.ContextRef.empty():
-            from bastd.ui import specialoffer
+            from bauiv1lib import specialoffer
 
             assert bs.app.classic is not None
             if bool(False):
@@ -502,7 +502,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
                 # the kiosk start screen.
                 if bs.app.demo_mode or bs.app.arcade_mode:
                     # pylint: disable=cyclic-import
-                    from bastd.ui.kiosk import KioskWindow
+                    from bauiv1lib.kiosk import KioskWindow
 
                     bs.app.classic.ui.set_main_menu_window(
                         KioskWindow().get_root_widget()
@@ -511,21 +511,21 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
                 else:
                     if main_menu_location == 'Gather':
                         # pylint: disable=cyclic-import
-                        from bastd.ui.gather import GatherWindow
+                        from bauiv1lib.gather import GatherWindow
 
                         bs.app.classic.ui.set_main_menu_window(
                             GatherWindow(transition=None).get_root_widget()
                         )
                     elif main_menu_location == 'Watch':
                         # pylint: disable=cyclic-import
-                        from bastd.ui.watch import WatchWindow
+                        from bauiv1lib.watch import WatchWindow
 
                         bs.app.classic.ui.set_main_menu_window(
                             WatchWindow(transition=None).get_root_widget()
                         )
                     elif main_menu_location == 'Team Game Select':
                         # pylint: disable=cyclic-import
-                        from bastd.ui.playlist.browser import (
+                        from bauiv1lib.playlist.browser import (
                             PlaylistBrowserWindow,
                         )
 
@@ -536,7 +536,7 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
                         )
                     elif main_menu_location == 'Free-for-All Game Select':
                         # pylint: disable=cyclic-import
-                        from bastd.ui.playlist.browser import (
+                        from bauiv1lib.playlist.browser import (
                             PlaylistBrowserWindow,
                         )
 
@@ -548,21 +548,21 @@ class MainMenuActivity(bs.Activity[bs.Player, bs.Team]):
                         )
                     elif main_menu_location == 'Coop Select':
                         # pylint: disable=cyclic-import
-                        from bastd.ui.coop.browser import CoopBrowserWindow
+                        from bauiv1lib.coop.browser import CoopBrowserWindow
 
                         bs.app.classic.ui.set_main_menu_window(
                             CoopBrowserWindow(transition=None).get_root_widget()
                         )
                     elif main_menu_location == 'Benchmarks & Stress Tests':
                         # pylint: disable=cyclic-import
-                        from bastd.ui.debug import DebugWindow
+                        from bauiv1lib.debug import DebugWindow
 
                         bs.app.classic.ui.set_main_menu_window(
                             DebugWindow(transition=None).get_root_widget()
                         )
                     else:
                         # pylint: disable=cyclic-import
-                        from bastd.ui.mainmenu import MainMenuWindow
+                        from bauiv1lib.mainmenu import MainMenuWindow
 
                         bs.app.classic.ui.set_main_menu_window(
                             MainMenuWindow(transition=None).get_root_widget()
@@ -1037,7 +1037,7 @@ def _preload1() -> None:
     ]:
         bs.gettexture(tex)
     bs.gettexture('bg')
-    from bastd.actor.powerupbox import PowerupBoxFactory
+    from bascenev1lib.actor.powerupbox import PowerupBoxFactory
 
     PowerupBoxFactory.get()
     bui.apptimer(0.1, _preload2)
@@ -1071,14 +1071,14 @@ def _preload2() -> None:
         'gong',
     ]:
         bs.getsound(sname)
-    from bastd.actor.bomb import BombFactory
+    from bascenev1lib.actor.bomb import BombFactory
 
     BombFactory.get()
     bui.apptimer(0.1, _preload3)
 
 
 def _preload3() -> None:
-    from bastd.actor.spazfactory import SpazFactory
+    from bascenev1lib.actor.spazfactory import SpazFactory
 
     for mname in ['bomb', 'bombSticky', 'impactBomb']:
         bs.getmesh(mname)
@@ -1103,7 +1103,7 @@ def _preload4() -> None:
         bs.getmesh(mname)
     for sname in ['metalHit', 'metalSkid', 'refWhistle', 'achievement']:
         bs.getsound(sname)
-    from bastd.actor.flag import FlagFactory
+    from bascenev1lib.actor.flag import FlagFactory
 
     FlagFactory.get()
 
diff --git a/src/assets/ba_data/python/bastd/keyboard/__init__.py b/src/assets/ba_data/python/bascenev1lib/mapdata/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/keyboard/__init__.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/__init__.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/big_g.py b/src/assets/ba_data/python/bascenev1lib/mapdata/big_g.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/big_g.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/big_g.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/bridgit.py b/src/assets/ba_data/python/bascenev1lib/mapdata/bridgit.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/bridgit.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/bridgit.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/courtyard.py b/src/assets/ba_data/python/bascenev1lib/mapdata/courtyard.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/courtyard.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/courtyard.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/crag_castle.py b/src/assets/ba_data/python/bascenev1lib/mapdata/crag_castle.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/crag_castle.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/crag_castle.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/doom_shroom.py b/src/assets/ba_data/python/bascenev1lib/mapdata/doom_shroom.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/doom_shroom.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/doom_shroom.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/football_stadium.py b/src/assets/ba_data/python/bascenev1lib/mapdata/football_stadium.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/football_stadium.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/football_stadium.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/happy_thoughts.py b/src/assets/ba_data/python/bascenev1lib/mapdata/happy_thoughts.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/happy_thoughts.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/happy_thoughts.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/hockey_stadium.py b/src/assets/ba_data/python/bascenev1lib/mapdata/hockey_stadium.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/hockey_stadium.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/hockey_stadium.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/lake_frigid.py b/src/assets/ba_data/python/bascenev1lib/mapdata/lake_frigid.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/lake_frigid.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/lake_frigid.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/monkey_face.py b/src/assets/ba_data/python/bascenev1lib/mapdata/monkey_face.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/monkey_face.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/monkey_face.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/rampage.py b/src/assets/ba_data/python/bascenev1lib/mapdata/rampage.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/rampage.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/rampage.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/roundabout.py b/src/assets/ba_data/python/bascenev1lib/mapdata/roundabout.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/roundabout.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/roundabout.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/step_right_up.py b/src/assets/ba_data/python/bascenev1lib/mapdata/step_right_up.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/step_right_up.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/step_right_up.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/the_pad.py b/src/assets/ba_data/python/bascenev1lib/mapdata/the_pad.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/the_pad.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/the_pad.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/tip_top.py b/src/assets/ba_data/python/bascenev1lib/mapdata/tip_top.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/tip_top.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/tip_top.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/tower_d.py b/src/assets/ba_data/python/bascenev1lib/mapdata/tower_d.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/tower_d.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/tower_d.py
diff --git a/src/assets/ba_data/python/bastd/mapdata/zig_zag.py b/src/assets/ba_data/python/bascenev1lib/mapdata/zig_zag.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/zig_zag.py
rename to src/assets/ba_data/python/bascenev1lib/mapdata/zig_zag.py
diff --git a/src/assets/ba_data/python/bastd/maps.py b/src/assets/ba_data/python/bascenev1lib/maps.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/maps.py
rename to src/assets/ba_data/python/bascenev1lib/maps.py
index a31039b4..016a9e7c 100644
--- a/src/assets/ba_data/python/bastd/maps.py
+++ b/src/assets/ba_data/python/bascenev1lib/maps.py
@@ -8,7 +8,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import bascenev1 as bs
-from bastd.gameutils import SharedObjects
+from bascenev1lib.gameutils import SharedObjects
 
 if TYPE_CHECKING:
     from typing import Any
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 class HockeyStadium(bs.Map):
     """Stadium map used for ice hockey games."""
 
-    from bastd.mapdata import hockey_stadium as defs
+    from bascenev1lib.mapdata import hockey_stadium as defs
 
     name = 'Hockey Stadium'
 
@@ -111,7 +111,7 @@ class HockeyStadium(bs.Map):
 class FootballStadium(bs.Map):
     """Stadium map for football games."""
 
-    from bastd.mapdata import football_stadium as defs
+    from bascenev1lib.mapdata import football_stadium as defs
 
     name = 'Football Stadium'
 
@@ -176,7 +176,7 @@ class FootballStadium(bs.Map):
 class Bridgit(bs.Map):
     """Map with a narrow bridge in the middle."""
 
-    from bastd.mapdata import bridgit as defs
+    from bascenev1lib.mapdata import bridgit as defs
 
     name = 'Bridgit'
     dataname = 'bridgit'
@@ -281,7 +281,7 @@ class Bridgit(bs.Map):
 class BigG(bs.Map):
     """Large G shaped map for racing"""
 
-    from bastd.mapdata import big_g as defs
+    from bascenev1lib.mapdata import big_g as defs
 
     name = 'Big G'
 
@@ -391,7 +391,7 @@ class BigG(bs.Map):
 class Roundabout(bs.Map):
     """CTF map featuring two platforms and a long way around between them"""
 
-    from bastd.mapdata import roundabout as defs
+    from bascenev1lib.mapdata import roundabout as defs
 
     name = 'Roundabout'
 
@@ -495,7 +495,7 @@ class Roundabout(bs.Map):
 class MonkeyFace(bs.Map):
     """Map sorta shaped like a monkey face; teehee!"""
 
-    from bastd.mapdata import monkey_face as defs
+    from bascenev1lib.mapdata import monkey_face as defs
 
     name = 'Monkey Face'
 
@@ -599,7 +599,7 @@ class MonkeyFace(bs.Map):
 class ZigZag(bs.Map):
     """A very long zig-zaggy map"""
 
-    from bastd.mapdata import zig_zag as defs
+    from bascenev1lib.mapdata import zig_zag as defs
 
     name = 'Zigzag'
 
@@ -706,7 +706,7 @@ class ZigZag(bs.Map):
 class ThePad(bs.Map):
     """A simple square shaped map with a raised edge."""
 
-    from bastd.mapdata import the_pad as defs
+    from bascenev1lib.mapdata import the_pad as defs
 
     name = 'The Pad'
 
@@ -794,7 +794,7 @@ class ThePad(bs.Map):
 class DoomShroom(bs.Map):
     """A giant mushroom. Of doom!"""
 
-    from bastd.mapdata import doom_shroom as defs
+    from bascenev1lib.mapdata import doom_shroom as defs
 
     name = 'Doom Shroom'
 
@@ -889,7 +889,7 @@ class DoomShroom(bs.Map):
 class LakeFrigid(bs.Map):
     """An icy lake fit for racing."""
 
-    from bastd.mapdata import lake_frigid as defs
+    from bascenev1lib.mapdata import lake_frigid as defs
 
     name = 'Lake Frigid'
 
@@ -975,7 +975,7 @@ class LakeFrigid(bs.Map):
 class TipTop(bs.Map):
     """A pointy map good for king-of-the-hill-ish games."""
 
-    from bastd.mapdata import tip_top as defs
+    from bascenev1lib.mapdata import tip_top as defs
 
     name = 'Tip Top'
 
@@ -1052,7 +1052,7 @@ class TipTop(bs.Map):
 class CragCastle(bs.Map):
     """A lovely castle map."""
 
-    from bastd.mapdata import crag_castle as defs
+    from bascenev1lib.mapdata import crag_castle as defs
 
     name = 'Crag Castle'
 
@@ -1145,7 +1145,7 @@ class CragCastle(bs.Map):
 class TowerD(bs.Map):
     """Map used for runaround mini-game."""
 
-    from bastd.mapdata import tower_d as defs
+    from bascenev1lib.mapdata import tower_d as defs
 
     name = 'Tower D'
 
@@ -1267,7 +1267,7 @@ class TowerD(bs.Map):
 class HappyThoughts(bs.Map):
     """Flying map."""
 
-    from bastd.mapdata import happy_thoughts as defs
+    from bascenev1lib.mapdata import happy_thoughts as defs
 
     name = 'Happy Thoughts'
 
@@ -1382,7 +1382,7 @@ class HappyThoughts(bs.Map):
 class StepRightUp(bs.Map):
     """Wide stepped map good for CTF or Assault."""
 
-    from bastd.mapdata import step_right_up as defs
+    from bascenev1lib.mapdata import step_right_up as defs
 
     name = 'Step Right Up'
 
@@ -1462,7 +1462,7 @@ class StepRightUp(bs.Map):
 class Courtyard(bs.Map):
     """A courtyard-ish looking map for co-op levels."""
 
-    from bastd.mapdata import courtyard as defs
+    from bascenev1lib.mapdata import courtyard as defs
 
     name = 'Courtyard'
 
@@ -1578,7 +1578,7 @@ class Courtyard(bs.Map):
 class Rampage(bs.Map):
     """Wee little map with ramps on the sides."""
 
-    from bastd.mapdata import rampage as defs
+    from bascenev1lib.mapdata import rampage as defs
 
     name = 'Rampage'
 
diff --git a/src/assets/ba_data/python/bastd/mapdata/__init__.py b/src/assets/ba_data/python/bascenev1lib/session/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/mapdata/__init__.py
rename to src/assets/ba_data/python/bascenev1lib/session/__init__.py
diff --git a/src/assets/ba_data/python/bastd/tutorial.py b/src/assets/ba_data/python/bascenev1lib/tutorial.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/tutorial.py
rename to src/assets/ba_data/python/bascenev1lib/tutorial.py
index 868a364b..babac1d2 100644
--- a/src/assets/ba_data/python/bastd/tutorial.py
+++ b/src/assets/ba_data/python/bascenev1lib/tutorial.py
@@ -21,7 +21,7 @@ from collections import deque
 from typing import TYPE_CHECKING
 
 import bascenev1 as bs
-from bastd.actor.spaz import Spaz
+from bascenev1lib.actor.spaz import Spaz
 
 if TYPE_CHECKING:
     from typing import Any, Callable, Sequence
@@ -188,7 +188,7 @@ class Team(bs.Team[Player]):
 
 class TutorialActivity(bs.Activity[Player, Team]):
     def __init__(self, settings: dict | None = None):
-        from bastd.maps import Rampage
+        from bascenev1lib.maps import Rampage
 
         if settings is None:
             settings = {}
@@ -599,7 +599,7 @@ class TutorialActivity(bs.Activity[Player, Team]):
                         )
                     else:
                         pos = self._position
-                    from bastd.actor import powerupbox
+                    from bascenev1lib.actor import powerupbox
 
                     powerupbox.PowerupBox(
                         position=pos, poweruptype='punch'
diff --git a/src/assets/ba_data/python/bastd/ui/__init__.py b/src/assets/ba_data/python/bastd/ui/__init__.py
deleted file mode 100644
index 15b7717f..00000000
--- a/src/assets/ba_data/python/bastd/ui/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# Released under the MIT License. See LICENSE for details.
-#
-"""
-Provide top level UI related functionality.
-"""
diff --git a/src/assets/ba_data/python/bauiv1/ui/__init__.py b/src/assets/ba_data/python/bauiv1/ui/__init__.py
index b2b154c4..94a98a9b 100644
--- a/src/assets/ba_data/python/bauiv1/ui/__init__.py
+++ b/src/assets/ba_data/python/bauiv1/ui/__init__.py
@@ -116,7 +116,7 @@ class UIEntry:
             if bool(False):
                 return UILocation
             raise RuntimeError('FIXME UNIMPLEMENTED')
-            # from bastd.ui import mainmenu
+            # from bauiv1lib import mainmenu
             # return cast(Type[UILocation], mainmenu.MainMenuWindow)
 
         raise ValueError('unknown ui class ' + str(self._name))
diff --git a/src/assets/ba_data/python/bauiv1lib/__init__.py b/src/assets/ba_data/python/bauiv1lib/__init__.py
new file mode 100644
index 00000000..17c4007c
--- /dev/null
+++ b/src/assets/ba_data/python/bauiv1lib/__init__.py
@@ -0,0 +1,5 @@
+# Released under the MIT License. See LICENSE for details.
+#
+"""Ballistica standard library: games, UI, etc."""
+
+# ba_meta require api 8
diff --git a/src/assets/ba_data/python/bastd/ui/account/__init__.py b/src/assets/ba_data/python/bauiv1lib/account/__init__.py
similarity index 92%
rename from src/assets/ba_data/python/bastd/ui/account/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/account/__init__.py
index 6e4b99dc..5ce26500 100644
--- a/src/assets/ba_data/python/bastd/ui/account/__init__.py
+++ b/src/assets/ba_data/python/bauiv1lib/account/__init__.py
@@ -9,8 +9,8 @@ import bauiv1 as bui
 
 def show_sign_in_prompt(account_type: str | None = None) -> None:
     """Bring up a prompt telling the user they must sign in."""
-    from bastd.ui.confirm import ConfirmWindow
-    from bastd.ui.account import settings
+    from bauiv1lib.confirm import ConfirmWindow
+    from bauiv1lib.account import settings
 
     if account_type == 'Google Play':
 
diff --git a/src/assets/ba_data/python/bastd/ui/account/link.py b/src/assets/ba_data/python/bauiv1lib/account/link.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/account/link.py
rename to src/assets/ba_data/python/bauiv1lib/account/link.py
index 47c17f31..517e26ef 100644
--- a/src/assets/ba_data/python/bastd/ui/account/link.py
+++ b/src/assets/ba_data/python/bauiv1lib/account/link.py
@@ -107,7 +107,7 @@ class AccountLinkWindow(bui.Window):
         )
 
     def _generate_press(self) -> None:
-        from bastd.ui import account
+        from bauiv1lib import account
 
         plus = bui.app.plus
         assert plus is not None
@@ -128,7 +128,7 @@ class AccountLinkWindow(bui.Window):
         plus.run_v1_account_transactions()
 
     def _enter_code_press(self) -> None:
-        from bastd.ui import promocode
+        from bauiv1lib import promocode
 
         promocode.PromoCodeWindow(
             modal=True, origin_widget=self._enter_code_button
diff --git a/src/assets/ba_data/python/bastd/ui/account/settings.py b/src/assets/ba_data/python/bauiv1lib/account/settings.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/account/settings.py
rename to src/assets/ba_data/python/bauiv1lib/account/settings.py
index 121b48a1..649ca2a1 100644
--- a/src/assets/ba_data/python/bastd/ui/account/settings.py
+++ b/src/assets/ba_data/python/bauiv1lib/account/settings.py
@@ -222,7 +222,7 @@ class AccountSettingsWindow(bui.Window):
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
         # pylint: disable=cyclic-import
-        from bastd.ui import confirm
+        from bauiv1lib import confirm
 
         plus = bui.app.plus
         assert plus is not None
@@ -1151,7 +1151,7 @@ class AccountSettingsWindow(bui.Window):
 
     def _on_achievements_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui import achievements
+        from bauiv1lib import achievements
 
         assert self._achievements_button is not None
         achievements.AchievementsWindow(
@@ -1353,13 +1353,13 @@ class AccountSettingsWindow(bui.Window):
 
     def _link_accounts_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account.link import AccountLinkWindow
+        from bauiv1lib.account.link import AccountLinkWindow
 
         AccountLinkWindow(origin_widget=self._link_accounts_button)
 
     def _unlink_accounts_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account.unlink import AccountUnlinkWindow
+        from bauiv1lib.account.unlink import AccountUnlinkWindow
 
         if not self._have_unlinkable_v1_accounts():
             bui.getsound('error').play()
@@ -1369,7 +1369,7 @@ class AccountSettingsWindow(bui.Window):
 
     def _player_profiles_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.profile.browser import ProfileBrowserWindow
+        from bauiv1lib.profile.browser import ProfileBrowserWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1503,7 +1503,7 @@ class AccountSettingsWindow(bui.Window):
 
     def _v2_proxy_sign_in_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account.v2proxy import V2ProxySignInWindow
+        from bauiv1lib.account.v2proxy import V2ProxySignInWindow
 
         assert self._sign_in_v2_proxy_button is not None
         V2ProxySignInWindow(origin_widget=self._sign_in_v2_proxy_button)
@@ -1528,7 +1528,7 @@ class AccountSettingsWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/account/unlink.py b/src/assets/ba_data/python/bauiv1lib/account/unlink.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/account/unlink.py
rename to src/assets/ba_data/python/bauiv1lib/account/unlink.py
diff --git a/src/assets/ba_data/python/bastd/ui/account/v2proxy.py b/src/assets/ba_data/python/bauiv1lib/account/v2proxy.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/account/v2proxy.py
rename to src/assets/ba_data/python/bauiv1lib/account/v2proxy.py
diff --git a/src/assets/ba_data/python/bastd/ui/account/viewer.py b/src/assets/ba_data/python/bauiv1lib/account/viewer.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/account/viewer.py
rename to src/assets/ba_data/python/bauiv1lib/account/viewer.py
index bfce9387..f0291f31 100644
--- a/src/assets/ba_data/python/bastd/ui/account/viewer.py
+++ b/src/assets/ba_data/python/bauiv1lib/account/viewer.py
@@ -7,13 +7,13 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 import logging
 
-from bastd.ui.popup import PopupWindow, PopupMenuWindow
+from bauiv1lib.popup import PopupWindow, PopupMenuWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
     from typing import Any
 
-    from bastd.ui.popup import PopupMenu
+    from bauiv1lib.popup import PopupMenu
 
 
 class AccountViewerWindow(PopupWindow):
@@ -204,7 +204,7 @@ class AccountViewerWindow(PopupWindow):
         plus.run_v1_account_transactions()
 
     def _on_report_press(self) -> None:
-        from bastd.ui import report
+        from bauiv1lib import report
 
         report.ReportPlayerWindow(
             self._account_id, origin_widget=self._extras_menu_button
diff --git a/src/assets/ba_data/python/bastd/ui/achievements.py b/src/assets/ba_data/python/bauiv1lib/achievements.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/achievements.py
rename to src/assets/ba_data/python/bauiv1lib/achievements.py
index c97d89c6..08f5fd0b 100644
--- a/src/assets/ba_data/python/bastd/ui/achievements.py
+++ b/src/assets/ba_data/python/bauiv1lib/achievements.py
@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 
diff --git a/src/assets/ba_data/python/bastd/ui/appinvite.py b/src/assets/ba_data/python/bauiv1lib/appinvite.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/appinvite.py
rename to src/assets/ba_data/python/bauiv1lib/appinvite.py
diff --git a/src/assets/ba_data/python/bastd/ui/characterpicker.py b/src/assets/ba_data/python/bauiv1lib/characterpicker.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/characterpicker.py
rename to src/assets/ba_data/python/bauiv1lib/characterpicker.py
index 0ca01f6f..fe9405cf 100644
--- a/src/assets/ba_data/python/bastd/ui/characterpicker.py
+++ b/src/assets/ba_data/python/bauiv1lib/characterpicker.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 import math
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -29,7 +29,7 @@ class CharacterPicker(PopupWindow):
         selected_character: str | None = None,
     ):
         # pylint: disable=too-many-locals
-        from bastd.actor import spazappearance
+        from bascenev1lib.actor import spazappearance
 
         assert bui.app.classic is not None
 
@@ -182,8 +182,8 @@ class CharacterPicker(PopupWindow):
         bui.widget(edit=btn, show_buffer_top=30, show_buffer_bottom=30)
 
     def _on_store_press(self) -> None:
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.store.browser import StoreBrowserWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.store.browser import StoreBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/colorpicker.py b/src/assets/ba_data/python/bauiv1lib/colorpicker.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/colorpicker.py
rename to src/assets/ba_data/python/bauiv1lib/colorpicker.py
index dc4110e2..67bff95f 100644
--- a/src/assets/ba_data/python/bastd/ui/colorpicker.py
+++ b/src/assets/ba_data/python/bauiv1lib/colorpicker.py
@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -135,7 +135,7 @@ class ColorPicker(PopupWindow):
         return self._tag
 
     def _select_other(self) -> None:
-        from bastd.ui import purchase
+        from bauiv1lib import purchase
 
         # Requires pro.
         assert bui.app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/config.py b/src/assets/ba_data/python/bauiv1lib/config.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/config.py
rename to src/assets/ba_data/python/bauiv1lib/config.py
diff --git a/src/assets/ba_data/python/bastd/ui/configerror.py b/src/assets/ba_data/python/bauiv1lib/configerror.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/configerror.py
rename to src/assets/ba_data/python/bauiv1lib/configerror.py
diff --git a/src/assets/ba_data/python/bastd/ui/confirm.py b/src/assets/ba_data/python/bauiv1lib/confirm.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/confirm.py
rename to src/assets/ba_data/python/bauiv1lib/confirm.py
diff --git a/src/assets/ba_data/python/bastd/ui/continues.py b/src/assets/ba_data/python/bauiv1lib/continues.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/continues.py
rename to src/assets/ba_data/python/bauiv1lib/continues.py
index 3b500422..7457e606 100644
--- a/src/assets/ba_data/python/bastd/ui/continues.py
+++ b/src/assets/ba_data/python/bauiv1lib/continues.py
@@ -214,7 +214,7 @@ class ContinuesWindow(bui.Window):
             self._on_cancel()
 
     def _on_continue_press(self) -> None:
-        from bastd.ui import getcurrency
+        from bauiv1lib import getcurrency
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/session/__init__.py b/src/assets/ba_data/python/bauiv1lib/coop/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/session/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/coop/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/coop/browser.py b/src/assets/ba_data/python/bauiv1lib/coop/browser.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/ui/coop/browser.py
rename to src/assets/ba_data/python/bauiv1lib/coop/browser.py
index 2390a63d..1dfa0bd2 100644
--- a/src/assets/ba_data/python/bastd/ui/coop/browser.py
+++ b/src/assets/ba_data/python/bauiv1lib/coop/browser.py
@@ -10,15 +10,15 @@ import logging
 from threading import Thread
 from typing import TYPE_CHECKING
 
-from bastd.ui.store.button import StoreButton
-from bastd.ui.league.rankbutton import LeagueRankButton
-from bastd.ui.store.browser import StoreBrowserWindow
+from bauiv1lib.store.button import StoreButton
+from bauiv1lib.league.rankbutton import LeagueRankButton
+from bauiv1lib.store.browser import StoreBrowserWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
     from typing import Any
 
-    from bastd.ui.coop.tournamentbutton import TournamentButton
+    from bauiv1lib.coop.tournamentbutton import TournamentButton
 
 
 class CoopBrowserWindow(bui.Window):
@@ -351,17 +351,17 @@ class CoopBrowserWindow(bui.Window):
     @staticmethod
     def _preload_modules() -> None:
         """Preload modules we use (called in bg thread)."""
-        import bastd.ui.purchase as _unused1
-        import bastd.ui.coop.gamebutton as _unused2
-        import bastd.ui.confirm as _unused3
-        import bastd.ui.account as _unused4
-        import bastd.ui.league.rankwindow as _unused5
-        import bastd.ui.store.browser as _unused6
-        import bastd.ui.account.viewer as _unused7
-        import bastd.ui.tournamentscores as _unused8
-        import bastd.ui.tournamententry as _unused9
-        import bastd.ui.play as _unused10
-        import bastd.ui.coop.tournamentbutton as _unused11
+        import bauiv1lib.purchase as _unused1
+        import bauiv1lib.coop.gamebutton as _unused2
+        import bauiv1lib.confirm as _unused3
+        import bauiv1lib.account as _unused4
+        import bauiv1lib.league.rankwindow as _unused5
+        import bauiv1lib.store.browser as _unused6
+        import bauiv1lib.account.viewer as _unused7
+        import bauiv1lib.tournamentscores as _unused8
+        import bauiv1lib.tournamententry as _unused9
+        import bauiv1lib.play as _unused10
+        import bauiv1lib.coop.tournamentbutton as _unused11
 
     def _update(self) -> None:
         plus = bui.app.plus
@@ -499,7 +499,7 @@ class CoopBrowserWindow(bui.Window):
 
     def _set_campaign_difficulty(self, difficulty: str) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -531,7 +531,7 @@ class CoopBrowserWindow(bui.Window):
     def _refresh_campaign_row(self) -> None:
         # pylint: disable=too-many-locals
         # pylint: disable=cyclic-import
-        from bastd.ui.coop.gamebutton import GameButton
+        from bauiv1lib.coop.gamebutton import GameButton
 
         parent_widget = self._campaign_sub_container
 
@@ -673,7 +673,7 @@ class CoopBrowserWindow(bui.Window):
 
     def _on_tournament_info_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         txt = bui.Lstr(resource=self._r + '.tournamentInfoText')
         ConfirmWindow(
@@ -689,8 +689,8 @@ class CoopBrowserWindow(bui.Window):
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
         # pylint: disable=cyclic-import
-        from bastd.ui.coop.gamebutton import GameButton
-        from bastd.ui.coop.tournamentbutton import TournamentButton
+        from bauiv1lib.coop.gamebutton import GameButton
+        from bauiv1lib.coop.tournamentbutton import TournamentButton
 
         plus = bui.app.plus
         assert plus is not None
@@ -1016,8 +1016,8 @@ class CoopBrowserWindow(bui.Window):
 
     def _switch_to_league_rankings(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.league.rankwindow import LeagueRankWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.league.rankwindow import LeagueRankWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -1041,7 +1041,7 @@ class CoopBrowserWindow(bui.Window):
         | None = StoreBrowserWindow.TabID.EXTRAS,
     ) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account import show_sign_in_prompt
+        from bauiv1lib.account import show_sign_in_prompt
 
         plus = bui.app.plus
         assert plus is not None
@@ -1069,9 +1069,9 @@ class CoopBrowserWindow(bui.Window):
         """Run the provided game."""
         # pylint: disable=too-many-branches
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import ConfirmWindow
-        from bastd.ui.purchase import PurchaseWindow
-        from bastd.ui.account import show_sign_in_prompt
+        from bauiv1lib.confirm import ConfirmWindow
+        from bauiv1lib.purchase import PurchaseWindow
+        from bauiv1lib.account import show_sign_in_prompt
 
         plus = bui.app.plus
         assert plus is not None
@@ -1144,8 +1144,8 @@ class CoopBrowserWindow(bui.Window):
 
     def run_tournament(self, tournament_button: TournamentButton) -> None:
         """Run the provided tournament game."""
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.tournamententry import TournamentEntryWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.tournamententry import TournamentEntryWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -1216,7 +1216,7 @@ class CoopBrowserWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.play import PlayWindow
+        from bauiv1lib.play import PlayWindow
 
         # If something is selected, store it.
         self._save_state()
diff --git a/src/assets/ba_data/python/bastd/ui/coop/gamebutton.py b/src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/coop/gamebutton.py
rename to src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py
index 2bd3a86c..c24d3909 100644
--- a/src/assets/ba_data/python/bastd/ui/coop/gamebutton.py
+++ b/src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py
@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING
 import bauiv1 as bui
 
 if TYPE_CHECKING:
-    from bastd.ui.coop.browser import CoopBrowserWindow
+    from bauiv1lib.coop.browser import CoopBrowserWindow
 
 
 class GameButton:
diff --git a/src/assets/ba_data/python/bastd/ui/coop/level.py b/src/assets/ba_data/python/bauiv1lib/coop/level.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/coop/level.py
rename to src/assets/ba_data/python/bauiv1lib/coop/level.py
diff --git a/src/assets/ba_data/python/bastd/ui/coop/tournamentbutton.py b/src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/coop/tournamentbutton.py
rename to src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py
index 4c71488d..ea38c938 100644
--- a/src/assets/ba_data/python/bastd/ui/coop/tournamentbutton.py
+++ b/src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py
@@ -370,7 +370,7 @@ class TournamentButton:
 
     def _show_leader(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account.viewer import AccountViewerWindow
+        from bauiv1lib.account.viewer import AccountViewerWindow
 
         tournament_id = self.tournament_id
 
@@ -392,7 +392,7 @@ class TournamentButton:
 
     def _show_scores(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.tournamentscores import TournamentScoresWindow
+        from bauiv1lib.tournamentscores import TournamentScoresWindow
 
         tournament_id = self.tournament_id
         if tournament_id is None:
diff --git a/src/assets/ba_data/python/bastd/ui/creditslist.py b/src/assets/ba_data/python/bauiv1lib/creditslist.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/creditslist.py
rename to src/assets/ba_data/python/bauiv1lib/creditslist.py
index f1ac8e40..1a9d3236 100644
--- a/src/assets/ba_data/python/bastd/ui/creditslist.py
+++ b/src/assets/ba_data/python/bauiv1lib/creditslist.py
@@ -354,7 +354,7 @@ class CreditsListWindow(bui.Window):
             voffs -= line_height
 
     def _back(self) -> None:
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         bui.containerwidget(
             edit=self._root_widget, transition=self._transition_out
diff --git a/src/assets/ba_data/python/bastd/ui/debug.py b/src/assets/ba_data/python/bauiv1lib/debug.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/debug.py
rename to src/assets/ba_data/python/bauiv1lib/debug.py
index e71583ce..2c90827d 100644
--- a/src/assets/ba_data/python/bastd/ui/debug.py
+++ b/src/assets/ba_data/python/bauiv1lib/debug.py
@@ -16,7 +16,7 @@ class DebugWindow(bui.Window):
     def __init__(self, transition: str | None = 'in_right'):
         # pylint: disable=too-many-statements
         # pylint: disable=cyclic-import
-        from bastd.ui import popup
+        from bauiv1lib import popup
 
         assert bui.app.classic is not None
         bui.app.classic.ui.set_main_menu_location('Benchmarks & Stress Tests')
@@ -377,7 +377,7 @@ class DebugWindow(bui.Window):
 
     def _done(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         assert bui.app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/feedback.py b/src/assets/ba_data/python/bauiv1lib/feedback.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/feedback.py
rename to src/assets/ba_data/python/bauiv1lib/feedback.py
diff --git a/src/assets/ba_data/python/bastd/ui/fileselector.py b/src/assets/ba_data/python/bauiv1lib/fileselector.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/fileselector.py
rename to src/assets/ba_data/python/bauiv1lib/fileselector.py
diff --git a/src/assets/ba_data/python/bastd/ui/gather/__init__.py b/src/assets/ba_data/python/bauiv1lib/gather/__init__.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/ui/gather/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/gather/__init__.py
index a9ebc56a..04611e6e 100644
--- a/src/assets/ba_data/python/bastd/ui/gather/__init__.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/__init__.py
@@ -8,7 +8,7 @@ import weakref
 import logging
 from enum import Enum
 
-from bastd.ui.tabs import TabRow
+from bauiv1lib.tabs import TabRow
 import bauiv1 as bui
 
 
@@ -72,11 +72,11 @@ class GatherWindow(bui.Window):
         # pylint: disable=too-many-statements
         # pylint: disable=too-many-locals
         # pylint: disable=cyclic-import
-        from bastd.ui.gather.abouttab import AboutGatherTab
-        from bastd.ui.gather.manualtab import ManualGatherTab
-        from bastd.ui.gather.privatetab import PrivateGatherTab
-        from bastd.ui.gather.publictab import PublicGatherTab
-        from bastd.ui.gather.nearbytab import NearbyGatherTab
+        from bauiv1lib.gather.abouttab import AboutGatherTab
+        from bauiv1lib.gather.manualtab import ManualGatherTab
+        from bauiv1lib.gather.privatetab import PrivateGatherTab
+        from bauiv1lib.gather.publictab import PublicGatherTab
+        from bauiv1lib.gather.nearbytab import NearbyGatherTab
 
         plus = bui.app.plus
         assert plus is not None
@@ -268,7 +268,7 @@ class GatherWindow(bui.Window):
 
     def playlist_select(self, origin_widget: bui.Widget) -> None:
         """Called by the private-hosting tab to select a playlist."""
-        from bastd.ui.play import PlayWindow
+        from bauiv1lib.play import PlayWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -381,7 +381,7 @@ class GatherWindow(bui.Window):
             logging.exception('Error restoring state for %s.', self)
 
     def _back(self) -> None:
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/gather/abouttab.py b/src/assets/ba_data/python/bauiv1lib/gather/abouttab.py
similarity index 95%
rename from src/assets/ba_data/python/bastd/ui/gather/abouttab.py
rename to src/assets/ba_data/python/bauiv1lib/gather/abouttab.py
index 4104b100..9402e156 100644
--- a/src/assets/ba_data/python/bastd/ui/gather/abouttab.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/abouttab.py
@@ -6,11 +6,11 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.ui.gather import GatherTab
+from bauiv1lib.gather import GatherTab
 import bauiv1 as bui
 
 if TYPE_CHECKING:
-    from bastd.ui.gather import GatherWindow
+    from bauiv1lib.gather import GatherWindow
 
 
 class AboutGatherTab(GatherTab):
@@ -131,8 +131,8 @@ class AboutGatherTab(GatherTab):
         return self._container
 
     def _invite_to_try_press(self) -> None:
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.appinvite import handle_app_invites_press
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.appinvite import handle_app_invites_press
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/gather/manualtab.py b/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/gather/manualtab.py
rename to src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
index a61fc267..cfb0ff4f 100644
--- a/src/assets/ba_data/python/bastd/ui/gather/manualtab.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/manualtab.py
@@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, cast
 
 from enum import Enum
 from dataclasses import dataclass
-from bastd.ui.gather import GatherTab
+from bauiv1lib.gather import GatherTab
 
 import bauiv1 as bui
 import bascenev1 as bs
@@ -19,7 +19,7 @@ import bascenev1 as bs
 if TYPE_CHECKING:
     from typing import Any, Callable
 
-    from bastd.ui.gather import GatherWindow
+    from bauiv1lib.gather import GatherWindow
 
 
 def _safe_set_text(
@@ -646,7 +646,7 @@ class ManualGatherTab(GatherTab):
         )
 
     def _on_favorite_delete_press(self) -> None:
-        from bastd.ui import confirm
+        from bauiv1lib import confirm
 
         if self._favorite_selected is None:
             self._no_favorite_selected_error()
diff --git a/src/assets/ba_data/python/bastd/ui/gather/nearbytab.py b/src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/gather/nearbytab.py
rename to src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py
index c9e3f87b..146fcc7a 100644
--- a/src/assets/ba_data/python/bastd/ui/gather/nearbytab.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/nearbytab.py
@@ -7,14 +7,14 @@ from __future__ import annotations
 import weakref
 from typing import TYPE_CHECKING
 
-from bastd.ui.gather import GatherTab
+from bauiv1lib.gather import GatherTab
 import bauiv1 as bui
 import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Any
 
-    from bastd.ui.gather import GatherWindow
+    from bauiv1lib.gather import GatherWindow
 
 
 class NetScanner:
diff --git a/src/assets/ba_data/python/bastd/ui/gather/privatetab.py b/src/assets/ba_data/python/bauiv1lib/gather/privatetab.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/gather/privatetab.py
rename to src/assets/ba_data/python/bauiv1lib/gather/privatetab.py
index 227c11f2..abc0a2d8 100644
--- a/src/assets/ba_data/python/bastd/ui/gather/privatetab.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/privatetab.py
@@ -18,15 +18,15 @@ from bacommon.net import (
     PrivateHostingConfig,
     PrivatePartyConnectResult,
 )
-from bastd.ui.gather import GatherTab
-from bastd.ui.getcurrency import GetCurrencyWindow, show_get_tickets_prompt
+from bauiv1lib.gather import GatherTab
+from bauiv1lib.getcurrency import GetCurrencyWindow, show_get_tickets_prompt
 import bascenev1 as bs
 import bauiv1 as bui
 
 if TYPE_CHECKING:
     from typing import Any
 
-    from bastd.ui.gather import GatherWindow
+    from bauiv1lib.gather import GatherWindow
 
 
 # Print a bit of info about queries, etc.
@@ -167,7 +167,7 @@ class PrivateGatherTab(GatherTab):
     def _build_hosting_config(self) -> PrivateHostingConfig:
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
-        from bastd.ui.playlist import PlaylistTypeVars
+        from bauiv1lib.playlist import PlaylistTypeVars
         from bascenev1.internal import filter_playlist
 
         hcfg = PrivateHostingConfig()
diff --git a/src/assets/ba_data/python/bastd/ui/gather/publictab.py b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/gather/publictab.py
rename to src/assets/ba_data/python/bauiv1lib/gather/publictab.py
index 89eee6b5..e0072279 100644
--- a/src/assets/ba_data/python/bastd/ui/gather/publictab.py
+++ b/src/assets/ba_data/python/bauiv1lib/gather/publictab.py
@@ -13,14 +13,14 @@ from enum import Enum
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, cast
 
-from bastd.ui.gather import GatherTab
+from bauiv1lib.gather import GatherTab
 import bauiv1 as bui
 import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Callable, Any
 
-    from bastd.ui.gather import GatherWindow
+    from bauiv1lib.gather import GatherWindow
 
 # Print a bit of info about pings, queries, etc.
 DEBUG_SERVER_COMMUNICATION = False
@@ -1332,7 +1332,7 @@ class PublicGatherTab(GatherTab):
         )
 
     def _on_start_advertizing_press(self) -> None:
-        from bastd.ui.account import show_sign_in_prompt
+        from bauiv1lib.account import show_sign_in_prompt
 
         plus = bui.app.plus
         assert plus is not None
@@ -1399,7 +1399,7 @@ class PublicGatherTab(GatherTab):
         """Called when a party is clicked or otherwise activated."""
         self.save_state()
         if party.queue is not None:
-            from bastd.ui.partyqueue import PartyQueueWindow
+            from bauiv1lib.partyqueue import PartyQueueWindow
 
             bui.getsound('swish').play()
             PartyQueueWindow(party.queue, party.address, party.port)
diff --git a/src/assets/ba_data/python/bastd/ui/getcurrency.py b/src/assets/ba_data/python/bauiv1lib/getcurrency.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/getcurrency.py
rename to src/assets/ba_data/python/bauiv1lib/getcurrency.py
index 54b13434..40c18b0f 100644
--- a/src/assets/ba_data/python/bastd/ui/getcurrency.py
+++ b/src/assets/ba_data/python/bauiv1lib/getcurrency.py
@@ -639,8 +639,8 @@ class GetCurrencyWindow(bui.Window):
         bui.getsound('error').play()
 
     def _purchase(self, item: str) -> None:
-        from bastd.ui import account
-        from bastd.ui import appinvite
+        from bauiv1lib import account
+        from bauiv1lib import appinvite
 
         plus = bui.app.plus
         assert plus is not None
@@ -730,7 +730,7 @@ class GetCurrencyWindow(bui.Window):
             plus.purchase(item)
 
     def _back(self) -> None:
-        from bastd.ui.store import browser
+        from bauiv1lib.store import browser
 
         if self._transitioning_out:
             return
@@ -755,7 +755,7 @@ def show_get_tickets_prompt() -> None:
     Note that the purchase option may not always be available
     depending on the build of the game.
     """
-    from bastd.ui.confirm import ConfirmWindow
+    from bauiv1lib.confirm import ConfirmWindow
 
     assert bui.app.classic is not None
     if bui.app.classic.allow_ticket_purchases:
diff --git a/src/assets/ba_data/python/bastd/ui/getremote.py b/src/assets/ba_data/python/bauiv1lib/getremote.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/getremote.py
rename to src/assets/ba_data/python/bauiv1lib/getremote.py
index d1821b93..55cde251 100644
--- a/src/assets/ba_data/python/bastd/ui/getremote.py
+++ b/src/assets/ba_data/python/bauiv1lib/getremote.py
@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 
diff --git a/src/assets/ba_data/python/bastd/ui/helpui.py b/src/assets/ba_data/python/bauiv1lib/helpui.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/helpui.py
rename to src/assets/ba_data/python/bauiv1lib/helpui.py
index 3725795c..75ebe3f2 100644
--- a/src/assets/ba_data/python/bastd/ui/helpui.py
+++ b/src/assets/ba_data/python/bauiv1lib/helpui.py
@@ -699,7 +699,7 @@ class HelpWindow(bui.Window):
 
     def _close(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         bui.containerwidget(
             edit=self._root_widget, transition=self._transition_out
diff --git a/src/assets/ba_data/python/bastd/ui/iconpicker.py b/src/assets/ba_data/python/bauiv1lib/iconpicker.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/iconpicker.py
rename to src/assets/ba_data/python/bauiv1lib/iconpicker.py
index c33ea689..7caf04be 100644
--- a/src/assets/ba_data/python/bastd/ui/iconpicker.py
+++ b/src/assets/ba_data/python/bauiv1lib/iconpicker.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 import math
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -160,8 +160,8 @@ class IconPicker(PopupWindow):
         bui.widget(edit=btn, show_buffer_top=30, show_buffer_bottom=30)
 
     def _on_store_press(self) -> None:
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.store.browser import StoreBrowserWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.store.browser import StoreBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/coop/__init__.py b/src/assets/ba_data/python/bauiv1lib/keyboard/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/coop/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/keyboard/__init__.py
diff --git a/src/assets/ba_data/python/bastd/keyboard/englishkeyboard.py b/src/assets/ba_data/python/bauiv1lib/keyboard/englishkeyboard.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/keyboard/englishkeyboard.py
rename to src/assets/ba_data/python/bauiv1lib/keyboard/englishkeyboard.py
diff --git a/src/assets/ba_data/python/bastd/ui/kiosk.py b/src/assets/ba_data/python/bauiv1lib/kiosk.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/kiosk.py
rename to src/assets/ba_data/python/bauiv1lib/kiosk.py
index ccaf388c..2ef77bac 100644
--- a/src/assets/ba_data/python/bastd/ui/kiosk.py
+++ b/src/assets/ba_data/python/bauiv1lib/kiosk.py
@@ -13,7 +13,7 @@ class KioskWindow(bui.Window):
 
     def __init__(self, transition: str = 'in_right'):
         # pylint: disable=too-many-locals, too-many-statements
-        from bastd.ui.confirm import QuitWindow
+        from bauiv1lib.confirm import QuitWindow
 
         assert bui.app.classic is not None
 
@@ -499,7 +499,7 @@ class KioskWindow(bui.Window):
             bui.containerwidget(edit=self._root_widget, transition='out_left')
 
     def _do_full_menu(self) -> None:
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         assert bui.app.classic is not None
 
diff --git a/src/assets/ba_data/python/bastd/ui/league/__init__.py b/src/assets/ba_data/python/bauiv1lib/league/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/league/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/league/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/league/rankbutton.py b/src/assets/ba_data/python/bauiv1lib/league/rankbutton.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/league/rankbutton.py
rename to src/assets/ba_data/python/bauiv1lib/league/rankbutton.py
index 9f31ad00..58fd4731 100644
--- a/src/assets/ba_data/python/bastd/ui/league/rankbutton.py
+++ b/src/assets/ba_data/python/bauiv1lib/league/rankbutton.py
@@ -392,7 +392,7 @@ class LeagueRankButton:
 
     def _default_on_activate_call(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.league.rankwindow import LeagueRankWindow
+        from bauiv1lib.league.rankwindow import LeagueRankWindow
 
         LeagueRankWindow(modal=True, origin_widget=self._button)
 
diff --git a/src/assets/ba_data/python/bastd/ui/league/rankwindow.py b/src/assets/ba_data/python/bauiv1lib/league/rankwindow.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/league/rankwindow.py
rename to src/assets/ba_data/python/bauiv1lib/league/rankwindow.py
index 53c6ceb8..4314bf7c 100644
--- a/src/assets/ba_data/python/bastd/ui/league/rankwindow.py
+++ b/src/assets/ba_data/python/bauiv1lib/league/rankwindow.py
@@ -9,7 +9,7 @@ import copy
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupMenu
+from bauiv1lib.popup import PopupMenu
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -183,7 +183,7 @@ class LeagueRankWindow(bui.Window):
         self._update(show=info is None)
 
     def _on_achievements_press(self) -> None:
-        from bastd.ui import achievements
+        from bauiv1lib import achievements
 
         # only allow this for all-time or the current season
         # (we currently don't keep specific achievement data for old seasons)
@@ -204,7 +204,7 @@ class LeagueRankWindow(bui.Window):
             bui.getsound('error').play()
 
     def _on_activity_mult_press(self) -> None:
-        from bastd.ui import confirm
+        from bauiv1lib import confirm
 
         plus = bui.app.plus
         assert plus is not None
@@ -231,7 +231,7 @@ class LeagueRankWindow(bui.Window):
         )
 
     def _on_pro_mult_press(self) -> None:
-        from bastd.ui import confirm
+        from bauiv1lib import confirm
 
         plus = bui.app.plus
         assert plus is not None
@@ -265,7 +265,7 @@ class LeagueRankWindow(bui.Window):
         )
 
     def _on_trophies_press(self) -> None:
-        from bastd.ui.trophies import TrophiesWindow
+        from bauiv1lib.trophies import TrophiesWindow
 
         info = self._league_rank_data
         if info is not None:
@@ -1124,7 +1124,7 @@ class LeagueRankWindow(bui.Window):
     def _show_account_info(
         self, account_id: str, textwidget: bui.Widget
     ) -> None:
-        from bastd.ui.account import viewer
+        from bauiv1lib.account import viewer
 
         bui.getsound('swish').play()
         viewer.AccountViewerWindow(
@@ -1140,7 +1140,7 @@ class LeagueRankWindow(bui.Window):
         pass
 
     def _back(self) -> None:
-        from bastd.ui.coop.browser import CoopBrowserWindow
+        from bauiv1lib.coop.browser import CoopBrowserWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/mainmenu.py b/src/assets/ba_data/python/bauiv1lib/mainmenu.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/ui/mainmenu.py
rename to src/assets/ba_data/python/bauiv1lib/mainmenu.py
index c3e74df1..61cc94d3 100644
--- a/src/assets/ba_data/python/bastd/ui/mainmenu.py
+++ b/src/assets/ba_data/python/bauiv1lib/mainmenu.py
@@ -21,7 +21,7 @@ class MainMenuWindow(bui.Window):
     def __init__(self, transition: str | None = 'in_right'):
         # pylint: disable=cyclic-import
         import threading
-        from bastd.mainmenu import MainMenuSession
+        from bascenev1lib.mainmenu import MainMenuSession
 
         plus = bui.app.plus
         assert plus is not None
@@ -94,18 +94,18 @@ class MainMenuWindow(bui.Window):
     @staticmethod
     def _preload_modules() -> None:
         """Preload modules we use (called in bg thread)."""
-        import bastd.ui.getremote as _unused
-        import bastd.ui.confirm as _unused2
-        import bastd.ui.store.button as _unused3
-        import bastd.ui.kiosk as _unused4
-        import bastd.ui.account.settings as _unused5
-        import bastd.ui.store.browser as _unused6
-        import bastd.ui.creditslist as _unused7
-        import bastd.ui.helpui as _unused8
-        import bastd.ui.settings.allsettings as _unused9
-        import bastd.ui.gather as _unused10
-        import bastd.ui.watch as _unused11
-        import bastd.ui.play as _unused12
+        import bauiv1lib.getremote as _unused
+        import bauiv1lib.confirm as _unused2
+        import bauiv1lib.store.button as _unused3
+        import bauiv1lib.kiosk as _unused4
+        import bauiv1lib.account.settings as _unused5
+        import bauiv1lib.store.browser as _unused6
+        import bauiv1lib.creditslist as _unused7
+        import bauiv1lib.helpui as _unused8
+        import bauiv1lib.settings.allsettings as _unused9
+        import bauiv1lib.gather as _unused10
+        import bauiv1lib.watch as _unused11
+        import bauiv1lib.play as _unused12
 
     def _show_remote_app_info_on_first_launch(self) -> None:
         app = bui.app
@@ -124,7 +124,7 @@ class MainMenuWindow(bui.Window):
 
                     def _check_show_bs_remote_window() -> None:
                         try:
-                            from bastd.ui.getremote import GetBSRemoteWindow
+                            from bauiv1lib.getremote import GetBSRemoteWindow
 
                             bui.getsound('swish').play()
                             GetBSRemoteWindow()
@@ -191,8 +191,8 @@ class MainMenuWindow(bui.Window):
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
-        from bastd.ui.confirm import QuitWindow
-        from bastd.ui.store.button import StoreButton
+        from bauiv1lib.confirm import QuitWindow
+        from bauiv1lib.store.button import StoreButton
 
         plus = bui.app.plus
         assert plus is not None
@@ -1042,13 +1042,13 @@ class MainMenuWindow(bui.Window):
 
     def _quit(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import QuitWindow
+        from bauiv1lib.confirm import QuitWindow
 
         QuitWindow(origin_widget=self._quit_button)
 
     def _demo_menu_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.kiosk import KioskWindow
+        from bauiv1lib.kiosk import KioskWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_right')
@@ -1059,7 +1059,7 @@ class MainMenuWindow(bui.Window):
 
     def _show_account_window(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account.settings import AccountSettingsWindow
+        from bauiv1lib.account.settings import AccountSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1072,8 +1072,8 @@ class MainMenuWindow(bui.Window):
 
     def _on_store_pressed(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.store.browser import StoreBrowserWindow
-        from bastd.ui.account import show_sign_in_prompt
+        from bauiv1lib.store.browser import StoreBrowserWindow
+        from bauiv1lib.account import show_sign_in_prompt
 
         plus = bui.app.plus
         assert plus is not None
@@ -1099,7 +1099,7 @@ class MainMenuWindow(bui.Window):
 
     def _confirm_end_game(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         # FIXME: Currently we crash calling this on client-sessions.
 
@@ -1113,7 +1113,7 @@ class MainMenuWindow(bui.Window):
 
     def _confirm_end_test(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         # Select cancel by default; this occasionally gets called by accident
         # in a fit of button mashing and this will help reduce damage.
@@ -1125,7 +1125,7 @@ class MainMenuWindow(bui.Window):
 
     def _confirm_end_replay(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         # Select cancel by default; this occasionally gets called by accident
         # in a fit of button mashing and this will help reduce damage.
@@ -1137,7 +1137,7 @@ class MainMenuWindow(bui.Window):
 
     def _confirm_leave_party(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         # Select cancel by default; this occasionally gets called by accident
         # in a fit of button mashing and this will help reduce damage.
@@ -1167,7 +1167,7 @@ class MainMenuWindow(bui.Window):
 
     def _credits(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.creditslist import CreditsListWindow
+        from bauiv1lib.creditslist import CreditsListWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1180,7 +1180,7 @@ class MainMenuWindow(bui.Window):
 
     def _howtoplay(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.helpui import HelpWindow
+        from bauiv1lib.helpui import HelpWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1193,7 +1193,7 @@ class MainMenuWindow(bui.Window):
 
     def _settings(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.allsettings import AllSettingsWindow
+        from bauiv1lib.settings.allsettings import AllSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1282,7 +1282,7 @@ class MainMenuWindow(bui.Window):
 
     def _gather_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.gather import GatherWindow
+        from bauiv1lib.gather import GatherWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1293,7 +1293,7 @@ class MainMenuWindow(bui.Window):
 
     def _watch_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.watch import WatchWindow
+        from bauiv1lib.watch import WatchWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -1304,7 +1304,7 @@ class MainMenuWindow(bui.Window):
 
     def _play_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.play import PlayWindow
+        from bauiv1lib.play import PlayWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
diff --git a/src/assets/ba_data/python/bastd/ui/party.py b/src/assets/ba_data/python/bauiv1lib/party.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/party.py
rename to src/assets/ba_data/python/bauiv1lib/party.py
index cb65efff..e096a670 100644
--- a/src/assets/ba_data/python/bastd/ui/party.py
+++ b/src/assets/ba_data/python/bauiv1lib/party.py
@@ -8,14 +8,14 @@ import math
 import logging
 from typing import TYPE_CHECKING, cast
 
-from bastd.ui.popup import PopupMenuWindow
+from bauiv1lib.popup import PopupMenuWindow
 import bauiv1 as bui
 import bascenev1 as bs
 
 if TYPE_CHECKING:
     from typing import Sequence, Any
 
-    from bastd.ui.popup import PopupWindow
+    from bauiv1lib.popup import PopupWindow
 
 
 class PartyWindow(bui.Window):
diff --git a/src/assets/ba_data/python/bastd/ui/partyqueue.py b/src/assets/ba_data/python/bauiv1lib/partyqueue.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/partyqueue.py
rename to src/assets/ba_data/python/bauiv1lib/partyqueue.py
index 9854a165..ac89d80f 100644
--- a/src/assets/ba_data/python/bastd/ui/partyqueue.py
+++ b/src/assets/ba_data/python/bauiv1lib/partyqueue.py
@@ -357,7 +357,7 @@ class PartyQueueWindow(bui.Window):
         self, account_id: str | None, origin_widget: bui.Widget
     ) -> None:
         """A dude was clicked so we should show his account info."""
-        from bastd.ui.account import viewer
+        from bauiv1lib.account import viewer
 
         if account_id is None:
             bui.getsound('error').play()
@@ -566,8 +566,8 @@ class PartyQueueWindow(bui.Window):
 
     def on_boost_press(self) -> None:
         """Boost was pressed."""
-        from bastd.ui import account
-        from bastd.ui import getcurrency
+        from bauiv1lib import account
+        from bauiv1lib import getcurrency
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/play.py b/src/assets/ba_data/python/bauiv1lib/play.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/play.py
rename to src/assets/ba_data/python/bauiv1lib/play.py
index 7729e1d9..0a8043b6 100644
--- a/src/assets/ba_data/python/bastd/ui/play.py
+++ b/src/assets/ba_data/python/bauiv1lib/play.py
@@ -516,15 +516,15 @@ class PlayWindow(bui.Window):
     @staticmethod
     def _preload_modules() -> None:
         """Preload modules we use (called in bg thread)."""
-        import bastd.ui.mainmenu as _unused1
-        import bastd.ui.account as _unused2
-        import bastd.ui.coop.browser as _unused3
-        import bastd.ui.playlist.browser as _unused4
+        import bauiv1lib.mainmenu as _unused1
+        import bauiv1lib.account as _unused2
+        import bauiv1lib.coop.browser as _unused3
+        import bauiv1lib.playlist.browser as _unused4
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
         if self._is_main_menu:
-            from bastd.ui.mainmenu import MainMenuWindow
+            from bauiv1lib.mainmenu import MainMenuWindow
 
             self._save_state()
             assert bui.app.classic is not None
@@ -535,7 +535,7 @@ class PlayWindow(bui.Window):
                 edit=self._root_widget, transition=self._transition_out
             )
         else:
-            from bastd.ui.gather import GatherWindow
+            from bauiv1lib.gather import GatherWindow
 
             self._save_state()
             assert bui.app.classic is not None
@@ -548,8 +548,8 @@ class PlayWindow(bui.Window):
 
     def _coop(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.coop.browser import CoopBrowserWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.coop.browser import CoopBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -566,7 +566,7 @@ class PlayWindow(bui.Window):
 
     def _team_tourney(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist.browser import PlaylistBrowserWindow
+        from bauiv1lib.playlist.browser import PlaylistBrowserWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -579,7 +579,7 @@ class PlayWindow(bui.Window):
 
     def _free_for_all(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist.browser import PlaylistBrowserWindow
+        from bauiv1lib.playlist.browser import PlaylistBrowserWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/__init__.py b/src/assets/ba_data/python/bauiv1lib/playlist/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/playlist/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/addgame.py b/src/assets/ba_data/python/bauiv1lib/playlist/addgame.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/playlist/addgame.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/addgame.py
index a984d4a7..1843a2a0 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/addgame.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/addgame.py
@@ -10,7 +10,7 @@ import bascenev1 as bs
 import bauiv1 as bui
 
 if TYPE_CHECKING:
-    from bastd.ui.playlist.editcontroller import PlaylistEditController
+    from bauiv1lib.playlist.editcontroller import PlaylistEditController
 
 
 class PlaylistAddGameWindow(bui.Window):
@@ -231,8 +231,8 @@ class PlaylistAddGameWindow(bui.Window):
             )
 
     def _on_get_more_games_press(self) -> None:
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.store.browser import StoreBrowserWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.store.browser import StoreBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/browser.py b/src/assets/ba_data/python/bauiv1lib/playlist/browser.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/playlist/browser.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/browser.py
index 5b575234..0a82b5b2 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/browser.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/browser.py
@@ -23,7 +23,7 @@ class PlaylistBrowserWindow(bui.Window):
     ):
         # pylint: disable=too-many-statements
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist import PlaylistTypeVars
+        from bauiv1lib.playlist import PlaylistTypeVars
 
         # If they provided an origin-widget, scale up from that.
         scale_origin: tuple[float, float] | None
@@ -663,7 +663,7 @@ class PlaylistBrowserWindow(bui.Window):
         self, button: bui.Widget, playlist_name: str
     ) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playoptions import PlayOptionsWindow
+        from bauiv1lib.playoptions import PlayOptionsWindow
 
         # Make sure the target playlist still exists.
         exists = (
@@ -683,7 +683,7 @@ class PlaylistBrowserWindow(bui.Window):
 
     def _on_customize_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist.customizebrowser import (
+        from bauiv1lib.playlist.customizebrowser import (
             PlaylistCustomizeBrowserWindow,
         )
 
@@ -699,7 +699,7 @@ class PlaylistBrowserWindow(bui.Window):
 
     def _on_back_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.play import PlayWindow
+        from bauiv1lib.play import PlayWindow
 
         # Store our selected playlist if that's changed.
         if self._selected_playlist is not None:
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/customizebrowser.py b/src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/playlist/customizebrowser.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py
index 3c8135a0..fe9beb16 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/customizebrowser.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/customizebrowser.py
@@ -30,7 +30,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
         # pylint: disable=cyclic-import
-        from bastd.ui import playlist
+        from bauiv1lib import playlist
 
         scale_origin: tuple[float, float] | None
         if origin_widget is not None:
@@ -321,7 +321,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist import browser
+        from bauiv1lib.playlist import browser
 
         if self._selected_playlist_name is not None:
             cfg = bui.app.config
@@ -350,7 +350,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
         try:
             bs.new_host_session(self._sessiontype)
         except Exception:
-            from bastd import mainmenu
+            from bascenev1lib import mainmenu
 
             logging.exception('Error running session %s.', self._sessiontype)
 
@@ -463,8 +463,8 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _new_playlist(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist.editcontroller import PlaylistEditController
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.playlist.editcontroller import PlaylistEditController
+        from bauiv1lib.purchase import PurchaseWindow
 
         assert bui.app.classic is not None
         if not bui.app.classic.accounts.have_pro_options():
@@ -494,8 +494,8 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _edit_playlist(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist.editcontroller import PlaylistEditController
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.playlist.editcontroller import PlaylistEditController
+        from bauiv1lib.purchase import PurchaseWindow
 
         assert bui.app.classic is not None
         if not bui.app.classic.accounts.have_pro_options():
@@ -541,7 +541,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _import_playlist(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist import share
+        from bauiv1lib.playlist import share
 
         plus = bui.app.plus
         assert plus is not None
@@ -564,7 +564,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _on_share_playlist_response(self, name: str, response: Any) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist import share
+        from bauiv1lib.playlist import share
 
         if response is None:
             bui.screenmessage(
@@ -577,7 +577,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _share_playlist(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -621,8 +621,8 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
 
     def _delete_playlist(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.purchase import PurchaseWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         assert bui.app.classic is not None
         if not bui.app.classic.accounts.have_pro_options():
@@ -659,7 +659,7 @@ class PlaylistCustomizeBrowserWindow(bui.Window):
     def _duplicate_playlist(self) -> None:
         # pylint: disable=too-many-branches
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/edit.py b/src/assets/ba_data/python/bauiv1lib/playlist/edit.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/playlist/edit.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/edit.py
index 6d6e887f..a8b3c715 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/edit.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/edit.py
@@ -11,7 +11,7 @@ import bascenev1 as bs
 import bauiv1 as bui
 
 if TYPE_CHECKING:
-    from bastd.ui.playlist.editcontroller import PlaylistEditController
+    from bauiv1lib.playlist.editcontroller import PlaylistEditController
 
 
 class PlaylistEditWindow(bui.Window):
@@ -279,7 +279,7 @@ class PlaylistEditWindow(bui.Window):
         self._editcontroller.set_edit_ui_selection(selection)
 
     def _cancel(self) -> None:
-        from bastd.ui.playlist.customizebrowser import (
+        from bauiv1lib.playlist.customizebrowser import (
             PlaylistCustomizeBrowserWindow,
         )
 
@@ -311,7 +311,7 @@ class PlaylistEditWindow(bui.Window):
         self._editcontroller.edit_game_pressed()
 
     def _save_press(self) -> None:
-        from bastd.ui.playlist.customizebrowser import (
+        from bauiv1lib.playlist.customizebrowser import (
             PlaylistCustomizeBrowserWindow,
         )
 
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/editcontroller.py b/src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py
similarity index 95%
rename from src/assets/ba_data/python/bastd/ui/playlist/editcontroller.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py
index f4a3e98a..b653c50c 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/editcontroller.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/editcontroller.py
@@ -27,8 +27,8 @@ class PlaylistEditController:
     ):
         from bascenev1.internal import filter_playlist
         from bascenev1.internal import preload_map_preview_media
-        from bastd.ui.playlist import PlaylistTypeVars
-        from bastd.ui.playlist.edit import PlaylistEditWindow
+        from bauiv1lib.playlist import PlaylistTypeVars
+        from bauiv1lib.playlist.edit import PlaylistEditWindow
 
         appconfig = bui.app.config
 
@@ -144,7 +144,7 @@ class PlaylistEditController:
 
     def add_game_pressed(self) -> None:
         """(internal)"""
-        from bastd.ui.playlist.addgame import PlaylistAddGameWindow
+        from bauiv1lib.playlist.addgame import PlaylistAddGameWindow
 
         assert bui.app.classic is not None
         bui.app.classic.ui.clear_main_menu_window(transition='out_left')
@@ -167,7 +167,7 @@ class PlaylistEditController:
 
     def add_game_cancelled(self) -> None:
         """(internal)"""
-        from bastd.ui.playlist.edit import PlaylistEditWindow
+        from bauiv1lib.playlist.edit import PlaylistEditWindow
 
         assert bui.app.classic is not None
         bui.app.classic.ui.clear_main_menu_window(transition='out_right')
@@ -192,8 +192,8 @@ class PlaylistEditController:
         self._show_edit_ui(gametype=gametype, settings=None)
 
     def _edit_game_done(self, config: dict[str, Any] | None) -> None:
-        from bastd.ui.playlist.edit import PlaylistEditWindow
-        from bastd.ui.playlist.addgame import PlaylistAddGameWindow
+        from bauiv1lib.playlist.edit import PlaylistEditWindow
+        from bauiv1lib.playlist.addgame import PlaylistAddGameWindow
 
         assert bui.app.classic is not None
         if config is None:
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/editgame.py b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/playlist/editgame.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/editgame.py
index 2389d025..fabab810 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/editgame.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/editgame.py
@@ -512,7 +512,7 @@ class PlaylistEditGameWindow(bui.Window):
 
     def _select_map(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.playlist.mapselect import PlaylistMapSelectWindow
+        from bauiv1lib.playlist.mapselect import PlaylistMapSelectWindow
 
         # Replace ourself with the map-select UI.
         bui.containerwidget(edit=self._root_widget, transition='out_left')
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/mapselect.py b/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/playlist/mapselect.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py
index 73140811..0291c50b 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/mapselect.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py
@@ -251,8 +251,8 @@ class PlaylistMapSelectWindow(bui.Window):
             )
 
     def _on_store_press(self) -> None:
-        from bastd.ui import account
-        from bastd.ui.store.browser import StoreBrowserWindow
+        from bauiv1lib import account
+        from bauiv1lib.store.browser import StoreBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -271,7 +271,7 @@ class PlaylistMapSelectWindow(bui.Window):
         self._refresh(select_get_more_maps_button=True)
 
     def _select(self, map_name: str) -> None:
-        from bastd.ui.playlist.editgame import PlaylistEditGameWindow
+        from bauiv1lib.playlist.editgame import PlaylistEditGameWindow
 
         self._config['settings']['map'] = map_name
         bui.containerwidget(edit=self._root_widget, transition='out_right')
@@ -294,7 +294,7 @@ class PlaylistMapSelectWindow(bui.Window):
         bui.apptimer(0.1, bui.WeakCall(self._select, map_name))
 
     def _cancel(self) -> None:
-        from bastd.ui.playlist.editgame import PlaylistEditGameWindow
+        from bauiv1lib.playlist.editgame import PlaylistEditGameWindow
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         assert bui.app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/playlist/share.py b/src/assets/ba_data/python/bauiv1lib/playlist/share.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/playlist/share.py
rename to src/assets/ba_data/python/bauiv1lib/playlist/share.py
index 5feace43..d50d9775 100644
--- a/src/assets/ba_data/python/bastd/ui/playlist/share.py
+++ b/src/assets/ba_data/python/bauiv1lib/playlist/share.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 import time
 from typing import TYPE_CHECKING
 
-from bastd.ui.promocode import PromoCodeWindow
+from bauiv1lib.promocode import PromoCodeWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/ui/playoptions.py b/src/assets/ba_data/python/bauiv1lib/playoptions.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/playoptions.py
rename to src/assets/ba_data/python/bauiv1lib/playoptions.py
index 51c8c8b6..e13a70fe 100644
--- a/src/assets/ba_data/python/bastd/ui/playoptions.py
+++ b/src/assets/ba_data/python/bauiv1lib/playoptions.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bascenev1 as bs
 import bauiv1 as bui
 
@@ -30,7 +30,7 @@ class PlayOptionsWindow(PopupWindow):
         # pylint: disable=too-many-statements
         # pylint: disable=too-many-locals
         from bascenev1.internal import filter_playlist, get_map_class
-        from bastd.ui.playlist import PlaylistTypeVars
+        from bauiv1lib.playlist import PlaylistTypeVars
 
         self._r = 'gameListWindow'
         self._delegate = delegate
@@ -401,9 +401,9 @@ class PlayOptionsWindow(PopupWindow):
         self._update()
 
     def _custom_colors_names_press(self) -> None:
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.teamnamescolors import TeamNamesColorsWindow
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.teamnamescolors import TeamNamesColorsWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -468,7 +468,7 @@ class PlayOptionsWindow(PopupWindow):
         # Head back to the gather window in playlist-select mode
         # or start the game in regular mode.
         if self._selecting_mode:
-            from bastd.ui.gather import GatherWindow
+            from bauiv1lib.gather import GatherWindow
 
             if self._sessiontype is bs.FreeForAllSession:
                 typename = 'ffa'
@@ -499,7 +499,7 @@ class PlayOptionsWindow(PopupWindow):
         try:
             bs.new_host_session(self._sessiontype)
         except Exception:
-            from bastd import mainmenu
+            from bascenev1lib import mainmenu
 
             logging.exception('Error running session %s.', self._sessiontype)
 
diff --git a/src/assets/ba_data/python/bastd/ui/popup.py b/src/assets/ba_data/python/bauiv1lib/popup.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/popup.py
rename to src/assets/ba_data/python/bauiv1lib/popup.py
diff --git a/src/assets/ba_data/python/bastd/ui/profile/__init__.py b/src/assets/ba_data/python/bauiv1lib/profile/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/profile/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/profile/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/profile/browser.py b/src/assets/ba_data/python/bauiv1lib/profile/browser.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/profile/browser.py
rename to src/assets/ba_data/python/bauiv1lib/profile/browser.py
index 99005ce1..192369c1 100644
--- a/src/assets/ba_data/python/bastd/ui/profile/browser.py
+++ b/src/assets/ba_data/python/bauiv1lib/profile/browser.py
@@ -209,8 +209,8 @@ class ProfileBrowserWindow(bui.Window):
 
     def _new_profile(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.profile.edit import EditProfileWindow
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.profile.edit import EditProfileWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -257,7 +257,7 @@ class ProfileBrowserWindow(bui.Window):
 
     def _delete_profile(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui import confirm
+        from bauiv1lib import confirm
 
         if self._selected_profile is None:
             bui.getsound('error').play()
@@ -299,7 +299,7 @@ class ProfileBrowserWindow(bui.Window):
 
     def _edit_profile(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.profile.edit import EditProfileWindow
+        from bauiv1lib.profile.edit import EditProfileWindow
 
         if self._selected_profile is None:
             bui.getsound('error').play()
@@ -322,7 +322,7 @@ class ProfileBrowserWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account.settings import AccountSettingsWindow
+        from bauiv1lib.account.settings import AccountSettingsWindow
 
         assert bui.app.classic is not None
 
diff --git a/src/assets/ba_data/python/bastd/ui/profile/edit.py b/src/assets/ba_data/python/bauiv1lib/profile/edit.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/profile/edit.py
rename to src/assets/ba_data/python/bauiv1lib/profile/edit.py
index 9b0fbd79..ae6c9b8a 100644
--- a/src/assets/ba_data/python/bastd/ui/profile/edit.py
+++ b/src/assets/ba_data/python/bauiv1lib/profile/edit.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 import random
 from typing import cast
 
-from bastd.ui.colorpicker import ColorPicker
+from bauiv1lib.colorpicker import ColorPicker
 import bauiv1 as bui
 import bascenev1 as bs
 
@@ -500,8 +500,8 @@ class EditProfileWindow(bui.Window):
 
     def upgrade_profile(self) -> None:
         """Attempt to ugrade the profile to global."""
-        from bastd.ui import account
-        from bastd.ui.profile import upgrade as pupgrade
+        from bauiv1lib import account
+        from bauiv1lib.profile import upgrade as pupgrade
 
         plus = bui.app.plus
         assert plus is not None
@@ -514,7 +514,7 @@ class EditProfileWindow(bui.Window):
 
     def show_account_profile_info(self) -> None:
         """Show an explanation of account profiles."""
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         icons_str = ' '.join(
             [
@@ -545,7 +545,7 @@ class EditProfileWindow(bui.Window):
 
     def show_local_profile_info(self) -> None:
         """Show an explanation of local profiles."""
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         txtl = bui.Lstr(resource='editProfileWindow.localProfileInfoText')
         ConfirmWindow(
@@ -558,7 +558,7 @@ class EditProfileWindow(bui.Window):
 
     def show_global_profile_info(self) -> None:
         """Show an explanation of global profiles."""
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         txtl = bui.Lstr(resource='editProfileWindow.globalProfileInfoText')
         ConfirmWindow(
@@ -571,7 +571,7 @@ class EditProfileWindow(bui.Window):
 
     def refresh_characters(self) -> None:
         """Refresh available characters/icons."""
-        from bastd.actor import spazappearance
+        from bascenev1lib.actor import spazappearance
 
         assert bui.app.classic is not None
 
@@ -606,7 +606,7 @@ class EditProfileWindow(bui.Window):
         self._update_character()
 
     def _on_character_press(self) -> None:
-        from bastd.ui import characterpicker
+        from bauiv1lib import characterpicker
 
         characterpicker.CharacterPicker(
             parent=self._root_widget,
@@ -618,7 +618,7 @@ class EditProfileWindow(bui.Window):
         )
 
     def _on_icon_press(self) -> None:
-        from bastd.ui import iconpicker
+        from bauiv1lib import iconpicker
 
         iconpicker.IconPicker(
             parent=self._root_widget,
@@ -651,7 +651,7 @@ class EditProfileWindow(bui.Window):
         )
 
     def _cancel(self) -> None:
-        from bastd.ui.profile.browser import ProfileBrowserWindow
+        from bauiv1lib.profile.browser import ProfileBrowserWindow
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         assert bui.app.classic is not None
@@ -755,7 +755,7 @@ class EditProfileWindow(bui.Window):
 
     def save(self, transition_out: bool = True) -> bool:
         """Save has been selected."""
-        from bastd.ui.profile.browser import ProfileBrowserWindow
+        from bauiv1lib.profile.browser import ProfileBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/profile/upgrade.py b/src/assets/ba_data/python/bauiv1lib/profile/upgrade.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/profile/upgrade.py
rename to src/assets/ba_data/python/bauiv1lib/profile/upgrade.py
index 4d3b3ca5..b1fccd3c 100644
--- a/src/assets/ba_data/python/bastd/ui/profile/upgrade.py
+++ b/src/assets/ba_data/python/bauiv1lib/profile/upgrade.py
@@ -13,7 +13,7 @@ import bauiv1 as bui
 if TYPE_CHECKING:
     from typing import Any
 
-    from bastd.ui.profile.edit import EditProfileWindow
+    from bauiv1lib.profile.edit import EditProfileWindow
 
 
 class ProfileUpgradeWindow(bui.Window):
@@ -212,7 +212,7 @@ class ProfileUpgradeWindow(bui.Window):
                 )
 
     def _on_upgrade_press(self) -> None:
-        from bastd.ui import getcurrency
+        from bauiv1lib import getcurrency
 
         if self._status is None:
             plus = bui.app.plus
diff --git a/src/assets/ba_data/python/bastd/ui/promocode.py b/src/assets/ba_data/python/bauiv1lib/promocode.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/ui/promocode.py
rename to src/assets/ba_data/python/bauiv1lib/promocode.py
index 4a9f9424..5e8b73ba 100644
--- a/src/assets/ba_data/python/bastd/ui/promocode.py
+++ b/src/assets/ba_data/python/bauiv1lib/promocode.py
@@ -106,7 +106,7 @@ class PromoCodeWindow(bui.Window):
 
     def _do_back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         bui.containerwidget(
             edit=self._root_widget, transition=self._transition_out
@@ -122,7 +122,7 @@ class PromoCodeWindow(bui.Window):
 
     def _do_enter(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/purchase.py b/src/assets/ba_data/python/bauiv1lib/purchase.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/purchase.py
rename to src/assets/ba_data/python/bauiv1lib/purchase.py
index ba0819ea..cc8edafe 100644
--- a/src/assets/ba_data/python/bastd/ui/purchase.py
+++ b/src/assets/ba_data/python/bauiv1lib/purchase.py
@@ -21,7 +21,7 @@ class PurchaseWindow(bui.Window):
         transition: str = 'in_right',
         header_text: bui.Lstr | None = None,
     ):
-        from bastd.ui.store.item import instantiate_store_item_display
+        from bauiv1lib.store.item import instantiate_store_item_display
 
         plus = bui.app.plus
         assert plus is not None
@@ -164,7 +164,7 @@ class PurchaseWindow(bui.Window):
             bui.containerwidget(edit=self._root_widget, transition='out_left')
 
     def _purchase(self) -> None:
-        from bastd.ui import getcurrency
+        from bauiv1lib import getcurrency
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/qrcode.py b/src/assets/ba_data/python/bauiv1lib/qrcode.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/qrcode.py
rename to src/assets/ba_data/python/bauiv1lib/qrcode.py
index 953e0edc..91b97740 100644
--- a/src/assets/ba_data/python/bastd/ui/qrcode.py
+++ b/src/assets/ba_data/python/bauiv1lib/qrcode.py
@@ -3,7 +3,7 @@
 """Provides functionality for displaying QR codes."""
 from __future__ import annotations
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 
diff --git a/src/assets/ba_data/python/bastd/ui/radiogroup.py b/src/assets/ba_data/python/bauiv1lib/radiogroup.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/radiogroup.py
rename to src/assets/ba_data/python/bauiv1lib/radiogroup.py
diff --git a/src/assets/ba_data/python/bastd/ui/report.py b/src/assets/ba_data/python/bauiv1lib/report.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/report.py
rename to src/assets/ba_data/python/bauiv1lib/report.py
diff --git a/src/assets/ba_data/python/bastd/ui/resourcetypeinfo.py b/src/assets/ba_data/python/bauiv1lib/resourcetypeinfo.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/resourcetypeinfo.py
rename to src/assets/ba_data/python/bauiv1lib/resourcetypeinfo.py
index 45988e23..8d447390 100644
--- a/src/assets/ba_data/python/bastd/ui/resourcetypeinfo.py
+++ b/src/assets/ba_data/python/bauiv1lib/resourcetypeinfo.py
@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 
diff --git a/src/assets/ba_data/python/bastd/ui/serverdialog.py b/src/assets/ba_data/python/bauiv1lib/serverdialog.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/serverdialog.py
rename to src/assets/ba_data/python/bauiv1lib/serverdialog.py
diff --git a/src/assets/ba_data/python/bastd/ui/settings/__init__.py b/src/assets/ba_data/python/bauiv1lib/settings/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/settings/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/settings/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/settings/advanced.py b/src/assets/ba_data/python/bauiv1lib/settings/advanced.py
similarity index 96%
rename from src/assets/ba_data/python/bastd/ui/settings/advanced.py
rename to src/assets/ba_data/python/bauiv1lib/settings/advanced.py
index acce6f2a..38e58c2e 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/advanced.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/advanced.py
@@ -8,7 +8,7 @@ import os
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupMenu
+from bauiv1lib.popup import PopupMenu
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -189,14 +189,14 @@ class AdvancedSettingsWindow(bui.Window):
     def _preload_modules() -> None:
         """Preload modules we use (called in bg thread)."""
         from bauiv1 import modutils as _unused2
-        from bastd.ui import config as _unused1
-        from bastd.ui.settings import vrtesting as _unused3
-        from bastd.ui.settings import nettesting as _unused4
-        from bastd.ui import appinvite as _unused5
-        from bastd.ui import account as _unused6
-        from bastd.ui import promocode as _unused7
-        from bastd.ui import debug as _unused8
-        from bastd.ui.settings import plugins as _unused9
+        from bauiv1lib import config as _unused1
+        from bauiv1lib.settings import vrtesting as _unused3
+        from bauiv1lib.settings import nettesting as _unused4
+        from bauiv1lib import appinvite as _unused5
+        from bauiv1lib import account as _unused6
+        from bauiv1lib import promocode as _unused7
+        from bauiv1lib import debug as _unused8
+        from bauiv1lib.settings import plugins as _unused9
 
     def _update_lang_status(self) -> None:
         if self._complete_langs_list is not None:
@@ -234,7 +234,7 @@ class AdvancedSettingsWindow(bui.Window):
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
 
-        from bastd.ui.config import ConfigCheckBox
+        from bauiv1lib.config import ConfigCheckBox
         from bauiv1.modutils import show_user_scripts
 
         plus = bui.app.plus
@@ -664,7 +664,7 @@ class AdvancedSettingsWindow(bui.Window):
         plus.run_v1_account_transactions()
 
     def _on_vr_test_press(self) -> None:
-        from bastd.ui.settings.vrtesting import VRTestingWindow
+        from bauiv1lib.settings.vrtesting import VRTestingWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -676,7 +676,7 @@ class AdvancedSettingsWindow(bui.Window):
     def _on_net_test_press(self) -> None:
         plus = bui.app.plus
         assert plus is not None
-        from bastd.ui.settings.nettesting import NetTestingWindow
+        from bauiv1lib.settings.nettesting import NetTestingWindow
 
         # Net-testing requires a signed in v1 account.
         if plus.get_v1_account_state() != 'signed_in':
@@ -694,8 +694,8 @@ class AdvancedSettingsWindow(bui.Window):
         )
 
     def _on_friend_promo_code_press(self) -> None:
-        from bastd.ui import appinvite
-        from bastd.ui import account
+        from bauiv1lib import appinvite
+        from bauiv1lib import account
 
         plus = bui.app.plus
         assert plus is not None
@@ -706,7 +706,7 @@ class AdvancedSettingsWindow(bui.Window):
         appinvite.handle_app_invites_press()
 
     def _on_plugins_button_press(self) -> None:
-        from bastd.ui.settings.plugins import PluginWindow
+        from bauiv1lib.settings.plugins import PluginWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -716,8 +716,8 @@ class AdvancedSettingsWindow(bui.Window):
         )
 
     def _on_promo_code_press(self) -> None:
-        from bastd.ui.promocode import PromoCodeWindow
-        from bastd.ui.account import show_sign_in_prompt
+        from bauiv1lib.promocode import PromoCodeWindow
+        from bauiv1lib.account import show_sign_in_prompt
 
         plus = bui.app.plus
         assert plus is not None
@@ -736,7 +736,7 @@ class AdvancedSettingsWindow(bui.Window):
         )
 
     def _on_benchmark_press(self) -> None:
-        from bastd.ui.debug import DebugWindow
+        from bauiv1lib.debug import DebugWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -888,7 +888,7 @@ class AdvancedSettingsWindow(bui.Window):
         bui.apptimer(0.001, bui.WeakCall(self._update_lang_status))
 
     def _do_back(self) -> None:
-        from bastd.ui.settings.allsettings import AllSettingsWindow
+        from bauiv1lib.settings.allsettings import AllSettingsWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/settings/allsettings.py b/src/assets/ba_data/python/bauiv1lib/settings/allsettings.py
similarity index 95%
rename from src/assets/ba_data/python/bastd/ui/settings/allsettings.py
rename to src/assets/ba_data/python/bauiv1lib/settings/allsettings.py
index a4b5d20d..7077526c 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/allsettings.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/allsettings.py
@@ -225,15 +225,15 @@ class AllSettingsWindow(bui.Window):
     @staticmethod
     def _preload_modules() -> None:
         """Preload modules we use (called in bg thread)."""
-        import bastd.ui.mainmenu as _unused1
-        import bastd.ui.settings.controls as _unused2
-        import bastd.ui.settings.graphics as _unused3
-        import bastd.ui.settings.audio as _unused4
-        import bastd.ui.settings.advanced as _unused5
+        import bauiv1lib.mainmenu as _unused1
+        import bauiv1lib.settings.controls as _unused2
+        import bauiv1lib.settings.graphics as _unused3
+        import bauiv1lib.settings.audio as _unused4
+        import bauiv1lib.settings.advanced as _unused5
 
     def _do_back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         self._save_state()
         bui.containerwidget(
@@ -246,7 +246,7 @@ class AllSettingsWindow(bui.Window):
 
     def _do_controllers(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.controls import ControlsSettingsWindow
+        from bauiv1lib.settings.controls import ControlsSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -259,7 +259,7 @@ class AllSettingsWindow(bui.Window):
 
     def _do_graphics(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.graphics import GraphicsSettingsWindow
+        from bauiv1lib.settings.graphics import GraphicsSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -272,7 +272,7 @@ class AllSettingsWindow(bui.Window):
 
     def _do_audio(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.audio import AudioSettingsWindow
+        from bauiv1lib.settings.audio import AudioSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -285,7 +285,7 @@ class AllSettingsWindow(bui.Window):
 
     def _do_advanced(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
diff --git a/src/assets/ba_data/python/bastd/ui/settings/audio.py b/src/assets/ba_data/python/bauiv1lib/settings/audio.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/audio.py
rename to src/assets/ba_data/python/bauiv1lib/settings/audio.py
index 9a9f67de..0c3841ad 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/audio.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/audio.py
@@ -24,8 +24,8 @@ class AudioSettingsWindow(bui.Window):
         # pylint: disable=too-many-statements
         # pylint: disable=too-many-locals
         # pylint: disable=cyclic-import
-        from bastd.ui.popup import PopupMenu
-        from bastd.ui.config import ConfigNumberEdit
+        from bauiv1lib.popup import PopupMenu
+        from bauiv1lib.config import ConfigNumberEdit
 
         assert bui.app.classic is not None
         music = bui.app.classic.music
@@ -233,7 +233,7 @@ class AudioSettingsWindow(bui.Window):
 
     def _do_soundtracks(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.soundtrack import browser as stb
+        from bauiv1lib.soundtrack import browser as stb
 
         # We require disk access for soundtracks;
         # if we don't have it, request it.
@@ -259,7 +259,7 @@ class AudioSettingsWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings import allsettings
+        from bauiv1lib.settings import allsettings
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/settings/controls.py b/src/assets/ba_data/python/bauiv1lib/settings/controls.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/settings/controls.py
rename to src/assets/ba_data/python/bauiv1lib/settings/controls.py
index c45e9a03..8fecc695 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/controls.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/controls.py
@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from bastd.ui.popup import PopupMenu
+from bauiv1lib.popup import PopupMenu
 import bascenev1 as bs
 import bauiv1 as bui
 
@@ -361,7 +361,7 @@ class ControlsSettingsWindow(bui.Window):
 
     def _config_keyboard(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.keyboard import ConfigKeyboardWindow
+        from bauiv1lib.settings.keyboard import ConfigKeyboardWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -374,7 +374,7 @@ class ControlsSettingsWindow(bui.Window):
 
     def _config_keyboard2(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.keyboard import ConfigKeyboardWindow
+        from bauiv1lib.settings.keyboard import ConfigKeyboardWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -387,7 +387,7 @@ class ControlsSettingsWindow(bui.Window):
 
     def _do_mobile_devices(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.remoteapp import RemoteAppSettingsWindow
+        from bauiv1lib.settings.remoteapp import RemoteAppSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -398,7 +398,7 @@ class ControlsSettingsWindow(bui.Window):
 
     def _do_gamepads(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.gamepadselect import GamepadSelectWindow
+        from bauiv1lib.settings.gamepadselect import GamepadSelectWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -409,7 +409,7 @@ class ControlsSettingsWindow(bui.Window):
 
     def _do_touchscreen(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.touchscreen import TouchscreenSettingsWindow
+        from bauiv1lib.settings.touchscreen import TouchscreenSettingsWindow
 
         self._save_state()
         bui.containerwidget(edit=self._root_widget, transition='out_left')
@@ -460,7 +460,7 @@ class ControlsSettingsWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.allsettings import AllSettingsWindow
+        from bauiv1lib.settings.allsettings import AllSettingsWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/settings/gamepad.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/settings/gamepad.py
rename to src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
index b4c23a5b..aecd4450 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/gamepad.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
@@ -415,7 +415,7 @@ class GamepadSettingsWindow(bui.Window):
 
     def _do_advanced(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings import gamepadadvanced
+        from bauiv1lib.settings import gamepadadvanced
 
         gamepadadvanced.GamepadAdvancedSettingsWindow(self)
 
@@ -787,7 +787,7 @@ class GamepadSettingsWindow(bui.Window):
         return btn
 
     def _cancel(self) -> None:
-        from bastd.ui.settings.controls import ControlsSettingsWindow
+        from bauiv1lib.settings.controls import ControlsSettingsWindow
 
         bui.containerwidget(
             edit=self._root_widget, transition=self._transition_out
@@ -842,7 +842,7 @@ class GamepadSettingsWindow(bui.Window):
             bui.getsound('error').play()
 
         if self._is_main_menu:
-            from bastd.ui.settings.controls import ControlsSettingsWindow
+            from bauiv1lib.settings.controls import ControlsSettingsWindow
 
             assert bui.app.classic is not None
             bui.app.classic.ui.set_main_menu_window(
diff --git a/src/assets/ba_data/python/bastd/ui/settings/gamepadadvanced.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/settings/gamepadadvanced.py
rename to src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py
index 7042fa2c..14412046 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/gamepadadvanced.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py
@@ -10,7 +10,7 @@ import bauiv1 as bui
 
 if TYPE_CHECKING:
     from typing import Any
-    from bastd.ui.settings.gamepad import (
+    from bauiv1lib.settings.gamepad import (
         GamepadSettingsWindow,
         AwaitGamepadInputWindow,
     )
@@ -427,7 +427,7 @@ class GamepadAdvancedSettingsWindow(bui.Window):
         # other buttons
 
         def doit() -> None:
-            from bastd.ui.settings.gamepad import AwaitGamepadInputWindow
+            from bauiv1lib.settings.gamepad import AwaitGamepadInputWindow
 
             txt = bui.textwidget(
                 parent=self._subcontainer,
diff --git a/src/assets/ba_data/python/bastd/ui/settings/gamepadselect.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepadselect.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/settings/gamepadselect.py
rename to src/assets/ba_data/python/bauiv1lib/settings/gamepadselect.py
index c1afe8f8..817314ed 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/gamepadselect.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepadselect.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 
 def gamepad_configure_callback(event: dict[str, Any]) -> None:
     """Respond to a gamepad button press during config selection."""
-    from bastd.ui.settings import gamepad
+    from bauiv1lib.settings import gamepad
 
     # Ignore all but button-presses.
     if event['type'] not in ['BUTTONDOWN', 'HATMOTION']:
@@ -74,7 +74,7 @@ def gamepad_configure_callback(event: dict[str, Any]) -> None:
         )
 
         def _ok() -> None:
-            from bastd.ui.settings import controls
+            from bauiv1lib.settings import controls
 
             bui.containerwidget(edit=dlg, transition='out_right')
             assert bui.app.classic is not None
@@ -184,7 +184,7 @@ class GamepadSelectWindow(bui.Window):
         bs.capture_gamepad_input(gamepad_configure_callback)
 
     def _back(self) -> None:
-        from bastd.ui.settings import controls
+        from bauiv1lib.settings import controls
 
         bs.release_gamepad_input()
         bui.containerwidget(edit=self._root_widget, transition='out_right')
diff --git a/src/assets/ba_data/python/bastd/ui/settings/graphics.py b/src/assets/ba_data/python/bauiv1lib/settings/graphics.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/settings/graphics.py
rename to src/assets/ba_data/python/bauiv1lib/settings/graphics.py
index e58f647d..8971a2f7 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/graphics.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/graphics.py
@@ -6,8 +6,8 @@ from __future__ import annotations
 
 import logging
 
-from bastd.ui.popup import PopupMenu
-from bastd.ui.config import ConfigCheckBox, ConfigNumberEdit
+from bauiv1lib.popup import PopupMenu
+from bauiv1lib.config import ConfigCheckBox, ConfigNumberEdit
 import bauiv1 as bui
 
 
@@ -427,7 +427,7 @@ class GraphicsSettingsWindow(bui.Window):
         )
 
     def _back(self) -> None:
-        from bastd.ui.settings import allsettings
+        from bauiv1lib.settings import allsettings
 
         bui.containerwidget(
             edit=self._root_widget, transition=self._transition_out
diff --git a/src/assets/ba_data/python/bastd/ui/settings/keyboard.py b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/keyboard.py
rename to src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
index 730a53ae..e81bac87 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/keyboard.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
@@ -263,7 +263,7 @@ class ConfigKeyboardWindow(bui.Window):
         bui.pushcall(doit)
 
     def _cancel(self) -> None:
-        from bastd.ui.settings.controls import ControlsSettingsWindow
+        from bauiv1lib.settings.controls import ControlsSettingsWindow
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         assert bui.app.classic is not None
@@ -272,7 +272,7 @@ class ConfigKeyboardWindow(bui.Window):
         )
 
     def _save(self) -> None:
-        from bastd.ui.settings.controls import ControlsSettingsWindow
+        from bauiv1lib.settings.controls import ControlsSettingsWindow
 
         assert bui.app.classic is not None
         bui.containerwidget(edit=self._root_widget, transition='out_right')
diff --git a/src/assets/ba_data/python/bastd/ui/settings/nettesting.py b/src/assets/ba_data/python/bauiv1lib/settings/nettesting.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/settings/nettesting.py
rename to src/assets/ba_data/python/bauiv1lib/settings/nettesting.py
index 2db33497..c0884706 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/nettesting.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/nettesting.py
@@ -11,7 +11,7 @@ from threading import Thread
 from typing import TYPE_CHECKING
 
 from efro.error import CleanError
-from bastd.ui.settings.testing import TestingWindow
+from bauiv1lib.settings.testing import TestingWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -142,7 +142,7 @@ class NetTestingWindow(bui.Window):
 
     def _done(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         assert bui.app.classic is not None
         bui.app.classic.ui.set_main_menu_window(
diff --git a/src/assets/ba_data/python/bastd/ui/settings/plugins.py b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/plugins.py
rename to src/assets/ba_data/python/bauiv1lib/settings/plugins.py
index 80db4a62..2c8f153b 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/plugins.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py
@@ -238,7 +238,7 @@ class PluginWindow(bui.Window):
 
     def _open_settings(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.pluginsettings import PluginSettingsWindow
+        from bauiv1lib.settings.pluginsettings import PluginSettingsWindow
 
         bui.getsound('swish').play()
 
@@ -256,7 +256,7 @@ class PluginWindow(bui.Window):
 
     def _do_back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/settings/pluginsettings.py b/src/assets/ba_data/python/bauiv1lib/settings/pluginsettings.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/pluginsettings.py
rename to src/assets/ba_data/python/bauiv1lib/settings/pluginsettings.py
index 5decd22a..b25eefbf 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/pluginsettings.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/pluginsettings.py
@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 import bauiv1 as bui
-from bastd.ui.confirm import ConfirmWindow
+from bauiv1lib.confirm import ConfirmWindow
 
 
 class PluginSettingsWindow(bui.Window):
@@ -159,7 +159,7 @@ class PluginSettingsWindow(bui.Window):
 
     def _do_back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.plugins import PluginWindow
+        from bauiv1lib.settings.plugins import PluginWindow
 
         bui.containerwidget(
             edit=self._root_widget, transition=self._transition_out
diff --git a/src/assets/ba_data/python/bastd/ui/settings/remoteapp.py b/src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/remoteapp.py
rename to src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py
index 350da5ed..60fca2b5 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/remoteapp.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/remoteapp.py
@@ -136,7 +136,7 @@ class RemoteAppSettingsWindow(bui.Window):
         cfg.apply_and_commit()
 
     def _back(self) -> None:
-        from bastd.ui.settings import controls
+        from bauiv1lib.settings import controls
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         assert bui.app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/settings/testing.py b/src/assets/ba_data/python/bauiv1lib/settings/testing.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/settings/testing.py
rename to src/assets/ba_data/python/bauiv1lib/settings/testing.py
index 3a4d861e..d3c9f45b 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/testing.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/testing.py
@@ -215,7 +215,7 @@ class TestingWindow(bui.Window):
 
     def _do_back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings.advanced import AdvancedSettingsWindow
+        from bauiv1lib.settings.advanced import AdvancedSettingsWindow
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         backwin = (
diff --git a/src/assets/ba_data/python/bastd/ui/settings/touchscreen.py b/src/assets/ba_data/python/bauiv1lib/settings/touchscreen.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/touchscreen.py
rename to src/assets/ba_data/python/bauiv1lib/settings/touchscreen.py
index 48c851f9..d5a8a3e9 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/touchscreen.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/touchscreen.py
@@ -98,8 +98,8 @@ class TouchscreenSettingsWindow(bui.Window):
         self._build_gui()
 
     def _build_gui(self) -> None:
-        from bastd.ui.config import ConfigNumberEdit, ConfigCheckBox
-        from bastd.ui.radiogroup import make_radio_group
+        from bauiv1lib.config import ConfigNumberEdit, ConfigCheckBox
+        from bauiv1lib.radiogroup import make_radio_group
 
         # Clear anything already there.
         children = self._subcontainer.get_children()
@@ -274,7 +274,7 @@ class TouchscreenSettingsWindow(bui.Window):
         bui.apptimer(0, self._build_gui)
 
     def _back(self) -> None:
-        from bastd.ui.settings import controls
+        from bauiv1lib.settings import controls
 
         bui.containerwidget(edit=self._root_widget, transition='out_right')
         assert bui.app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/settings/vrtesting.py b/src/assets/ba_data/python/bauiv1lib/settings/vrtesting.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/settings/vrtesting.py
rename to src/assets/ba_data/python/bauiv1lib/settings/vrtesting.py
index 668ccf70..d4916759 100644
--- a/src/assets/ba_data/python/bastd/ui/settings/vrtesting.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/vrtesting.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import babase
-from bastd.ui.settings.testing import TestingWindow
+from bauiv1lib.settings.testing import TestingWindow
 
 if TYPE_CHECKING:
     from typing import Any
diff --git a/src/assets/ba_data/python/bastd/ui/soundtrack/__init__.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/soundtrack/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/soundtrack/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/soundtrack/browser.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/soundtrack/browser.py
rename to src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py
index d709a5dc..7b883e8c 100644
--- a/src/assets/ba_data/python/bastd/ui/soundtrack/browser.py
+++ b/src/assets/ba_data/python/bauiv1lib/soundtrack/browser.py
@@ -292,8 +292,8 @@ class SoundtrackBrowserWindow(bui.Window):
 
     def _delete_soundtrack(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
-        from bastd.ui.confirm import ConfirmWindow
+        from bauiv1lib.purchase import PurchaseWindow
+        from bauiv1lib.confirm import ConfirmWindow
 
         if (
             bui.app.classic is not None
@@ -322,7 +322,7 @@ class SoundtrackBrowserWindow(bui.Window):
 
     def _duplicate_soundtrack(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         if (
             bui.app.classic is not None
@@ -392,7 +392,7 @@ class SoundtrackBrowserWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.settings import audio
+        from bauiv1lib.settings import audio
 
         self._save_state()
         bui.containerwidget(
@@ -405,7 +405,7 @@ class SoundtrackBrowserWindow(bui.Window):
 
     def _edit_soundtrack_with_sound(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
+        from bauiv1lib.purchase import PurchaseWindow
 
         if (
             bui.app.classic is not None
@@ -418,8 +418,8 @@ class SoundtrackBrowserWindow(bui.Window):
 
     def _edit_soundtrack(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
-        from bastd.ui.soundtrack.edit import SoundtrackEditWindow
+        from bauiv1lib.purchase import PurchaseWindow
+        from bauiv1lib.soundtrack.edit import SoundtrackEditWindow
 
         if (
             bui.app.classic is not None
@@ -531,8 +531,8 @@ class SoundtrackBrowserWindow(bui.Window):
 
     def _new_soundtrack(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.purchase import PurchaseWindow
-        from bastd.ui.soundtrack.edit import SoundtrackEditWindow
+        from bauiv1lib.purchase import PurchaseWindow
+        from bauiv1lib.soundtrack.edit import SoundtrackEditWindow
 
         if (
             bui.app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/soundtrack/edit.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/edit.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/soundtrack/edit.py
rename to src/assets/ba_data/python/bauiv1lib/soundtrack/edit.py
index 14b0f747..87215c06 100644
--- a/src/assets/ba_data/python/bastd/ui/soundtrack/edit.py
+++ b/src/assets/ba_data/python/bauiv1lib/soundtrack/edit.py
@@ -420,7 +420,7 @@ class SoundtrackEditWindow(bui.Window):
         return None
 
     def _cancel(self) -> None:
-        from bastd.ui.soundtrack import browser as stb
+        from bauiv1lib.soundtrack import browser as stb
 
         assert bui.app.classic is not None
         music = bui.app.classic.music
@@ -433,7 +433,7 @@ class SoundtrackEditWindow(bui.Window):
         )
 
     def _do_it(self) -> None:
-        from bastd.ui.soundtrack import browser as stb
+        from bauiv1lib.soundtrack import browser as stb
 
         assert bui.app.classic is not None
         music = bui.app.classic.music
diff --git a/src/assets/ba_data/python/bastd/ui/soundtrack/entrytypeselect.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py
similarity index 97%
rename from src/assets/ba_data/python/bastd/ui/soundtrack/entrytypeselect.py
rename to src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py
index e7f9d84a..2f5d3d8e 100644
--- a/src/assets/ba_data/python/bastd/ui/soundtrack/entrytypeselect.py
+++ b/src/assets/ba_data/python/bauiv1lib/soundtrack/entrytypeselect.py
@@ -162,7 +162,7 @@ class SoundtrackEntryTypeSelectWindow(bui.Window):
     def _on_mac_music_app_playlist_press(self) -> None:
         assert bui.app.classic is not None
         music = bui.app.classic.music
-        from bastd.ui.soundtrack.macmusicapp import (
+        from bauiv1lib.soundtrack.macmusicapp import (
             MacMusicAppPlaylistSelectWindow,
         )
 
@@ -187,7 +187,7 @@ class SoundtrackEntryTypeSelectWindow(bui.Window):
     def _on_music_file_press(self) -> None:
         from babase.internal import android_get_external_files_dir
         from baclassic.osmusic import OSMusicPlayer
-        from bastd.ui.fileselector import FileSelectorWindow
+        from bauiv1lib.fileselector import FileSelectorWindow
 
         bui.containerwidget(edit=self._root_widget, transition='out_left')
         base_path = android_get_external_files_dir()
@@ -205,7 +205,7 @@ class SoundtrackEntryTypeSelectWindow(bui.Window):
         )
 
     def _on_music_folder_press(self) -> None:
-        from bastd.ui.fileselector import FileSelectorWindow
+        from bauiv1lib.fileselector import FileSelectorWindow
         from babase.internal import android_get_external_files_dir
 
         bui.containerwidget(edit=self._root_widget, transition='out_left')
diff --git a/src/assets/ba_data/python/bastd/ui/soundtrack/macmusicapp.py b/src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/soundtrack/macmusicapp.py
rename to src/assets/ba_data/python/bauiv1lib/soundtrack/macmusicapp.py
diff --git a/src/assets/ba_data/python/bastd/ui/specialoffer.py b/src/assets/ba_data/python/bauiv1lib/specialoffer.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/specialoffer.py
rename to src/assets/ba_data/python/bauiv1lib/specialoffer.py
index a7fa6777..f4435992 100644
--- a/src/assets/ba_data/python/bastd/ui/specialoffer.py
+++ b/src/assets/ba_data/python/bauiv1lib/specialoffer.py
@@ -22,7 +22,7 @@ class SpecialOfferWindow(bui.Window):
         # pylint: disable=too-many-branches
         # pylint: disable=too-many-locals
         from babase import SpecialChar
-        from bastd.ui.store import item as storeitemui
+        from bauiv1lib.store import item as storeitemui
 
         plus = bui.app.plus
         assert plus is not None
@@ -435,8 +435,8 @@ class SpecialOfferWindow(bui.Window):
         bui.buttonwidget(edit=self._get_tickets_button, label=sval)
 
     def _on_get_more_tickets_press(self) -> None:
-        from bastd.ui import account
-        from bastd.ui import getcurrency
+        from bauiv1lib import account
+        from bauiv1lib import getcurrency
 
         plus = bui.app.plus
         assert plus is not None
@@ -447,8 +447,8 @@ class SpecialOfferWindow(bui.Window):
         getcurrency.GetCurrencyWindow(modal=True).get_root_widget()
 
     def _purchase(self) -> None:
-        from bastd.ui import getcurrency
-        from bastd.ui import confirm
+        from bauiv1lib import getcurrency
+        from bauiv1lib import confirm
 
         plus = bui.app.plus
         assert plus is not None
@@ -513,7 +513,7 @@ class SpecialOfferWindow(bui.Window):
 def show_offer() -> bool:
     """(internal)"""
     try:
-        from bastd.ui import feedback
+        from bauiv1lib import feedback
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/store/__init__.py b/src/assets/ba_data/python/bauiv1lib/store/__init__.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/store/__init__.py
rename to src/assets/ba_data/python/bauiv1lib/store/__init__.py
diff --git a/src/assets/ba_data/python/bastd/ui/store/browser.py b/src/assets/ba_data/python/bauiv1lib/store/browser.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/store/browser.py
rename to src/assets/ba_data/python/bauiv1lib/store/browser.py
index 79688298..e2e1415c 100644
--- a/src/assets/ba_data/python/bastd/ui/store/browser.py
+++ b/src/assets/ba_data/python/bauiv1lib/store/browser.py
@@ -47,7 +47,7 @@ class StoreBrowserWindow(bui.Window):
     ):
         # pylint: disable=too-many-statements
         # pylint: disable=too-many-locals
-        from bastd.ui.tabs import TabRow
+        from bauiv1lib.tabs import TabRow
         from bauiv1 import SpecialChar
 
         app = bui.app
@@ -347,7 +347,7 @@ class StoreBrowserWindow(bui.Window):
             bui.textwidget(edit=self._ticket_count_text, position=pos)
 
     def _restore_purchases(self) -> None:
-        from bastd.ui import account
+        from bauiv1lib import account
 
         plus = bui.app.plus
         assert plus is not None
@@ -576,9 +576,9 @@ class StoreBrowserWindow(bui.Window):
 
     def buy(self, item: str) -> None:
         """Attempt to purchase the provided item."""
-        from bastd.ui import account
-        from bastd.ui.confirm import ConfirmWindow
-        from bastd.ui import getcurrency
+        from bauiv1lib import account
+        from bauiv1lib.confirm import ConfirmWindow
+        from bauiv1lib import getcurrency
 
         assert bui.app.classic is not None
         store = bui.app.classic.store
@@ -950,7 +950,7 @@ class StoreBrowserWindow(bui.Window):
                     # pylint: disable=too-many-locals
                     # pylint: disable=too-many-branches
                     # pylint: disable=too-many-nested-blocks
-                    from bastd.ui.store.item import (
+                    from bauiv1lib.store.item import (
                         instantiate_store_item_display,
                     )
 
@@ -1325,8 +1325,8 @@ class StoreBrowserWindow(bui.Window):
 
     def _on_get_more_tickets_press(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.getcurrency import GetCurrencyWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.getcurrency import GetCurrencyWindow
 
         plus = bui.app.plus
         assert plus is not None
@@ -1346,8 +1346,8 @@ class StoreBrowserWindow(bui.Window):
 
     def _back(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.coop.browser import CoopBrowserWindow
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.coop.browser import CoopBrowserWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/assets/ba_data/python/bastd/ui/store/button.py b/src/assets/ba_data/python/bauiv1lib/store/button.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/store/button.py
rename to src/assets/ba_data/python/bauiv1lib/store/button.py
index 04cc98b1..c53e0515 100644
--- a/src/assets/ba_data/python/bastd/ui/store/button.py
+++ b/src/assets/ba_data/python/bauiv1lib/store/button.py
@@ -226,8 +226,8 @@ class StoreButton:
 
     def _default_on_activate_call(self) -> None:
         # pylint: disable=cyclic-import
-        from bastd.ui.account import show_sign_in_prompt
-        from bastd.ui.store.browser import StoreBrowserWindow
+        from bauiv1lib.account import show_sign_in_prompt
+        from bauiv1lib.store.browser import StoreBrowserWindow
 
         plus = bui.app.plus
         assert plus is not None
diff --git a/src/assets/ba_data/python/bastd/ui/store/item.py b/src/assets/ba_data/python/bauiv1lib/store/item.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/store/item.py
rename to src/assets/ba_data/python/bauiv1lib/store/item.py
diff --git a/src/assets/ba_data/python/bastd/ui/tabs.py b/src/assets/ba_data/python/bauiv1lib/tabs.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/tabs.py
rename to src/assets/ba_data/python/bauiv1lib/tabs.py
diff --git a/src/assets/ba_data/python/bastd/ui/teamnamescolors.py b/src/assets/ba_data/python/bauiv1lib/teamnamescolors.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/teamnamescolors.py
rename to src/assets/ba_data/python/bauiv1lib/teamnamescolors.py
index 8028ed79..b1654c66 100644
--- a/src/assets/ba_data/python/bastd/ui/teamnamescolors.py
+++ b/src/assets/ba_data/python/bauiv1lib/teamnamescolors.py
@@ -6,8 +6,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, cast
 
-from bastd.ui.popup import PopupWindow
-from bastd.ui.colorpicker import ColorPicker
+from bauiv1lib.popup import PopupWindow
+from bauiv1lib.colorpicker import ColorPicker
 import bauiv1 as bui
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/ui/tournamententry.py b/src/assets/ba_data/python/bauiv1lib/tournamententry.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/tournamententry.py
rename to src/assets/ba_data/python/bauiv1lib/tournamententry.py
index 81e89657..2c2b293e 100644
--- a/src/assets/ba_data/python/bastd/ui/tournamententry.py
+++ b/src/assets/ba_data/python/bauiv1lib/tournamententry.py
@@ -7,7 +7,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -580,7 +580,7 @@ class TournamentEntryWindow(PopupWindow):
             )
 
     def _on_pay_with_tickets_press(self) -> None:
-        from bastd.ui import getcurrency
+        from bauiv1lib import getcurrency
 
         plus = bui.app.plus
         assert plus is not None
@@ -710,7 +710,7 @@ class TournamentEntryWindow(PopupWindow):
         self._launch()
 
     def _on_get_tickets_press(self) -> None:
-        from bastd.ui import getcurrency
+        from bauiv1lib import getcurrency
 
         # If we're already entering, ignore presses.
         if self._entering:
diff --git a/src/assets/ba_data/python/bastd/ui/tournamentscores.py b/src/assets/ba_data/python/bauiv1lib/tournamentscores.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/tournamentscores.py
rename to src/assets/ba_data/python/bauiv1lib/tournamentscores.py
index 00f513e7..6fe2f288 100644
--- a/src/assets/ba_data/python/bastd/ui/tournamentscores.py
+++ b/src/assets/ba_data/python/bauiv1lib/tournamentscores.py
@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.ui.popup import PopupWindow
+from bauiv1lib.popup import PopupWindow
 import bauiv1 as bui
 
 if TYPE_CHECKING:
@@ -220,7 +220,7 @@ class TournamentScoresWindow(PopupWindow):
                     bui.widget(edit=txt, up_widget=self._cancel_button)
 
     def _show_player_info(self, entry: Any, textwidget: bui.Widget) -> None:
-        from bastd.ui.account.viewer import AccountViewerWindow
+        from bauiv1lib.account.viewer import AccountViewerWindow
 
         # for the moment we only work if a single player-info is present..
         if len(entry[2]) != 1:
diff --git a/src/assets/ba_data/python/bastd/ui/trophies.py b/src/assets/ba_data/python/bauiv1lib/trophies.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/trophies.py
rename to src/assets/ba_data/python/bauiv1lib/trophies.py
index cb45be6e..6cf3a6f2 100644
--- a/src/assets/ba_data/python/bastd/ui/trophies.py
+++ b/src/assets/ba_data/python/bauiv1lib/trophies.py
@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from bastd.ui import popup
+from bauiv1lib import popup
 import bauiv1 as bui
 
 if TYPE_CHECKING:
diff --git a/src/assets/ba_data/python/bastd/ui/url.py b/src/assets/ba_data/python/bauiv1lib/url.py
similarity index 100%
rename from src/assets/ba_data/python/bastd/ui/url.py
rename to src/assets/ba_data/python/bauiv1lib/url.py
diff --git a/src/assets/ba_data/python/bastd/ui/v2upgrade.py b/src/assets/ba_data/python/bauiv1lib/v2upgrade.py
similarity index 98%
rename from src/assets/ba_data/python/bastd/ui/v2upgrade.py
rename to src/assets/ba_data/python/bauiv1lib/v2upgrade.py
index 7550f01c..72ba17c0 100644
--- a/src/assets/ba_data/python/bastd/ui/v2upgrade.py
+++ b/src/assets/ba_data/python/bauiv1lib/v2upgrade.py
@@ -11,7 +11,7 @@ class V2UpgradeWindow(bui.Window):
     """A window presenting a URL to the user visually."""
 
     def __init__(self, login_name: str, code: str):
-        from bastd.ui.account.settings import show_what_is_v2_page
+        from bauiv1lib.account.settings import show_what_is_v2_page
 
         app = bui.app
         assert app.classic is not None
diff --git a/src/assets/ba_data/python/bastd/ui/watch.py b/src/assets/ba_data/python/bauiv1lib/watch.py
similarity index 99%
rename from src/assets/ba_data/python/bastd/ui/watch.py
rename to src/assets/ba_data/python/bauiv1lib/watch.py
index c08c5e85..6d10fde1 100644
--- a/src/assets/ba_data/python/bastd/ui/watch.py
+++ b/src/assets/ba_data/python/bauiv1lib/watch.py
@@ -32,7 +32,7 @@ class WatchWindow(bui.Window):
     ):
         # pylint: disable=too-many-locals
         # pylint: disable=too-many-statements
-        from bastd.ui.tabs import TabRow
+        from bauiv1lib.tabs import TabRow
 
         bui.set_analytics_screen('Watch Window')
         scale_origin: tuple[float, float] | None
@@ -374,7 +374,7 @@ class WatchWindow(bui.Window):
 
                 # Drop back into a fresh main menu session
                 # in case we half-launched or something.
-                from bastd import mainmenu
+                from bascenev1lib import mainmenu
 
                 bs.new_host_session(mainmenu.MainMenuSession)
 
@@ -513,7 +513,7 @@ class WatchWindow(bui.Window):
         )
 
     def _on_my_replay_delete_press(self) -> None:
-        from bastd.ui import confirm
+        from bauiv1lib import confirm
 
         if self._my_replay_selected is None:
             self._no_replay_selected_error()
@@ -663,7 +663,7 @@ class WatchWindow(bui.Window):
             logging.exception('Error restoring state for %s.', self)
 
     def _back(self) -> None:
-        from bastd.ui.mainmenu import MainMenuWindow
+        from bauiv1lib.mainmenu import MainMenuWindow
 
         self._save_state()
         bui.containerwidget(
diff --git a/src/ballistica/scene_v1/support/host_session.cc b/src/ballistica/scene_v1/support/host_session.cc
index 2116833b..60e602a1 100644
--- a/src/ballistica/scene_v1/support/host_session.cc
+++ b/src/ballistica/scene_v1/support/host_session.cc
@@ -32,7 +32,7 @@ HostSession::HostSession(PyObject* session_type_obj)
   // FIXME: Should be an attr of the session class, not hard-coded.
   is_main_menu_ =
       static_cast<bool>(strstr(Python::ObjToString(session_type_obj).c_str(),
-                               "bastd.mainmenu.MainMenuSession"));
+                               "bascenev1lib.mainmenu.MainMenuSession"));
   // Log(LogLevel::kInfo, "MAIN MENU? " + std::to_string(is_main_menu()));
 
   kick_idle_players_ = appmode->kick_idle_players();
diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc
index 4ea8fea9..2d9c2ae8 100644
--- a/src/ballistica/shared/ballistica.cc
+++ b/src/ballistica/shared/ballistica.cc
@@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 21054;
+const int kEngineBuildNumber = 21055;
 const char* kEngineVersion = "1.7.20";
 
 auto MonolithicMain(const core::CoreConfig& core_config) -> int {
diff --git a/src/meta/Makefile b/src/meta/Makefile
index 8514b23a..c0c56acf 100644
--- a/src/meta/Makefile
+++ b/src/meta/Makefile
@@ -34,7 +34,7 @@ sources: \
   $(PROJ_SRC_DIR)/ballistica/template_fs/mgen/pyembed/binding_template_fs.inc \
   $(PROJ_SRC_DIR)/ballistica/ui_v1/mgen/pyembed/binding_ui_v1.inc
 
-$(PROJ_SRC_DIR)/ballistica/core/mgen/python_modules_monolithic.h : $(PROJ_DIR)/config/featuresets/featureset_base.py $(PROJ_DIR)/config/featuresets/featureset_classic.py $(PROJ_DIR)/config/featuresets/featureset_core.py $(PROJ_DIR)/config/featuresets/featureset_plus.py $(PROJ_DIR)/config/featuresets/featureset_scene_v1.py $(PROJ_DIR)/config/featuresets/featureset_std.py $(PROJ_DIR)/config/featuresets/featureset_template_fs.py $(PROJ_DIR)/config/featuresets/featureset_ui_v1.py
+$(PROJ_SRC_DIR)/ballistica/core/mgen/python_modules_monolithic.h : $(PROJ_DIR)/config/featuresets/featureset_base.py $(PROJ_DIR)/config/featuresets/featureset_classic.py $(PROJ_DIR)/config/featuresets/featureset_core.py $(PROJ_DIR)/config/featuresets/featureset_plus.py $(PROJ_DIR)/config/featuresets/featureset_scene_v1.py $(PROJ_DIR)/config/featuresets/featureset_scene_v1_lib.py $(PROJ_DIR)/config/featuresets/featureset_template_fs.py $(PROJ_DIR)/config/featuresets/featureset_ui_v1.py $(PROJ_DIR)/config/featuresets/featureset_ui_v1_lib.py
 	@$(PCOMMAND) gen_monolithic_register_modules $@
 
 $(PROJ_SRC_DIR)/ballistica/base/mgen/pyembed/binding_base.inc : babasemeta/pyembed/binding_base.py
diff --git a/tools/batools/docs.py b/tools/batools/docs.py
index c8104fbb..2a8665fd 100755
--- a/tools/batools/docs.py
+++ b/tools/batools/docs.py
@@ -108,7 +108,7 @@ def generate(projroot: str) -> None:
         )
         pdoc.pdoc(
             'babase',
-            'bastd',
+            'bascenev1lib',
             'baclassic',
             'bascenev1',
             'bauiv1',
diff --git a/tools/batools/project/_checks.py b/tools/batools/project/_checks.py
index 72b2e9d3..337c0aa6 100755
--- a/tools/batools/project/_checks.py
+++ b/tools/batools/project/_checks.py
@@ -376,13 +376,13 @@ def _check_python_file(self: ProjectUpdater, fname: str) -> None:
                         f'{fname}:{i+1}: no top level babase imports allowed'
                         f' under babase module.'
                     )
-            if '/bastd/' in fname:
+            if '/bascenev1lib/' in fname:
                 # Don't allow importing _babase or _baplus anywhere here.
                 # (any internal needs should be in babase.internal)
                 if 'import _babase' in line:
                     raise CleanError(
                         f'{fname}:{i+1}: _babase or _baplus imports not'
-                        f' allowed under bastd.'
+                        f' allowed under bascenev1lib.'
                     )
 
     # In all cases, look for our one-line legal notice.
diff --git a/tools/efrotools/__init__.py b/tools/efrotools/__init__.py
index b6630b8c..b07cb692 100644
--- a/tools/efrotools/__init__.py
+++ b/tools/efrotools/__init__.py
@@ -338,7 +338,7 @@ def py_examine(
         with tmppath.open('w', encoding='utf-8') as outfile:
             outfile.write('\n'.join(flines))
         try:
-            code.runmypy(projroot, [str(tmppath)], check=False)
+            code.mypy_files(projroot, [str(tmppath)], check=False)
         except Exception as exc:
             print('error running mypy:', exc)
         tmppath.unlink()
diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py
index 6cd302a9..94577650 100644
--- a/tools/efrotools/code.py
+++ b/tools/efrotools/code.py
@@ -706,7 +706,7 @@ def _filter_module_name(mpath: str) -> str:
     return mpath[:-9] if mpath.endswith('.__init__') else mpath
 
 
-def runmypy(
+def mypy_files(
     projroot: Path, filenames: list[str], full: bool = False, check: bool = True
 ) -> None:
     """Run MyPy on provided filenames."""
@@ -736,7 +736,7 @@ def mypy(projroot: Path, full: bool) -> None:
     print(f'{Clr.BLU}Running Mypy {desc}...{Clr.RST}', flush=True)
     starttime = time.time()
     try:
-        runmypy(projroot, filenames, full)
+        mypy_files(projroot, filenames, full)
     except Exception as exc:
         raise CleanError('Mypy failed.') from exc
     duration = time.time() - starttime
diff --git a/tools/efrotools/pcommand.py b/tools/efrotools/pcommand.py
index 9ddd0b47..c0f50214 100644
--- a/tools/efrotools/pcommand.py
+++ b/tools/efrotools/pcommand.py
@@ -397,7 +397,7 @@ def mypy() -> None:
     efrotools.code.mypy(PROJROOT, full)
 
 
-def runmypy() -> None:
+def mypy_files() -> None:
     """Run mypy checks on provided filenames."""
     from efro.terminal import Clr
     from efro.error import CleanError
@@ -407,7 +407,7 @@ def runmypy() -> None:
         raise CleanError('Expected at least 1 filename arg.')
     filenames = sys.argv[2:]
     try:
-        efrotools.code.runmypy(PROJROOT, filenames)
+        efrotools.code.mypy_files(PROJROOT, filenames)
         print(f'{Clr.GRN}Mypy Passed.{Clr.RST}')
     except Exception as exc:
         raise CleanError('Mypy Failed.') from exc
diff --git a/tools/pcommand b/tools/pcommand
index e3720111..55e60660 100755
--- a/tools/pcommand
+++ b/tools/pcommand
@@ -28,7 +28,7 @@ from efrotools.pcommand import (
     pylint,
     pylint_files,
     mypy,
-    runmypy,
+    mypy_files,
     dmypy,
     tool_config_install,
     sync,