Changes needed for including sub projects

Keeping it still for  backward compatibility? It breaks client code directly after update, but of course ensures quick adaption.