moved Event,FieldIdentifier into separate module