refactoring (sources+imports)