better organisation of the source tree is completed