Reformat dirs
Add exercise 1.6