Renaming folders for clarity.