fix source structure