Podspec and some refactoring.
Updated podspec.