Refactoring the multi-project stuff.
More refactoring of multi-project support.