New folder structure.  Solutions 1.5 and 1.6.