Re-organize sources.