Added compatibility with OSX
Updated Xcode project for new directory structure