diff --git a/.efrocachemap b/.efrocachemap
index 3d7210af..3eccef2c 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -3948,8 +3948,8 @@
   "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/32/03/d4dd9c398eab7c7da62b2e7a4096",
   "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/11/f5/cb2b3a42e4384d6ac4dfe7a98213",
   "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/06/aa/fc55996ce9a1a3e898d1348873ff",
-  "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/47/43/8bdcb42f145f020d3327e42aba34",
-  "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b9/58/5d3d5e242ffc1331dcdd215977e0",
-  "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f8/73/58929632a662fa66a026d9b14ab6",
-  "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8b/54/fb5a72392a53cca6ef29f78633ae"
+  "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f7/16/01f6978b6262c3033aadfb4ad24f",
+  "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d8/21/d65fb091c26cc7b683768ea19705",
+  "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/13/0c/a2f421ae193496383524772a1e76",
+  "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c9/a7/f55ab74860ab4f6ef4983e144e76"
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f235df09..b901ecca 100644
--- a/Makefile
+++ b/Makefile
@@ -612,7 +612,7 @@ build/prefab/full/windows_%_server/release/README.txt: \
  prefab-windows-x86-debug prefab-windows-x86-debug-build \
  prefab-windows-x86-release prefab-windows-x86-release-build \
  prefab-windows-x86-server-debug prefab-windows-x86-server-debug-build \
- prefab-windows-x86-server-release prefab-windows-x86-server-release-build 
+ prefab-windows-x86-server-release prefab-windows-x86-server-release-build
 
 
 ################################################################################
@@ -818,43 +818,38 @@ preflight2-full:
 
 # Set the following from the command line to influence the build:
 
-# This can be Debug or Release
+# This can be Debug or Release.
 CMAKE_BUILD_TYPE ?= Debug
 
-# Host to use when building via cloudshell
-CMAKE_CLOUDSHELL_HOST ?= linbeast
-
-# Base names for assembled packages
-CMAKE_CLOUDSHELL_PACKAGE_NAME ?= BallisticaCore
-CMAKE_CLOUDSHELL_SERVER_PACKAGE_NAME ?= BallisticaCore_Server
-
 # Build and run the cmake build.
 cmake: cmake-build
-	@cd ballisticacore-cmake/build/$(CM_BT_LC) && ./ballisticacore
+	@cd build/cmake/$(CM_BT_LC) && ./ballisticacore
 
 # Build but don't run it.
 cmake-build: assets-cmake resources code
-	@tools/pcommand cmake_prep_dir ballisticacore-cmake/build/$(CM_BT_LC)
-	@${STAGE_ASSETS} -cmake ballisticacore-cmake/build/$(CM_BT_LC)
-	@cd ballisticacore-cmake/build/$(CM_BT_LC) && test -f Makefile \
-      || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) ../..
-	@cd ballisticacore-cmake/build/$(CM_BT_LC) && ${MAKE} -j${CPUS}
+	@tools/pcommand cmake_prep_dir build/cmake/$(CM_BT_LC)
+	@${STAGE_ASSETS} -cmake build/cmake/$(CM_BT_LC)
+	@cd build/cmake/$(CM_BT_LC) && test -f Makefile \
+      || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
+      ../../../ballisticacore-cmake
+	@cd build/cmake/$(CM_BT_LC) && ${MAKE} -j${CPUS}
 
 cmake-clean:
-	rm -rf ballisticacore-cmake/build/$(CM_BT_LC)
+	rm -rf build/cmake/$(CM_BT_LC)
 
 cmake-server: cmake-server-build
-	@cd ballisticacore-cmake/build/server-$(CM_BT_LC) && ./ballisticacore
+	@cd build/cmake/server-$(CM_BT_LC) && ./ballisticacore
 
 cmake-server-build: assets-cmake resources code
-	@tools/pcommand cmake_prep_dir ballisticacore-cmake/build/server-$(CM_BT_LC)
-	@${STAGE_ASSETS} -cmakeserver ballisticacore-cmake/build/server-$(CM_BT_LC)
-	@cd ballisticacore-cmake/build/server-$(CM_BT_LC) && test -f Makefile \
-      || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DHEADLESS=true ../..
-	@cd ballisticacore-cmake/build/server-$(CM_BT_LC) && ${MAKE} -j${CPUS}
+	@tools/pcommand cmake_prep_dir build/cmake/server-$(CM_BT_LC)
+	@${STAGE_ASSETS} -cmakeserver build/cmake/server-$(CM_BT_LC)
+	@cd build/cmake/server-$(CM_BT_LC) && test -f Makefile \
+      || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DHEADLESS=true \
+      ../../../ballisticacore-cmake
+	@cd build/cmake/server-$(CM_BT_LC) && ${MAKE} -j${CPUS}
 
 cmake-server-clean:
-	rm -rf ballisticacore-cmake/build/server-$(CM_BT_LC)
+	rm -rf build/cmake/server-$(CM_BT_LC)
 
 # Tell make which of these targets don't represent files.
 .PHONY: cmake cmake-build cmake-clean cmake-server cmake-server-build \