diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
deleted file mode 100644
index 4885477..0000000
--- a/.gitea/workflows/main.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-
-env:
-  INFENDRO__TOKEN: ${{ secrets.TOKEN }}
-
-jobs:
-  publish:
-    runs-on: linux
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/cache/restore@v4
-        with:
-          key: gradle
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-            ~/.konan/
-
-      - uses: actions/setup-java@v4
-        with:
-          java-version: '24'
-          distribution: 'temurin'
-
-      - run: ./gradlew publish
-
-      - uses: actions/cache/save@v4
-        with:
-          key: gradle
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-            ~/.konan/
diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
new file mode 100644
index 0000000..dad1306
--- /dev/null
+++ b/.gitea/workflows/publish.yaml
@@ -0,0 +1,47 @@
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  publish:
+    runs-on: linux
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '24'
+          distribution: 'temurin'
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          key: gradle-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: gradle
+          path: |
+            ~/.gradle/caches/
+            ~/.gradle/wrapper/
+
+      - name: Cache Konan
+        uses: actions/cache@v4
+        with:
+          key: konan-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: konan
+          path: |
+            ~/.konan/
+
+      - name: Cache Node
+        uses: actions/cache@v4
+        with:
+          key: node-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: node
+          path: |
+            ~/.gradle/nodejs
+            ~/.gradle/yarn
+
+      - name: Publish
+        run: ./gradlew publish
+        env:
+          INFENDRO__TOKEN: ${{ secrets.TOKEN }}
diff --git a/README.md b/README.md
index 67ec8e5..7744887 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,6 @@
 
 `cli-kt` is a Kotlin Multiplatform framework for implementing terminal applications.
 
-## Targets
-
-| Target           | Status        |
-|------------------|---------------|
-| JVM              | Supported     |
-| JavaScript       | Supported     |
-| Native (Linux)   | Supported     |
-| Native (Windows) | Not Supported |
-
 ## Installation
 
 Add the following to your `build.gradle.kts`.
@@ -21,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.infendro:cli:1.4.0")
+    implementation("com.infendro:cli:1.4.1")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 9df02c6..7d00784 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,11 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
 import com.infendro.plugin.infendro
 import com.infendro.plugin.token
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 group = "com.infendro"
-version = "1.4.0"
+version = "1.4.1"
 
 plugins {
     alias(libs.plugins.infendro)
@@ -12,10 +15,14 @@ plugins {
 
 kotlin {
     jvm()
-    js {
-        nodejs()
-    }
     linuxX64()
+    linuxArm64()
+    mingwX64()
+    macosX64()
+    macosArm64()
+    js { nodejs() }
+    wasmJs { nodejs() }
+    wasmWasi { nodejs() }
 
     repositories {
         mavenCentral()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1139889..1896437 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 infendro = "1.0.0"
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 
 [plugins]
 infendro = { id = "com.infendro.plugin", version.ref = "infendro" }
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/argument/Argument.kt b/src/commonMain/kotlin/com/infendro/cli/argument/Argument.kt
similarity index 92%
rename from src/commonMain/kotlin/com/infendro/cli/command/argument/Argument.kt
rename to src/commonMain/kotlin/com/infendro/cli/argument/Argument.kt
index 542e721..15f137c 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/argument/Argument.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/argument/Argument.kt
@@ -1,7 +1,7 @@
-package com.infendro.cli.command.argument
+package com.infendro.cli.argument
 
-import com.infendro.cli.error.build.InvalidArgumentName
-import com.infendro.cli.error.build.InvalidRange
+import com.infendro.cli.exception.InvalidArgumentName
+import com.infendro.cli.exception.InvalidRange
 import com.infendro.cli.parser.Parser
 import com.infendro.cli.util.Regex.ARGUMENT
 
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/argument/ArgumentFactory.kt b/src/commonMain/kotlin/com/infendro/cli/argument/ArgumentFactory.kt
similarity index 96%
rename from src/commonMain/kotlin/com/infendro/cli/command/argument/ArgumentFactory.kt
rename to src/commonMain/kotlin/com/infendro/cli/argument/ArgumentFactory.kt
index 38fcf6e..4ecb7fd 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/argument/ArgumentFactory.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/argument/ArgumentFactory.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.command.argument
+package com.infendro.cli.argument
 
 import com.infendro.cli.parser.*
 
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/Command.kt b/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
index da59ca0..88b8c85 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
@@ -1,13 +1,13 @@
 package com.infendro.cli.command
 
 import com.infendro.cli.Dsl
-import com.infendro.cli.command.argument.Argument
+import com.infendro.cli.argument.Argument
 import com.infendro.cli.command.context.Context
 import com.infendro.cli.command.context.ContextParser
 import com.infendro.cli.command.help.DefaultHelpRenderer
 import com.infendro.cli.command.help.HelpRenderer
-import com.infendro.cli.command.option.Option
-import com.infendro.cli.error.build.*
+import com.infendro.cli.exception.*
+import com.infendro.cli.option.Option
 import com.infendro.cli.parser.Parser
 import com.infendro.cli.util.Regex
 
@@ -33,7 +33,7 @@ sealed class Command private constructor(
                 if (help != null) print(help)
             }
             is ContextParser.Result.Failure -> {
-                println("error: ${result.failure.message}")
+                println("error: ${result.error.message}")
                 val command = result.path.last()
                 val help = command.renderer.render(result.path)
                 if (help != null) print("\n$help")
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/context/Context.kt b/src/commonMain/kotlin/com/infendro/cli/command/context/Context.kt
index 9f1c866..e133305 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/context/Context.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/context/Context.kt
@@ -2,8 +2,8 @@ package com.infendro.cli.command.context
 
 import com.infendro.cli.Dsl
 import com.infendro.cli.command.Command
-import com.infendro.cli.command.argument.Argument
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.argument.Argument
+import com.infendro.cli.option.Option
 import kotlin.reflect.KProperty
 
 @Dsl
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/context/ContextParser.kt b/src/commonMain/kotlin/com/infendro/cli/command/context/ContextParser.kt
index 9cdde49..605c1bf 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/context/ContextParser.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/context/ContextParser.kt
@@ -1,7 +1,7 @@
 package com.infendro.cli.command.context
 
 import com.infendro.cli.command.Command
-import com.infendro.cli.error.run.*
+import com.infendro.cli.error.*
 import com.infendro.cli.parser.Parser
 
 internal class ContextParser(
@@ -19,13 +19,13 @@ internal class ContextParser(
 
         data class Failure(
             val path: List<Command>,
-            val failure: RuntimeFailure,
+            val error: Error,
         ) : Result()
     }
 
     private fun success(context: Context) = Result.Success(context)
     private fun help(path: List<Command>) = Result.Help(path)
-    private fun failure(path: List<Command>, exception: RuntimeFailure) = Result.Failure(path, exception)
+    private fun failure(path: List<Command>, error: Error) = Result.Failure(path, error)
 
     private var index = 0
     private val current: String
@@ -63,7 +63,7 @@ internal class ContextParser(
             if (cmd is Command.Fallback<*>) {
                 val value = when (val result = cmd.parser.parse(current)) {
                     is Parser.Result.Success<*> -> result.value
-                    is Parser.Result.Failure<*> -> return failure(path, result.failure)
+                    is Parser.Result.Failure<*> -> return failure(path, result.error)
                 }
                 commands[cmd.key] = value
             }
@@ -91,7 +91,7 @@ internal class ContextParser(
 
                     val value = when (val result = argument.parser.parse(current)) {
                         is Parser.Result.Success<*> -> result.value
-                        is Parser.Result.Failure<*> -> return failure(path, result.failure)
+                        is Parser.Result.Failure<*> -> return failure(path, result.error)
                     }
                     arguments[argument]!! += value
                     argumentCount++
@@ -141,7 +141,7 @@ internal class ContextParser(
                             text != null ->
                                 when (val result = option.parser.parse(text)) {
                                     is Parser.Result.Success<*> -> result.value
-                                    is Parser.Result.Failure<*> -> return failure(path, result.failure)
+                                    is Parser.Result.Failure<*> -> return failure(path, result.error)
                                 }
                             option.flag -> option.fallback!!
                             else -> return failure(path, MissingOptionValue(option))
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/help/DefaultHelpRenderer.kt b/src/commonMain/kotlin/com/infendro/cli/command/help/DefaultHelpRenderer.kt
index 79febeb..e011648 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/help/DefaultHelpRenderer.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/help/DefaultHelpRenderer.kt
@@ -1,8 +1,8 @@
 package com.infendro.cli.command.help
 
 import com.infendro.cli.command.Command
-import com.infendro.cli.command.argument.Argument
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.argument.Argument
+import com.infendro.cli.option.Option
 import kotlin.reflect.KClass
 
 object DefaultHelpRenderer : HelpRenderer {
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/Error.kt b/src/commonMain/kotlin/com/infendro/cli/error/Error.kt
new file mode 100644
index 0000000..a3b6b26
--- /dev/null
+++ b/src/commonMain/kotlin/com/infendro/cli/error/Error.kt
@@ -0,0 +1,5 @@
+package com.infendro.cli.error
+
+abstract class Error {
+    abstract val message: String
+}
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt b/src/commonMain/kotlin/com/infendro/cli/error/InvalidArgumentCount.kt
similarity index 82%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/InvalidArgumentCount.kt
index 6ac72f7..3149682 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/InvalidArgumentCount.kt
@@ -1,11 +1,11 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
-import com.infendro.cli.command.argument.Argument
+import com.infendro.cli.argument.Argument
 
 class InvalidArgumentCount(
     val argument: Argument<*>,
     val count: Int,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() {
             val expected = when {
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt b/src/commonMain/kotlin/com/infendro/cli/error/InvalidOptionCount.kt
similarity index 82%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/InvalidOptionCount.kt
index 848cdb8..8a4acfc 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/InvalidOptionCount.kt
@@ -1,11 +1,11 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.option.Option
 
 class InvalidOptionCount(
     val option: Option<*>,
     val count: Int,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() {
             val expected = when {
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidValue.kt b/src/commonMain/kotlin/com/infendro/cli/error/InvalidValue.kt
similarity index 79%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/InvalidValue.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/InvalidValue.kt
index ecf5d99..ab5e430 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidValue.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/InvalidValue.kt
@@ -1,11 +1,11 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
 import kotlin.reflect.KClass
 
 class InvalidValue(
     val value: String,
     val type: KClass<*>,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() = """"$value" cannot be converted to ${type.simpleName ?: "Unknown"}."""
 }
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/MalformedOption.kt b/src/commonMain/kotlin/com/infendro/cli/error/MalformedOption.kt
similarity index 69%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/MalformedOption.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/MalformedOption.kt
index 097db35..98da6a5 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/MalformedOption.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/MalformedOption.kt
@@ -1,8 +1,8 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
 class MalformedOption(
     val option: String,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() = """Malformed option "$option"."""
 }
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt b/src/commonMain/kotlin/com/infendro/cli/error/MissingOptionValue.kt
similarity index 60%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/MissingOptionValue.kt
index 49b1013..ae2b086 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/MissingOptionValue.kt
@@ -1,10 +1,10 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.option.Option
 
 class MissingOptionValue(
     val option: Option<*>,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() = """No value provided for option "${option.name}"."""
 }
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/UnexpectedArgument.kt b/src/commonMain/kotlin/com/infendro/cli/error/UnexpectedArgument.kt
similarity index 71%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/UnexpectedArgument.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/UnexpectedArgument.kt
index 960d2d2..cf26ec8 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/UnexpectedArgument.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/UnexpectedArgument.kt
@@ -1,8 +1,8 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
 class UnexpectedArgument(
     val argument: String,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() = """Unexpected argument "$argument"."""
 }
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/UnknownCommand.kt b/src/commonMain/kotlin/com/infendro/cli/error/UnknownCommand.kt
similarity index 92%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/UnknownCommand.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/UnknownCommand.kt
index 643c51c..4429de2 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/UnknownCommand.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/UnknownCommand.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
 import com.infendro.cli.command.Command
 import com.infendro.cli.util.distance
@@ -8,7 +8,7 @@ import kotlin.math.min
 class UnknownCommand(
     val command: Command,
     val name: String,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() = buildString {
             val suggestion = command.commands
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/UnknownOption.kt b/src/commonMain/kotlin/com/infendro/cli/error/UnknownOption.kt
similarity index 92%
rename from src/commonMain/kotlin/com/infendro/cli/error/run/UnknownOption.kt
rename to src/commonMain/kotlin/com/infendro/cli/error/UnknownOption.kt
index cb01a69..d697e36 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/UnknownOption.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/UnknownOption.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.run
+package com.infendro.cli.error
 
 import com.infendro.cli.command.Command
 import com.infendro.cli.util.distance
@@ -8,7 +8,7 @@ import kotlin.math.min
 class UnknownOption(
     val command: Command,
     val name: String,
-) : RuntimeFailure() {
+) : Error() {
     override val message: String
         get() = buildString {
             val suggestion = command.options
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/BuildException.kt b/src/commonMain/kotlin/com/infendro/cli/error/build/BuildException.kt
deleted file mode 100644
index 0c1af10..0000000
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/BuildException.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.infendro.cli.error.build
-
-abstract class BuildException : Exception()
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/RuntimeFailure.kt b/src/commonMain/kotlin/com/infendro/cli/error/run/RuntimeFailure.kt
deleted file mode 100644
index a027c36..0000000
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/RuntimeFailure.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.infendro.cli.error.run
-
-abstract class RuntimeFailure {
-    abstract val message: String
-}
diff --git a/src/commonMain/kotlin/com/infendro/cli/exception/BuildException.kt b/src/commonMain/kotlin/com/infendro/cli/exception/BuildException.kt
new file mode 100644
index 0000000..57982c1
--- /dev/null
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/BuildException.kt
@@ -0,0 +1,5 @@
+package com.infendro.cli.exception
+
+abstract class BuildException : Exception() {
+    abstract override val message: String
+}
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateArgument.kt b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateArgument.kt
similarity index 66%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateArgument.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/DuplicateArgument.kt
index 5f3bbab..d8b285d 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateArgument.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateArgument.kt
@@ -1,6 +1,6 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
-import com.infendro.cli.command.argument.Argument
+import com.infendro.cli.argument.Argument
 
 class DuplicateArgument(
     val argument: Argument<*>,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateCommand.kt b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateCommand.kt
similarity index 84%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateCommand.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/DuplicateCommand.kt
index 4919bb0..a33651e 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateCommand.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateCommand.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 import com.infendro.cli.command.Command
 
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateExecute.kt b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateExecute.kt
similarity index 77%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateExecute.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/DuplicateExecute.kt
index f52c38d..335bff9 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateExecute.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateExecute.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class DuplicateExecute : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateOption.kt
similarity index 66%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/DuplicateOption.kt
index 52f3c3b..c56bd1b 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateOption.kt
@@ -1,6 +1,6 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.option.Option
 
 class DuplicateOption(
     val option: Option<*>,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateRenderer.kt b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateRenderer.kt
similarity index 76%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateRenderer.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/DuplicateRenderer.kt
index 347b803..492bb3d 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateRenderer.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/DuplicateRenderer.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class DuplicateRenderer : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentName.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidArgumentName.kt
similarity index 81%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentName.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidArgumentName.kt
index 8a9a3d5..43b3ea8 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentName.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidArgumentName.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidArgumentName(
     val name: String,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentOrder.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidArgumentOrder.kt
similarity index 77%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentOrder.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidArgumentOrder.kt
index f5b4b52..119ded7 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentOrder.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidArgumentOrder.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidArgumentOrder : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandName.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidCommandName.kt
similarity index 81%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandName.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidCommandName.kt
index e1fd029..109f827 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandName.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidCommandName.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidCommandName(
     val name: String,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandOrder.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidCommandOrder.kt
similarity index 77%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandOrder.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidCommandOrder.kt
index eb65123..81b2b19 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandOrder.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidCommandOrder.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidCommandOrder : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidFallback.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidFallback.kt
similarity index 76%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidFallback.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidFallback.kt
index ac0c01a..b897c1c 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidFallback.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidFallback.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidFallback : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidOptionName.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidOptionName.kt
similarity index 80%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidOptionName.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidOptionName.kt
index 1eeaa0d..34bc6a8 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidOptionName.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidOptionName.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidOptionName(
     val name: String,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidRange.kt b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidRange.kt
similarity index 75%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/InvalidRange.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/InvalidRange.kt
index f95e8df..31c1d50 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/InvalidRange.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/InvalidRange.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class InvalidRange : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/build/MissingOptionName.kt b/src/commonMain/kotlin/com/infendro/cli/exception/MissingOptionName.kt
similarity index 76%
rename from src/commonMain/kotlin/com/infendro/cli/error/build/MissingOptionName.kt
rename to src/commonMain/kotlin/com/infendro/cli/exception/MissingOptionName.kt
index a7997fd..4386853 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/MissingOptionName.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/exception/MissingOptionName.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.error.build
+package com.infendro.cli.exception
 
 class MissingOptionName : BuildException() {
     override val message: String
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/option/Option.kt b/src/commonMain/kotlin/com/infendro/cli/option/Option.kt
similarity index 91%
rename from src/commonMain/kotlin/com/infendro/cli/command/option/Option.kt
rename to src/commonMain/kotlin/com/infendro/cli/option/Option.kt
index 8b2aca0..5c5718b 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/option/Option.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/option/Option.kt
@@ -1,8 +1,8 @@
-package com.infendro.cli.command.option
+package com.infendro.cli.option
 
-import com.infendro.cli.error.build.InvalidOptionName
-import com.infendro.cli.error.build.InvalidRange
-import com.infendro.cli.error.build.MissingOptionName
+import com.infendro.cli.exception.InvalidOptionName
+import com.infendro.cli.exception.InvalidRange
+import com.infendro.cli.exception.MissingOptionName
 import com.infendro.cli.parser.Parser
 import com.infendro.cli.util.Regex.OPTION
 
diff --git a/src/commonMain/kotlin/com/infendro/cli/command/option/OptionFactory.kt b/src/commonMain/kotlin/com/infendro/cli/option/OptionFactory.kt
similarity index 97%
rename from src/commonMain/kotlin/com/infendro/cli/command/option/OptionFactory.kt
rename to src/commonMain/kotlin/com/infendro/cli/option/OptionFactory.kt
index fea7dd1..1c3cbaa 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/option/OptionFactory.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/option/OptionFactory.kt
@@ -1,4 +1,4 @@
-package com.infendro.cli.command.option
+package com.infendro.cli.option
 
 import com.infendro.cli.parser.*
 
diff --git a/src/commonMain/kotlin/com/infendro/cli/parser/Parser.kt b/src/commonMain/kotlin/com/infendro/cli/parser/Parser.kt
index 257f2f0..0eb92dd 100644
--- a/src/commonMain/kotlin/com/infendro/cli/parser/Parser.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/parser/Parser.kt
@@ -1,7 +1,7 @@
 package com.infendro.cli.parser
 
-import com.infendro.cli.error.run.InvalidValue
-import com.infendro.cli.error.run.RuntimeFailure
+import com.infendro.cli.error.Error
+import com.infendro.cli.error.InvalidValue
 import kotlin.reflect.KClass
 
 abstract class Parser<T : Any>(
@@ -13,7 +13,7 @@ abstract class Parser<T : Any>(
         ) : Result<T>()
 
         data class Failure<T : Any>(
-            val failure: RuntimeFailure,
+            val error: Error,
         ) : Result<T>()
     }
 
diff --git a/src/commonMain/kotlin/com/infendro/cli/util/Distance.kt b/src/commonMain/kotlin/com/infendro/cli/util/Distance.kt
index b11ca6b..46977f2 100644
--- a/src/commonMain/kotlin/com/infendro/cli/util/Distance.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/util/Distance.kt
@@ -3,7 +3,13 @@ package com.infendro.cli.util
 internal const val threshold = 2
 
 /**
- * Damerau-Levenshtein string distance
+ * Calculates the Damerau-Levenshtein distance between two strings.
+ *
+ * The distance is the minimum number of operations (insertion, deletion, substitution, and transposition) required to transform one string into another.
+ *
+ * @param a The source string.
+ * @param b The target string.
+ * @return The minimum number of operations to transform [a] into [b].
  */
 internal fun distance(a: String, b: String): Int {
     if (a == b) return 0