File cleanup

Renamed files to make more sense.  Removed dead files.