Reorganize for new source: official