Updated podspec and folder structure