Start source tree (final, I hope!) restructuration. Part 1/X