Renamed existing option parsers for some further refactoring.
Some initial option parser refactoring.
Refactored options and how they are parsed so they can now apply to more model types consistently.