Updated Output Directory and Intermediate Directory.  Also, updated
directory structure for cpp files.