Initial dist subtree commit
Changed all XMP tags to spans