renamed exception, merged parser into a single object