Renamed old folders for consistency.