Merge pull request #538 from ianmcorvidae/organize-args

refactoring: Start adding some more structure to the arguments for the CLI

Author: ianmcorvidae