More cleanup, moving around scripts.