Make disk file structure mirror Xcode project structure
Merge branch 'master' into power-ups