Organization

Re-organizing the CLI from one file to multiple grouped files. My next step is to go through and clean things up to be in a standard format.