Move some things, clean some things.