Rearranging project structure to build and test both iOS and OSX.