Renamed files and updated references