Update class mappings for Yosemite and a small project reorg.