Moved ingredient code.  Added data and tests to work on ingredient parsing.