Move options together.
Update readme