Moved command line parser to own package