Renamed files, updated references.