Reorganize directory structure and update podfile