Rename folders for better file structure