I like it … I’d just like to get #30 and #35 in first as they modify xibs – and I suspect we may end up with a merge conflict if the files are moved away first.

I don't think it will, it's just a rename and git handles that just fine. I actually merged both of those into this one without issue (apart from the fact that submodules are really funny).

BTW, you might have to git submodule deinit --all/git submodule init --update --recursive at least once before the dust settles.

Merging in ! For the record, I have pushed a stage-menu-shuffled branch in my repo (in case it's easier / for reference).