Move some more modules over. Bump version.