Redo the folder structure so the file system representation matches Xcode groups
Finishing folder migration