Renamed some files, deleted unused ones