Reorganising sources, first step.