Move members into their own definition