More cleanup and re-org.