Cleaned up file structure

Deleted old files.  Renamed files to conventions