Move opts module back into command.