Moved more attributes to new style
reordered definitions (without no actual change)
clarification
Use _Defs content model data where possible
Drop uri_info for now; it might be reimplemented later