Renamed files and finished cleaning up code.