Reorganizing the project for cleaner CocoaPods integration
Get rid of the goto