Changed project structure, fixed podspec