restructure for clarity.  Getting ready to release 0.2.0