re-organize around conductor class