Move things around in the README to make it more consistent