Moved some source files around to be new cocoa pods compatible
Update Podspec