Renamed files as per the classes