Renamed files and class