Update with versions/ directory in place, and removing tests