Re-named folders for consistency.