Package command line options into a structure
Updates #6 by adding support for file bookmarks