Fixes to build errors on iOS 6.1

I needed to change the directory structure a little because I was having trouble with git submodules and the brackets in the path.

I'm also working on a CocoaPods podspec.