diff --git a/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/CodeAuthFlowFactory.kt b/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/CodeAuthFlowFactory.kt
index 42ea1052..930bc3d5 100644
--- a/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/CodeAuthFlowFactory.kt
+++ b/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/CodeAuthFlowFactory.kt
@@ -4,7 +4,6 @@ import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
 import kotlin.experimental.ExperimentalObjCRefinement
-import kotlin.native.HiddenFromObjC
 
 @OptIn(ExperimentalObjCRefinement::class)
 interface CodeAuthFlowFactory {
diff --git a/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.kt b/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.kt
index 182c305f..822bdfb8 100644
--- a/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.kt
+++ b/oidc-appsupport/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.kt
@@ -1,6 +1,5 @@
 package org.publicvalue.multiplatform.oidc.appsupport
 
-import io.ktor.http.Url
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.OpenIdConnectException
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
@@ -8,8 +7,6 @@ import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
 
 expect class PlatformCodeAuthFlow: CodeAuthFlow, EndSessionFlow {
     override suspend fun startLoginFlow(request: AuthCodeRequest)
@@ -18,26 +15,6 @@ expect class PlatformCodeAuthFlow: CodeAuthFlow, EndSessionFlow {
     override val preferences: Preferences
 }
 
-@OptIn(ExperimentalContracts::class)
-internal fun <T> getErrorResult(responseUri: Url?): Result<T>? {
-    contract { returns(null) implies (responseUri != null) }
-    if (responseUri != null) {
-        if (responseUri.parameters.contains("error")) {
-            // error
-            return Result.failure(
-                OpenIdConnectException.AuthenticationFailure(
-                    message = responseUri.parameters.get(
-                        "error"
-                    ) ?: ""
-                )
-            )
-        }
-    } else {
-        return Result.failure(OpenIdConnectException.AuthenticationFailure(message = "No Uri in callback from browser (was ${responseUri})."))
-    }
-    return null
-}
-
 internal fun throwAuthenticationIfCancelled(result: WebAuthenticationFlowResult) {
     if (result is WebAuthenticationFlowResult.Cancelled) {
         throw OpenIdConnectException.AuthenticationCancelled()
diff --git a/oidc-appsupport/src/iosMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.ios.kt b/oidc-appsupport/src/iosMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.ios.kt
index eaa1a7bc..8b8cd129 100644
--- a/oidc-appsupport/src/iosMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.ios.kt
+++ b/oidc-appsupport/src/iosMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.ios.kt
@@ -2,10 +2,8 @@ package org.publicvalue.multiplatform.oidc.appsupport
 
 import kotlinx.coroutines.CancellableContinuation
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
-import org.publicvalue.multiplatform.oidc.OpenIdConnectException
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest
diff --git a/oidc-appsupport/src/jvmMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.jvm.kt b/oidc-appsupport/src/jvmMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.jvm.kt
index b7dedfff..57e60524 100644
--- a/oidc-appsupport/src/jvmMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.jvm.kt
+++ b/oidc-appsupport/src/jvmMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.jvm.kt
@@ -1,12 +1,12 @@
 package org.publicvalue.multiplatform.oidc.appsupport
 
-import io.ktor.http.*
+import io.ktor.http.Url
+import io.ktor.http.toURI
 import org.publicvalue.multiplatform.oidc.ExperimentalOpenIdConnect
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.OpenIdConnectException
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest
diff --git a/oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.wasmJs.kt b/oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.wasmJs.kt
index cba7acb8..59992870 100644
--- a/oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.wasmJs.kt
+++ b/oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.wasmJs.kt
@@ -4,7 +4,6 @@ import org.publicvalue.multiplatform.oidc.ExperimentalOpenIdConnect
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest
diff --git a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/OpenIdConnectException.kt b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/OpenIdConnectException.kt
index 6fc1e5b8..16f785d1 100644
--- a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/OpenIdConnectException.kt
+++ b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/OpenIdConnectException.kt
@@ -15,7 +15,7 @@ sealed class OpenIdConnectException(
 
     data class InvalidUrl(val url: String?, override val cause: Throwable? = null): OpenIdConnectException(message = "Invalid URL: $url", cause = cause)
     data class AuthenticationFailure(override val message: String, override val cause: Throwable? = null): OpenIdConnectException(message = "Authentication failed. $message", cause = cause)
-    data class AuthenticationCancelled(override val message: String = "Authentication cancelled"): OpenIdConnectException(message = "Authentication cancelled", cause = null)
+    data class AuthenticationCancelled(override val message: String = "Authentication cancelled"): OpenIdConnectException(message = message, cause = null)
     data class UnsuccessfulTokenRequest(
         override val message: String,
         val statusCode: HttpStatusCode,
diff --git a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/AuthCodeResult.kt b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/AuthCodeResult.kt
index 51c32d99..f36810e1 100644
--- a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/AuthCodeResult.kt
+++ b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/AuthCodeResult.kt
@@ -8,7 +8,6 @@ import kotlin.experimental.ExperimentalObjCName
 import kotlin.native.ObjCName
 
 typealias AuthCodeResponse = Result<AuthCodeResult>
-typealias EndSessionResponse = Result<Unit>
 
 /**
  * Result of an Auth Code Request
diff --git a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/CodeAuthFlow.kt b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/CodeAuthFlow.kt
index 978ce5bb..e8a6df9c 100644
--- a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/CodeAuthFlow.kt
+++ b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/flows/CodeAuthFlow.kt
@@ -5,7 +5,6 @@ import io.ktor.http.URLBuilder
 import io.ktor.http.Url
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.OpenIdConnectException
-import org.publicvalue.multiplatform.oidc.getError
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.preferences.clearOidcPreferences
 import org.publicvalue.multiplatform.oidc.preferences.getAuthRequest
@@ -61,6 +60,7 @@ interface CodeAuthFlow {
      * Should return the Authorization Code.
      */
     @Throws(CancellationException::class, OpenIdConnectException::class)
+    @Suppress("unused")
     suspend fun getAuthorizationCode(request: AuthCodeRequest): AuthCodeResponse {
         return try {
             preferences.setAuthRequest(request)
diff --git a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/preferences/Preferences.kt b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/preferences/Preferences.kt
index 2c255e6c..a66c7052 100644
--- a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/preferences/Preferences.kt
+++ b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/preferences/Preferences.kt
@@ -44,12 +44,12 @@ suspend fun Preferences.clearOidcPreferences() {
 }
 
 inline fun <reified T> Json.decodeFromStringOrNull(string: String): T? {
-    try {
-        return Json.decodeFromString<T>(string)
+    return try {
+        Json.decodeFromString<T>(string)
     } catch (e: Exception) {
         when (e) {
             is SerializationException, is IllegalArgumentException -> {
-                return null
+                null
             }
             else -> throw e
         }
diff --git a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/types/remote/AccessTokenResponse.kt b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/types/remote/AccessTokenResponse.kt
index 6a27feec..0c036647 100644
--- a/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/types/remote/AccessTokenResponse.kt
+++ b/oidc-core/src/commonMain/kotlin/org/publicvalue/multiplatform/oidc/types/remote/AccessTokenResponse.kt
@@ -15,7 +15,7 @@ import kotlin.time.ExperimentalTime
 @OptIn(ExperimentalObjCName::class, ExperimentalTime::class)
 @Serializable
 @ObjCName(swiftName = "AccessTokenResponse", name = "AccessTokenResponse", exact = true)
-data class AccessTokenResponse  constructor(
+data class AccessTokenResponse (
     /**
      * **Required**
      *
diff --git a/sample-app/android-app/build.gradle.kts b/sample-app/android-app/build.gradle.kts
index 54856aae..02d392a3 100644
--- a/sample-app/android-app/build.gradle.kts
+++ b/sample-app/android-app/build.gradle.kts
@@ -9,8 +9,7 @@ kotlin {
     sourceSets {
         val androidMain by getting {
             dependencies {
-                implementation(projects.shared)
-
+                implementation(projects.sampleApp.shared)
             }
         }
     }
diff --git a/sample-app/desktop-app/build.gradle.kts b/sample-app/desktop-app/build.gradle.kts
index 29ea04e3..8c073703 100644
--- a/sample-app/desktop-app/build.gradle.kts
+++ b/sample-app/desktop-app/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
         val jvmMain by getting  {
             dependencies {
                 implementation(compose.desktop.currentOs)
-                implementation(projects.shared)
+                implementation(projects.sampleApp.shared)
             }
         }
     }
diff --git a/sample-app/gradle.properties b/sample-app/gradle.properties
deleted file mode 100644
index 6d6f6631..00000000
--- a/sample-app/gradle.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-org.gradle.jvmargs=-Xmx3G -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
-org.gradle.caching=true
-org.gradle.configuration-cache=false
-
-android.useAndroidX=true
-
-#MPP
-kotlin.mpp.stability.nowarn=true
-kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.androidSourceSetLayoutVersion=2
-
-#Compose
-org.jetbrains.compose.experimental.uikit.enabled=true
diff --git a/sample-app/gradlew b/sample-app/gradlew
deleted file mode 100755
index 79a61d42..00000000
--- a/sample-app/gradlew
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 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.
-#
-
-##############################################################################
-#
-#   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/subprojects/plugins/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##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
-
-# 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
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# 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
-    which java >/dev/null 2>&1 || 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
-
-# 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=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=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" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    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
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# 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/sample-app/gradlew.bat b/sample-app/gradlew.bat
deleted file mode 100644
index 6689b85b..00000000
--- a/sample-app/gradlew.bat
+++ /dev/null
@@ -1,92 +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
-
-@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.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-: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/sample-app/settings.gradle.kts b/sample-app/settings.gradle.kts
deleted file mode 100644
index 5123c634..00000000
--- a/sample-app/settings.gradle.kts
+++ /dev/null
@@ -1,73 +0,0 @@
-includeBuild("../")
-
-pluginManagement {
-    includeBuild("../build-logic")
-
-    repositories {
-        mavenCentral()
-        google()
-        gradlePluginPortal()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-}
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-
-    // https://youtrack.jetbrains.com/issue/KT-68533/Kotlin-2.0-WasmJs-error-when-using-RepositoriesMode.FAILONPROJECTREPOS
-    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
-    repositories {
-        mavenCentral()
-        google {
-            content {
-                excludeGroup("com.yarnpkg")
-                excludeGroup("com.github.webassembly")
-                excludeGroup("org.nodejs")
-            }
-        }
-        exclusiveContent {
-            forRepository {
-                ivy("https://nodejs.org/dist/") {
-                    name = "Node Distributions at $url"
-                    patternLayout { artifact("v[revision]/[artifact](-v[revision]-[classifier]).[ext]") }
-                    metadataSources { artifact() }
-                    content { includeModule("org.nodejs", "node") }
-                }
-            }
-            filter { includeGroup("org.nodejs") }
-        }
-        exclusiveContent {
-            forRepository {
-                ivy("https://github.com/yarnpkg/yarn/releases/download") {
-                    name = "Yarn Distributions at $url"
-                    patternLayout { artifact("v[revision]/[artifact](-v[revision]).[ext]") }
-                    metadataSources { artifact() }
-                    content { includeModule("com.yarnpkg", "yarn") }
-                }
-            }
-            filter { includeGroup("com.yarnpkg") }
-        }
-        exclusiveContent {
-            forRepository {
-                ivy("https://github.com/WebAssembly/binaryen/releases/download") {
-                    name = "Binaryen Distributions at $url"
-                    patternLayout { artifact("version_[revision]/[module]-version_[revision]-[classifier].[ext]") }
-                    metadataSources { artifact() }
-                    content { includeModule("com.github.webassembly", "binaryen") }
-                }
-            }
-            filter { includeGroup("com.github.webassembly") }
-        }
-    }
-}
-
-rootProject.name = "sample-app"
-include(":shared")
-include(":android-app")
-include(":desktop-app")
-include(":wasm-js-app")
-include(":settings")
\ No newline at end of file
diff --git a/sample-app/settings/build.gradle.kts b/sample-app/settings/build.gradle.kts
index 86ec3a68..cdc21aca 100644
--- a/sample-app/settings/build.gradle.kts
+++ b/sample-app/settings/build.gradle.kts
@@ -14,7 +14,7 @@ kotlin {
         configureWasmTarget()
         val commonMain by getting {
             dependencies {
-                implementation("io.github.kalinjul.kotlin.multiplatform:oidc-core")
+                implementation(projects.oidcCore)
                 implementation(libs.russhwolf.multiplatformsettings)
 
                 api(libs.kotlinx.serialization.json)
diff --git a/sample-app/shared/build.gradle.kts b/sample-app/shared/build.gradle.kts
index 3a3aec0b..5beed541 100644
--- a/sample-app/shared/build.gradle.kts
+++ b/sample-app/shared/build.gradle.kts
@@ -28,8 +28,8 @@ kotlin {
                 implementation(libs.circuit.runtime)
                 implementation(libs.circuit.foundation)
                 implementation(libs.circuit.retained)
-                api("io.github.kalinjul.kotlin.multiplatform:oidc-appsupport")
-                implementation(projects.settings)
+                api(projects.oidcAppsupport)
+                implementation(projects.sampleApp.settings)
                 implementation(libs.kotlinx.serialization.json)
             }
         }
@@ -38,7 +38,7 @@ kotlin {
                 api(libs.androidx.activity.compose)
                 implementation(libs.androidx.appcompat)
                 api(libs.androidx.core.ktx)
-                api("io.github.kalinjul.kotlin.multiplatform:oidc-okhttp4")
+                api(projects.oidcOkhttp4)
                 api(libs.okhttp)
             }
         }
diff --git a/sample-app/wasm-js-app/build.gradle.kts b/sample-app/wasm-js-app/build.gradle.kts
index cb4c997e..3717f0a5 100644
--- a/sample-app/wasm-js-app/build.gradle.kts
+++ b/sample-app/wasm-js-app/build.gradle.kts
@@ -36,7 +36,7 @@ kotlin {
                 implementation(compose.components.resources)
                 implementation(compose.components.uiToolingPreview)
 
-                implementation(projects.shared)
+                implementation(projects.sampleApp.shared)
             }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5bd3f45a..0e492a49 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -59,6 +59,11 @@ include(":oidc-appsupport")
 include(":oidc-tokenstore")
 include(":oidc-okhttp4")
 include(":oidc-ktor")
+include(":sample-app:shared")
+include(":sample-app:android-app")
+include(":sample-app:desktop-app")
+include(":sample-app:wasm-js-app")
+include(":sample-app:settings")
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 // https://docs.gradle.org/8.3/userguide/configuration_cache.html#config_cache:stable