Changes needed for including sub projects

+1 only in one place