Re-org things a bit more.