Move things around for v1.0.0