reorganise sources