Moving stuff around, cleaning things up a bit.