Update build, move files around, and clean up