Moving stuff around for release.