diff --git a/.dockerignore b/.dockerignore
index ddf7c1e..a8dead5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -25,7 +25,6 @@ data/
 xunit/
 
 # Examples not in the composite build / not referenced by the Dockerfile
-CardGame/
 shopping/
 
 # The Dockerfile itself doesn't need to be inside the image
diff --git a/CardGame/.gitignore b/CardGame/.gitignore
deleted file mode 100644
index bdf70b3..0000000
--- a/CardGame/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# Gradle
-.gradle/
-build/
-
-# IDE
-.idea/
-*.iml
-.vscode/
-
-# XTC
-*.xtc
-
-# OS
-.DS_Store
-Thumbs.db
diff --git a/CardGame/build.gradle.kts b/CardGame/build.gradle.kts
deleted file mode 100644
index 0f5dc6d..0000000
--- a/CardGame/build.gradle.kts
+++ /dev/null
@@ -1,15 +0,0 @@
-plugins {
-    alias(libs.plugins.xtc)
-}
-
-dependencies {
-    xdkDistribution(libs.xdk)
-}
-
-// Run configuration - can be overridden from command line:
-//   ./gradlew runXtc --module=other --method=main --args=arg1,arg2
-xtcRun {
-    module {
-        moduleName = "cardGame"
-    }
-}
diff --git a/CardGame/gradle.properties b/CardGame/gradle.properties
deleted file mode 100644
index 05155d2..0000000
--- a/CardGame/gradle.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Project configuration
-group=CardGame
-version=0.1.0-SNAPSHOT
-
-# Enable native access for Java 24+
-org.gradle.jvmargs=--enable-native-access=ALL-UNNAMED
-
-# Gradle performance
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.configuration-cache=true
diff --git a/CardGame/gradle/libs.versions.toml b/CardGame/gradle/libs.versions.toml
deleted file mode 100644
index 0194840..0000000
--- a/CardGame/gradle/libs.versions.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[versions]
-xtc = "0.4.4-SNAPSHOT"
-
-[plugins]
-xtc = { id = "org.xtclang.xtc-plugin", version.ref = "xtc" }
-
-[libraries]
-xdk = { module = "org.xtclang:xdk", version.ref = "xtc" }
diff --git a/CardGame/gradle/wrapper/gradle-wrapper.jar b/CardGame/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index f8e1ee3..0000000
Binary files a/CardGame/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/CardGame/gradle/wrapper/gradle-wrapper.properties b/CardGame/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index dbc3ce4..0000000
--- a/CardGame/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/CardGame/gradlew b/CardGame/gradlew
deleted file mode 100755
index adff685..0000000
--- a/CardGame/gradlew
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/CardGame/gradlew.bat b/CardGame/gradlew.bat
deleted file mode 100644
index e509b2d..0000000
--- a/CardGame/gradlew.bat
+++ /dev/null
@@ -1,93 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/CardGame/settings.gradle.kts b/CardGame/settings.gradle.kts
deleted file mode 100644
index 01f3155..0000000
--- a/CardGame/settings.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-rootProject.name = "cardGame"
-
-pluginManagement {
-    repositories {
-        mavenLocal()
-        maven("https://central.sonatype.com/repository/maven-snapshots/") {
-            mavenContent { snapshotsOnly() }
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-dependencyResolutionManagement {
-    repositories {
-        mavenLocal()
-        maven("https://central.sonatype.com/repository/maven-snapshots/") {
-            mavenContent { snapshotsOnly() }
-        }
-        mavenCentral()
-    }
-}
diff --git a/Dockerfile b/Dockerfile
index 6ae0577..b3e23e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ COPY gradle/ gradle/
 COPY build-logic/ build-logic/
 COPY banking/build.gradle.kts banking/build.gradle.kts
 COPY counter/build.gradle.kts counter/build.gradle.kts
+COPY card-game/build.gradle.kts card-game/build.gradle.kts
 COPY chess-game/settings.gradle.kts chess-game/build.gradle.kts chess-game/
 COPY chess-game/app/build.gradle.kts chess-game/app/
 COPY chess-game/db/build.gradle.kts chess-game/db/
@@ -17,6 +18,7 @@ RUN gradle dependencies --no-daemon 2>/dev/null || true
 # Layer 2: Source code — only this layer rebuilds when sources change
 COPY banking/ banking/
 COPY counter/ counter/
+COPY card-game/ card-game/
 COPY chess-game/ chess-game/
 COPY welcome/ welcome/
 
diff --git a/build-logic/src/main/kotlin/webapp-conventions.gradle.kts b/build-logic/src/main/kotlin/webapp-conventions.gradle.kts
index dea37cc..10058e3 100644
--- a/build-logic/src/main/kotlin/webapp-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/webapp-conventions.gradle.kts
@@ -53,10 +53,10 @@ if (file("webapp/package.json").exists()) {
         nodeProjectDir.set(file("webapp"))
     }
 
-    val npmInstall by tasks.existing
-    val processResources by tasks.existing
+    val npmInstall = tasks.named("npmInstall")
+    val processResources = tasks.named("processResources")
 
-    val buildWebapp by tasks.registering(NpmTask::class) {
+    val buildWebapp = tasks.register<NpmTask>("buildWebapp") {
         args.set(listOf("run", "build"))
         workingDir.set(file("webapp"))
         dependsOn(npmInstall)
diff --git a/build.gradle.kts b/build.gradle.kts
index c812d01..98dc39a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     xtcModule(projects.welcome)
     xtcModule(projects.banking)
     xtcModule(projects.counter)
+    xtcModule(projects.cardGame)
 
     // Chess-game is an included composite build. Gradle's composite-build
     // dependency substitution routes these coordinate-based deps to the
@@ -39,7 +40,7 @@ dependencies {
  * You can then run any example with:
  *   xtc run -L build/install/examples/lib <moduleName>
  */
-val installDist by tasks.registering(Copy::class) {
+val installDist = tasks.register<Copy>("installDist") {
     group = "distribution"
     description = "Install all example modules to build/install/examples/lib"
     from(configurations.xtcModule)
diff --git a/card-game/build.gradle.kts b/card-game/build.gradle.kts
new file mode 100644
index 0000000..a46f065
--- /dev/null
+++ b/card-game/build.gradle.kts
@@ -0,0 +1,18 @@
+/*
+ * Build file for the "card-game" example.
+ *
+ * A console XTC application (no webapp), so it applies only the shared
+ * xtc-conventions build-logic plugin. The compiled XTC module is `cardGame`.
+ */
+
+plugins {
+    id("xtc-conventions")
+}
+
+// Run configuration - can be overridden from command line:
+//   ./gradlew :card-game:runXtc --module=other --method=main --args=arg1,arg2
+xtcRun {
+    module {
+        moduleName = "cardGame"
+    }
+}
diff --git a/CardGame/src/main/x/cardGame.x b/card-game/src/main/x/cardGame.x
similarity index 100%
rename from CardGame/src/main/x/cardGame.x
rename to card-game/src/main/x/cardGame.x
diff --git a/CardGame/src/main/x/cardGame/Card.x b/card-game/src/main/x/cardGame/Card.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Card.x
rename to card-game/src/main/x/cardGame/Card.x
diff --git a/CardGame/src/main/x/cardGame/CardCollection.x b/card-game/src/main/x/cardGame/CardCollection.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/CardCollection.x
rename to card-game/src/main/x/cardGame/CardCollection.x
diff --git a/CardGame/src/main/x/cardGame/Deck.x b/card-game/src/main/x/cardGame/Deck.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Deck.x
rename to card-game/src/main/x/cardGame/Deck.x
diff --git a/CardGame/src/main/x/cardGame/Eights.x b/card-game/src/main/x/cardGame/Eights.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Eights.x
rename to card-game/src/main/x/cardGame/Eights.x
diff --git a/CardGame/src/main/x/cardGame/GameConstants.x b/card-game/src/main/x/cardGame/GameConstants.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/GameConstants.x
rename to card-game/src/main/x/cardGame/GameConstants.x
diff --git a/CardGame/src/main/x/cardGame/Hand.x b/card-game/src/main/x/cardGame/Hand.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Hand.x
rename to card-game/src/main/x/cardGame/Hand.x
diff --git a/CardGame/src/main/x/cardGame/Player.x b/card-game/src/main/x/cardGame/Player.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Player.x
rename to card-game/src/main/x/cardGame/Player.x
diff --git a/CardGame/src/main/x/cardGame/Rank.x b/card-game/src/main/x/cardGame/Rank.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Rank.x
rename to card-game/src/main/x/cardGame/Rank.x
diff --git a/CardGame/src/main/x/cardGame/Suit.x b/card-game/src/main/x/cardGame/Suit.x
similarity index 100%
rename from CardGame/src/main/x/cardGame/Suit.x
rename to card-game/src/main/x/cardGame/Suit.x
diff --git a/CardGame/src/test/x/CardCollectionTest.x b/card-game/src/test/x/CardCollectionTest.x
similarity index 100%
rename from CardGame/src/test/x/CardCollectionTest.x
rename to card-game/src/test/x/CardCollectionTest.x
diff --git a/CardGame/src/test/x/CardGameTest.x b/card-game/src/test/x/CardGameTest.x
similarity index 100%
rename from CardGame/src/test/x/CardGameTest.x
rename to card-game/src/test/x/CardGameTest.x
diff --git a/CardGame/src/test/x/CardTest.x b/card-game/src/test/x/CardTest.x
similarity index 100%
rename from CardGame/src/test/x/CardTest.x
rename to card-game/src/test/x/CardTest.x
diff --git a/CardGame/src/test/x/DeckTest.x b/card-game/src/test/x/DeckTest.x
similarity index 100%
rename from CardGame/src/test/x/DeckTest.x
rename to card-game/src/test/x/DeckTest.x
diff --git a/CardGame/src/test/x/EightsTest.x b/card-game/src/test/x/EightsTest.x
similarity index 100%
rename from CardGame/src/test/x/EightsTest.x
rename to card-game/src/test/x/EightsTest.x
diff --git a/CardGame/src/test/x/HandTest.x b/card-game/src/test/x/HandTest.x
similarity index 100%
rename from CardGame/src/test/x/HandTest.x
rename to card-game/src/test/x/HandTest.x
diff --git a/CardGame/src/test/x/PlayerTest.x b/card-game/src/test/x/PlayerTest.x
similarity index 100%
rename from CardGame/src/test/x/PlayerTest.x
rename to card-game/src/test/x/PlayerTest.x
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4f5ceb6..a9db115 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,9 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
-retries=3
-retryBackOffMs=1000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index b9bb139..249efbb 100755
--- a/gradlew
+++ b/gradlew
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
diff --git a/gradlew.bat b/gradlew.bat
index 24c62d5..a51ec4f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -19,7 +19,7 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
@@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2
 
 
 
-@rem Execute Gradle
+@rem Execute gradlew
 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded
 @rem which allows us to clear the local environment before executing the java command
 endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 278e0ce..d1d8848 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -47,4 +47,5 @@ rootProject.name = "examples"
 include(":welcome")
 include(":banking")
 include(":counter")
+include(":card-game")
 includeBuild("chess-game")