More pbxproj merges
Merge pull request #7 from cameronklein/moreclasses

File structure fixes