More moving things around, updating, and clean up