Rename folders to be more descriptive.