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 97%
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..6d38dbb 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/argument/Argument.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/argument/Argument.kt
@@ -1,4 +1,4 @@
-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
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..55ad40f 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
@@ -1,12 +1,12 @@
 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.option.Option
 import com.infendro.cli.error.build.*
 import com.infendro.cli.parser.Parser
 import com.infendro.cli.util.Regex
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/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/build/DuplicateArgument.kt b/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateArgument.kt
index 5f3bbab..17ceb79 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateArgument.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateArgument.kt
@@ -1,6 +1,6 @@
 package com.infendro.cli.error.build
 
-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/DuplicateOption.kt b/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt
index 52f3c3b..5124de8 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt
@@ -1,6 +1,6 @@
 package com.infendro.cli.error.build
 
-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/run/InvalidArgumentCount.kt b/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt
index 6ac72f7..5073a93 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt
@@ -1,6 +1,6 @@
 package com.infendro.cli.error.run
 
-import com.infendro.cli.command.argument.Argument
+import com.infendro.cli.argument.Argument
 
 class InvalidArgumentCount(
     val argument: Argument<*>,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt b/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt
index 848cdb8..c80c0f8 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt
@@ -1,6 +1,6 @@
 package com.infendro.cli.error.run
 
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.option.Option
 
 class InvalidOptionCount(
     val option: Option<*>,
diff --git a/src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt b/src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt
index 49b1013..11b6f41 100644
--- a/src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt
@@ -1,6 +1,6 @@
 package com.infendro.cli.error.run
 
-import com.infendro.cli.command.option.Option
+import com.infendro.cli.option.Option
 
 class MissingOptionValue(
     val option: Option<*>,
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 98%
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..69c806d 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/option/Option.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/option/Option.kt
@@ -1,4 +1,4 @@
-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
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.*