re-organize sources