diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49fa296..d1efcdf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,22 +23,22 @@ jobs:
           "/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install
           echo "$HOME/.xlings/subos/current/bin" >> "$GITHUB_PATH"
 
-      - name: Install workspace tools (.xlings.json → mcpp 0.0.4)
+      - name: Install workspace tools (.xlings.json → mcpp 0.0.7)
         run: xlings install -y
 
       # Cache mcpp's self-bootstrapped sandbox (musl-gcc + binutils +
       # glibc + ninja + patchelf, ~800 MB). Toolchain set is pinned by
-      # mcpp 0.0.4, so a fixed key suffices.
+      # mcpp 0.0.7, so a fixed key suffices.
       - name: Cache mcpp sandbox
         uses: actions/cache@v4
         with:
-          path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.4/registry
-          key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.4
+          path: ~/.xlings/data/xpkgs/xim-x-mcpp/0.0.7/registry
+          key: mcpp-sandbox-${{ runner.os }}-mcpp0.0.7
 
       - name: Build with mcpp
         run: mcpp build
 
-      # mcpp 0.0.4 auto-prepends sandbox PATH (patchelf, ninja) for
+      # mcpp 0.0.7 auto-prepends sandbox PATH (patchelf, ninja) for
       # test binaries, so Linux elfpatch tests run without manual PATH
       # setup. Only macOS-specific tests (need install_name_tool) are
       # filtered — they can't run on a Linux runner.
diff --git a/.xlings.json b/.xlings.json
index b3b1fb4..3f993c1 100644
--- a/.xlings.json
+++ b/.xlings.json
@@ -1,5 +1,5 @@
 {
   "workspace": {
-    "mcpp": { "linux": "0.0.4" }
+    "mcpp": { "linux": "0.0.7" }
   }
 }
diff --git a/mcpp.toml b/mcpp.toml
index ef3a0bc..04b71ff 100644
--- a/mcpp.toml
+++ b/mcpp.toml
@@ -1,27 +1,16 @@
 [package]
-name        = "mcpplibs.xpkg"
+namespace   = "mcpplibs"
+name        = "xpkg"
 version     = "0.0.39"
-description = "C++23 reference implementation of the xpkg V1 spec — `import mcpplibs.xpkg;`"
+description = "C++23 reference implementation of the xpkg V1 spec"
 license     = "Apache-2.0"
 repo        = "https://github.com/openxlings/libxpkg"
 
 [targets.xpkg]
 kind = "lib"
 
-# Library-root convention picks `src/xpkg.cppm` automatically.
-# The package ships five separate modules under the `mcpplibs.xpkg.*`
-# namespace (loader, index, executor, lua_stdlib) — they sit alongside
-# the primary `mcpplibs.xpkg` and all roll into the single libxpkg.a.
-#
-# `src/xpkg-lua-stdlib.cppm` is generated from `src/lua-stdlib/**/*.lua`
-# at xmake build time (see `before_build` in xmake.lua); the current
-# generated copy is committed so mcpp builds work without invoking the
-# xmake codegen path. Regenerate via `xmake build mcpplibs-xpkg-lua-stdlib`
-# whenever the .lua sources change.
-
 [dependencies]
 "mcpplibs.capi.lua" = "0.0.3"
 
-# `mcpp test` discovers tests/**/*.cpp + tests/**/*.cppm automatically.
 [dev-dependencies]
 gtest = "1.15.2"
diff --git a/tests/main.cpp b/tests/main.cpp
deleted file mode 100644
index 5ebbc76..0000000
--- a/tests/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <gtest/gtest.h>
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}