reorg stargazed file hierarchy, match up 1:1 to Xcode groups