Reorganised the metadataDefinition directory so it is inline with the other modules