Rearrange all the things. This really deserves a major version bump but then I'd be starting at 2.0, but npm won't let me re-publish 1.0...