integrated new parser, moved types to appropriate module