Move unicode from priv/ to unicode/