Move stuff around, more consistency