diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b897aa88a..8d84ea466 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,8 +111,7 @@ jobs:
 
     - name: Build and package crate for Android
       if: contains(matrix.platform.target, 'android')
-      # TODO: Figure out why this build fails on Github Actions
-      run: x build -p ios-xbuild-target --platform android --arch arm64
+      run: x build -p android-xbuild-target --platform android --arch arm64
 
     - name: Build and package crate for iOS
       if: contains(matrix.platform.target, 'ios')
diff --git a/Cargo.toml b/Cargo.toml
index 2d9d7d429..d159020b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -212,7 +212,7 @@ web-sys = { version = "0.3.22", features = ['CanvasRenderingContext2d'] }
 
 [workspace]
 members = [
-    "android-xbuild-target",
-    "ios-xbuild-target",
+    "xbuild/android-target",
+    "xbuild/ios-target",
     "run-wasm",
 ]
diff --git a/android-xbuild-target/README.md b/android-xbuild-target/README.md
deleted file mode 100644
index d0dfd8f36..000000000
--- a/android-xbuild-target/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# android-xbuild-target
-
-This is a crate that can be built via `x build` in order to simplify CI testing.
diff --git a/ios-xbuild-target/README.md b/ios-xbuild-target/README.md
deleted file mode 100644
index 6284d0e5a..000000000
--- a/ios-xbuild-target/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ios-xbuild-target
-
-This is a crate that can be built via `x build` in order to simplify CI testing.
diff --git a/xbuild/README.md b/xbuild/README.md
new file mode 100644
index 000000000..f5001d154
--- /dev/null
+++ b/xbuild/README.md
@@ -0,0 +1,3 @@
+# xbuild-target
+
+These are crates that can be built via `x build` in order to simplify CI testing.
diff --git a/android-xbuild-target/Cargo.toml b/xbuild/android-target/Cargo.toml
similarity index 68%
rename from android-xbuild-target/Cargo.toml
rename to xbuild/android-target/Cargo.toml
index dfcab59fc..17444af2d 100644
--- a/android-xbuild-target/Cargo.toml
+++ b/xbuild/android-target/Cargo.toml
@@ -2,11 +2,12 @@
 name = "android-xbuild-target"
 version = "0.1.0"
 edition = "2021"
+publish = false
 
 [lib]
 crate_type = ["cdylib"]
 
 [dependencies.winit]
 version = "0.29.1-beta"
-path = ".."
-features = ["android-game-activity"]
+path = "../.."
+features = ["android-native-activity"]
diff --git a/android-xbuild-target/src/lib.rs b/xbuild/android-target/src/lib.rs
similarity index 100%
rename from android-xbuild-target/src/lib.rs
rename to xbuild/android-target/src/lib.rs
diff --git a/ios-xbuild-target/Cargo.toml b/xbuild/ios-target/Cargo.toml
similarity index 79%
rename from ios-xbuild-target/Cargo.toml
rename to xbuild/ios-target/Cargo.toml
index 0bee9d138..7dcebb4a2 100644
--- a/ios-xbuild-target/Cargo.toml
+++ b/xbuild/ios-target/Cargo.toml
@@ -2,7 +2,8 @@
 name = "ios-xbuild-target"
 version = "0.1.0"
 edition = "2021"
+publish = false
 
 [dependencies.winit]
 version = "0.29.1-beta"
-path = ".."
+path = "../.."
diff --git a/ios-xbuild-target/src/main.rs b/xbuild/ios-target/src/main.rs
similarity index 100%
rename from ios-xbuild-target/src/main.rs
rename to xbuild/ios-target/src/main.rs