Renamed rest files for better names.