Renamed a bunch of files and cleaned them up