Bring in reorganization of repository

Incorporates numerous fixes, in preparation for a Fall Quarter release.