finalize refactoring of unicode.xxx.yyy.zzz