Reorganized files in filesystem to match groups in Xcode