Separate exercise 6 into smaller exercises and reordered content.