Renamed folder, and small edits