Reorganized source structure