File renaming

Renamed files and condensed code as required for submission