Moved some files into Xcode groups