Corrected pbxproj file and simplified directory structure. Not including pbxproj file in this commit to hopefully avoid parse issue