reorganized and fixed group structure
added iri format (URI reference)