Moved MaterialCost into Material, left price calculations in Price