Restructure directories, update podspec accordingly