Clean up
Renamed
Added public link