Podspec update
Reorganize