Project reorganization
Update podspec