Reorganization of the package

Basic reorganization/refactor.  Includes some updates to the command line.