reorganizing sources into initial modules