Reorganize directories.  Finish problem 4.