Move command line options into a separate package