Major refactoring to include different projects under the same tree