Renamed some folders, fixed links