Renamed folder and foles + updates