Leaving the folders where they are is actually easier programatically, and almost as tidy (they all turn up together alphabetically). I also think it’s easier to explain. So I’m not really convinced to throw them all into one folder, as satisfying as that may be.
