Changed source structure.