Changes needed for including sub projects

Exactly my thinking : I can go either way, depending on majority opinion.