Merge pull request #3 from radar/cli-dir

Move CLI stuff into its own dir