This reverts commit 031e561ce8.
031e561ce8
This makes sure the on-disk project structure matches the tree view shown in Xcode.