Re-organize files to fit xcodeproj for now