MOD: refactor source tree