Renamed folder and references