Full refactoring of Parser class and parsers

Change-Id: I2eda37d8e43de24e8ffaea62ee87280fe39395dc