src dir restructured
Merge branch 'master' of https://www.github.com/gto76/comp