Reorganize sources