Some more new stuff, and more logical homes for things.