More clean-up and moving things.