When that happens, it should be fairly easy to go from the multi-vault structure that we have now (in one folder) and split them out into separate folders.