Reorganized and upgraded the new Inputparser.