removed primitive
added Ingredient type
Fixed craft for recent changes