Consolidation and polish

Consolidating everything to one file and polishing.  changed the way
parameters are passed.
changing name