Changes needed for including sub projects

done.