diff --git a/src/commonMain/kotlin/com/infendro/cli/command/Command.kt b/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
index 9159aa9..bd438c7 100644
--- a/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/Command.kt
@@ -1,6 +1,6 @@
 package com.infendro.cli.command
 
-import com.infendro.cli.Execution
+import com.infendro.cli.command.Execution
 import com.infendro.cli.argument.Argument
 import com.infendro.cli.exception.build.*
 import com.infendro.cli.exception.run.ArgumentCountException
diff --git a/src/commonMain/kotlin/com/infendro/cli/Execution.kt b/src/commonMain/kotlin/com/infendro/cli/command/Execution.kt
similarity index 80%
rename from src/commonMain/kotlin/com/infendro/cli/Execution.kt
rename to src/commonMain/kotlin/com/infendro/cli/command/Execution.kt
index a4f8a5a..8427dde 100644
--- a/src/commonMain/kotlin/com/infendro/cli/Execution.kt
+++ b/src/commonMain/kotlin/com/infendro/cli/command/Execution.kt
@@ -1,7 +1,6 @@
-package com.infendro.cli
+package com.infendro.cli.command
 
-import com.infendro.cli.argument.Argument.*
-import com.infendro.cli.command.Command
+import com.infendro.cli.argument.Argument
 import kotlin.reflect.KProperty
 
 class Execution(
@@ -25,7 +24,7 @@ class Execution(
             .name
     }
 
-    operator fun <T> Single<T>.getValue(
+    operator fun <T> Argument.Single<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
     ): T {
@@ -36,7 +35,7 @@ class Execution(
         )
     }
 
-    operator fun <T> SingleOrElse<T>.getValue(
+    operator fun <T> Argument.SingleOrElse<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
     ): T {
@@ -46,7 +45,7 @@ class Execution(
             ?: other
     }
 
-    operator fun <T> SingleOrNull<T>.getValue(
+    operator fun <T> Argument.SingleOrNull<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
     ): T? {
@@ -55,7 +54,7 @@ class Execution(
             ?.let { parser.parse(it.value) }
     }
 
-    operator fun <T> Multiple<T>.getValue(
+    operator fun <T> Argument.Multiple<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
     ): List<T> {
@@ -63,4 +62,4 @@ class Execution(
             .filter { it.name == name }
             .map { parser.parse(it.value) }
     }
-}
+}
\ No newline at end of file