re-organize a bunch