Cleaning up the updates

Cleaning up the updates.  Nothing huge changed here but a renaming of
the files.
Cleanup

More cleaning and renaming files.
Totally changed all files around

Totally renamed and redid stuff.