Version 3.0.0: Re-arrange command line options