Moved ingredient parsing to it's own class and changed format of ingredient result