Refactoring - Simplify Option class
Minor package refactoring + Generic Parser in progress