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

File structure fixes
Merge branch 'master' into joshuaBranch
pbx change