renaming folders for consistency