WIP: Refactor command options to a folder