This was done over 2 commits because git becomes extremely confused when adding a new submodule in a directory with the same name as one which was just deleted
citra(6)