Re-order the readme template, regenerate readme