Changed names of *Type.java to *Types.java
Changed IngrdientAmountType.java to MeasurementType.java and removed YieldType.java since same values were being used in MesurementType.java