Source reorganization