Sources rearranged into packages