rearrange options
Release v2.0.0