Moving things around a bit more, so it'll be easier to extend, and in a way that makes sense