Organize and rename some exercises