Renamed cls files and fixed references