Split CommandArgument & Command into separate files