issue #2905: [iOS Mac] Updating template.
Merge pull request #3958 from dumganhar/iss2905-folder-structure

issue #2905: [iOS Mac] Updating template.