Inital Reorg

Starting a customary cleanup since the package has grown a bit.  Maked a
TODO list.