diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 44c0bec27..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-* text eol=LF
-*.ttf binary
diff --git a/.travis.yml b/.travis.yml
index 134b7af4c..5bd63534e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ install:
 - npm install --global esy@0.3.0
 - esy install
 script:
-- travis_wait 40 esy build
+- esy build
 cache:
     timeout: 360
     directories:
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..e5cc31c6d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,23 @@
+### `esy` build status
+[![Build status](https://ci.appveyor.com/api/projects/status/26jfwm55wk9t6w4j/branch/esy?svg=true)](https://ci.appveyor.com/project/bryphe/esy-harfbuzz/branch/esy)
+[![Build Status](https://travis-ci.org/bryphe/esy-harfbuzz.svg?branch=esy)](https://travis-ci.org/bryphe/esy-harfbuzz)
+
+ -----------
+
+[![Build Status](https://travis-ci.org/harfbuzz/harfbuzz.svg)](https://travis-ci.org/harfbuzz/harfbuzz)
+[![Build status](https://ci.appveyor.com/api/projects/status/0t0flrxpstj9lb9w?svg=true)](https://ci.appveyor.com/project/harfbuzz/harfbuzz)
+[![CircleCI](https://circleci.com/gh/harfbuzz/harfbuzz.svg?style=svg)](https://circleci.com/gh/harfbuzz/harfbuzz)
+[![Coverity](https://img.shields.io/coverity/scan/5450.svg)](https://scan.coverity.com/projects/behdad-harfbuzz)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f17f1708783c447488bc8dd317150eaa)](https://app.codacy.com/app/behdad/harfbuzz)
+[![Coverage Status](https://img.shields.io/coveralls/harfbuzz/harfbuzz.svg)](https://coveralls.io/r/harfbuzz/harfbuzz)
+[ABI Tracker](http://abi-laboratory.pro/tracker/timeline/harfbuzz/)
+
+This is HarfBuzz, a text shaping library.
+
+For bug reports, mailing list, and other information please visit:
+
+  http://harfbuzz.org/
+
+For license information, see the file COPYING.
+
+Documentation: https://harfbuzz.github.io
diff --git a/esy/Roboto-Regular.ttf b/esy/Roboto-Regular.ttf
new file mode 100644
index 000000000..d0db3dc03
Binary files /dev/null and b/esy/Roboto-Regular.ttf differ
diff --git a/esy/build.sh b/esy/build.sh
new file mode 100755
index 000000000..c0ab249dc
--- /dev/null
+++ b/esy/build.sh
@@ -0,0 +1,21 @@
+cd _build
+
+# Automake gets brought in unnecessarily for the release package - 
+# force dependencies to be 'up-to-date' to skip automake...
+touch aclocal.m4
+touch Makefile.in
+touch configure
+touch config.h.in
+
+# OS_WIN32 invokes a python def file generator for MVSC linking,
+# which we don't need (it's implied by host - mingw)
+touch src/harfbuzz.def
+touch src/harfbuzz-subset.def
+touch src/harfbuzz-icu.def
+touch src/harfbuzz-gobject.def
+
+echo "**BUILD STARTED**"
+make
+echo "**BUILD COMPLETE**"
+make install
+
diff --git a/esy/configure-windows.sh b/esy/configure-windows.sh
index 809e7fb21..ace617be2 100644
--- a/esy/configure-windows.sh
+++ b/esy/configure-windows.sh
@@ -1 +1,2 @@
-./configure --prefix=E:/harfbuzz-prefix CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ AR=x86_64-w64-mingw32-ar 
+cd _build
+./configure --prefix=$cur__install --host=x86_64-w64-mingw32
diff --git a/esy/configure.sh b/esy/configure.sh
new file mode 100755
index 000000000..354e8ee91
--- /dev/null
+++ b/esy/configure.sh
@@ -0,0 +1,2 @@
+cd _build
+./configure --prefix=$cur__install
diff --git a/esy/prep.sh b/esy/prep.sh
new file mode 100755
index 000000000..e94adc4bb
--- /dev/null
+++ b/esy/prep.sh
@@ -0,0 +1,6 @@
+cp -rp harfbuzz-1.9.0 _build
+
+cd _build
+
+# Create harfbuzz.def to skip generating python definitions
+touch src/harfbuzz.def
diff --git a/esy/test.c b/esy/test.c
new file mode 100644
index 000000000..4480c5981
--- /dev/null
+++ b/esy/test.c
@@ -0,0 +1,115 @@
+/* Based on: https://github.com/harfbuzz/harfbuzz-tutorial/blob/master/hello-harfbuzz-opentype.c */
+
+#include <stdio.h>
+#include <math.h>
+
+#include <hb.h>
+#include <hb-ot.h>
+
+#define FONT_SIZE 36
+#define MARGIN (FONT_SIZE * .5)
+
+/* Use native open type implementation to load font
+  https://github.com/harfbuzz/harfbuzz/issues/255 */
+hb_font_t*
+get_font_ot(const char *filename, int size)
+{
+  FILE* file = fopen(filename, "rb");
+  fseek(file, 0, SEEK_END);
+  unsigned int length = ftell(file);
+  fseek(file, 0, SEEK_SET);
+
+  char* data = malloc(length);
+  fread(data, length, 1, file);
+  fclose(file);
+
+  hb_blob_t* blob = hb_blob_create(data, length, HB_MEMORY_MODE_WRITABLE, (void*)data, NULL);
+  hb_face_t* face = hb_face_create(blob, 0);
+  hb_font_t* font = hb_font_create(face);
+
+  hb_ot_font_set_funcs(font);
+  hb_font_set_scale(font, size, size);
+
+  return font;
+}
+
+int
+main(int argc, char **argv)
+{
+  const char *fontfile;
+  const char *text;
+
+  if (argc < 3)
+  {
+    fprintf (stderr, "usage: hello-harfbuzz font-file.ttf text\n");
+    exit (1);
+  }
+
+  fontfile = argv[1];
+  text = argv[2];
+
+  /* Create hb-ft font. */
+  hb_font_t *hb_font;
+  hb_font = get_font_ot (fontfile, FONT_SIZE*64);
+
+  /* Create hb-buffer and populate. */
+  hb_buffer_t *hb_buffer;
+  hb_buffer = hb_buffer_create ();
+  hb_buffer_add_utf8 (hb_buffer, text, -1, 0, -1);
+  hb_buffer_guess_segment_properties (hb_buffer);
+
+  /* Shape it! */
+  hb_shape (hb_font, hb_buffer, NULL, 0);
+
+  /* Get glyph information and positions out of the buffer. */
+  unsigned int len = hb_buffer_get_length (hb_buffer);
+  hb_glyph_info_t *info = hb_buffer_get_glyph_infos (hb_buffer, NULL);
+  hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (hb_buffer, NULL);
+
+  /* Print them out as is. */
+  printf ("Raw buffer contents:\n");
+  for (unsigned int i = 0; i < len; i++)
+  {
+    hb_codepoint_t gid   = info[i].codepoint;
+    unsigned int cluster = info[i].cluster;
+    double x_advance = pos[i].x_advance / 64.;
+    double y_advance = pos[i].y_advance / 64.;
+    double x_offset  = pos[i].x_offset / 64.;
+    double y_offset  = pos[i].y_offset / 64.;
+
+    char glyphname[32];
+    hb_font_get_glyph_name (hb_font, gid, glyphname, sizeof (glyphname));
+
+    printf ("glyph='%s'	cluster=%d	advance=(%g,%g)	offset=(%g,%g)\n",
+            glyphname, cluster, x_advance, y_advance, x_offset, y_offset);
+  }
+
+  printf ("Converted to absolute positions:\n");
+  /* And converted to absolute positions. */
+  {
+    double current_x = 0;
+    double current_y = 0;
+    for (unsigned int i = 0; i < len; i++)
+    {
+      hb_codepoint_t gid   = info[i].codepoint;
+      unsigned int cluster = info[i].cluster;
+      double x_position = current_x + pos[i].x_offset / 64.;
+      double y_position = current_y + pos[i].y_offset / 64.;
+
+
+      char glyphname[32];
+      hb_font_get_glyph_name (hb_font, gid, glyphname, sizeof (glyphname));
+
+      printf ("glyph='%s'	cluster=%d	position=(%g,%g)\n",
+	      glyphname, cluster, x_position, y_position);
+
+      current_x += pos[i].x_advance / 64.;
+      current_y += pos[i].y_advance / 64.;
+    }
+  }
+
+  hb_buffer_destroy (hb_buffer);
+  hb_font_destroy (hb_font);
+
+  return 0;
+}
diff --git a/esy/test.sh b/esy/test.sh
old mode 100644
new mode 100755
index 975784fe9..cde13cf0f
--- a/esy/test.sh
+++ b/esy/test.sh
@@ -1 +1,35 @@
-echo TODO: Test!
+
+INCLUDE=$cur__install/include/harfbuzz
+
+ROOTDIR=$(pwd)
+
+if which x86_64-w64-mingw32-gcc; then
+    CC=x86_64-w64-mingw32-gcc
+    # Copy runtime mingw files
+    BUILDDIR=$(pwd)/esy
+    cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll $BUILDDIR/.
+else
+    CC=gcc
+    BUILDDIR=$(pwd)/_build
+fi
+
+echo "Using build directory: $BUILDDIR"
+echo "Root directory: $ROOTDIR"
+
+cd $BUILDDIR
+pwd
+
+echo "Using compiler: $CC"
+
+echo "Include Path: $INCLUDE"
+echo "Lib Path: $cur__lib"
+echo "Bin Path: $cur__bin"
+
+cp $cur__bin/*.dll .
+
+# Augment path to pick up libs
+export PATH=$PATH:$cur__bin:$cur__lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$cur__lib
+
+$CC $ROOTDIR/esy/test.c -o test.exe -std=c99 -I$INCLUDE -L$cur__lib -lharfbuzz
+./test.exe $ROOTDIR/esy/Roboto-Regular.ttf "test=>text"
diff --git a/AUTHORS b/harfbuzz-1.9.0/AUTHORS
similarity index 100%
rename from AUTHORS
rename to harfbuzz-1.9.0/AUTHORS
diff --git a/BUILD.md b/harfbuzz-1.9.0/BUILD.md
similarity index 100%
rename from BUILD.md
rename to harfbuzz-1.9.0/BUILD.md
diff --git a/CMakeLists.txt b/harfbuzz-1.9.0/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to harfbuzz-1.9.0/CMakeLists.txt
diff --git a/COPYING b/harfbuzz-1.9.0/COPYING
similarity index 100%
rename from COPYING
rename to harfbuzz-1.9.0/COPYING
diff --git a/ChangeLog b/harfbuzz-1.9.0/ChangeLog
similarity index 100%
rename from ChangeLog
rename to harfbuzz-1.9.0/ChangeLog
diff --git a/INSTALL b/harfbuzz-1.9.0/INSTALL
similarity index 100%
rename from INSTALL
rename to harfbuzz-1.9.0/INSTALL
diff --git a/Makefile.am b/harfbuzz-1.9.0/Makefile.am
similarity index 100%
rename from Makefile.am
rename to harfbuzz-1.9.0/Makefile.am
diff --git a/Makefile.in b/harfbuzz-1.9.0/Makefile.in
similarity index 100%
rename from Makefile.in
rename to harfbuzz-1.9.0/Makefile.in
diff --git a/NEWS b/harfbuzz-1.9.0/NEWS
similarity index 100%
rename from NEWS
rename to harfbuzz-1.9.0/NEWS
diff --git a/README b/harfbuzz-1.9.0/README
similarity index 100%
rename from README
rename to harfbuzz-1.9.0/README
diff --git a/README.python.md b/harfbuzz-1.9.0/README.python.md
similarity index 100%
rename from README.python.md
rename to harfbuzz-1.9.0/README.python.md
diff --git a/README.wine.md b/harfbuzz-1.9.0/README.wine.md
similarity index 100%
rename from README.wine.md
rename to harfbuzz-1.9.0/README.wine.md
diff --git a/RELEASING.md b/harfbuzz-1.9.0/RELEASING.md
similarity index 100%
rename from RELEASING.md
rename to harfbuzz-1.9.0/RELEASING.md
diff --git a/THANKS b/harfbuzz-1.9.0/THANKS
similarity index 100%
rename from THANKS
rename to harfbuzz-1.9.0/THANKS
diff --git a/TODO b/harfbuzz-1.9.0/TODO
similarity index 100%
rename from TODO
rename to harfbuzz-1.9.0/TODO
diff --git a/aclocal.m4 b/harfbuzz-1.9.0/aclocal.m4
similarity index 100%
rename from aclocal.m4
rename to harfbuzz-1.9.0/aclocal.m4
diff --git a/ar-lib b/harfbuzz-1.9.0/ar-lib
similarity index 100%
rename from ar-lib
rename to harfbuzz-1.9.0/ar-lib
diff --git a/autogen.sh b/harfbuzz-1.9.0/autogen.sh
similarity index 100%
rename from autogen.sh
rename to harfbuzz-1.9.0/autogen.sh
diff --git a/compile b/harfbuzz-1.9.0/compile
similarity index 100%
rename from compile
rename to harfbuzz-1.9.0/compile
diff --git a/config.guess b/harfbuzz-1.9.0/config.guess
similarity index 100%
rename from config.guess
rename to harfbuzz-1.9.0/config.guess
diff --git a/config.h.in b/harfbuzz-1.9.0/config.h.in
similarity index 100%
rename from config.h.in
rename to harfbuzz-1.9.0/config.h.in
diff --git a/config.sub b/harfbuzz-1.9.0/config.sub
similarity index 100%
rename from config.sub
rename to harfbuzz-1.9.0/config.sub
diff --git a/configure b/harfbuzz-1.9.0/configure
old mode 100644
new mode 100755
similarity index 100%
rename from configure
rename to harfbuzz-1.9.0/configure
diff --git a/configure.ac b/harfbuzz-1.9.0/configure.ac
similarity index 100%
rename from configure.ac
rename to harfbuzz-1.9.0/configure.ac
diff --git a/depcomp b/harfbuzz-1.9.0/depcomp
similarity index 100%
rename from depcomp
rename to harfbuzz-1.9.0/depcomp
diff --git a/docs/HarfBuzz.png b/harfbuzz-1.9.0/docs/HarfBuzz.png
similarity index 99%
rename from docs/HarfBuzz.png
rename to harfbuzz-1.9.0/docs/HarfBuzz.png
index d8498d61b..771d955d0 100644
Binary files a/docs/HarfBuzz.png and b/harfbuzz-1.9.0/docs/HarfBuzz.png differ
diff --git a/docs/HarfBuzz.svg b/harfbuzz-1.9.0/docs/HarfBuzz.svg
similarity index 100%
rename from docs/HarfBuzz.svg
rename to harfbuzz-1.9.0/docs/HarfBuzz.svg
diff --git a/docs/Makefile.am b/harfbuzz-1.9.0/docs/Makefile.am
similarity index 100%
rename from docs/Makefile.am
rename to harfbuzz-1.9.0/docs/Makefile.am
diff --git a/docs/Makefile.in b/harfbuzz-1.9.0/docs/Makefile.in
similarity index 100%
rename from docs/Makefile.in
rename to harfbuzz-1.9.0/docs/Makefile.in
diff --git a/docs/harfbuzz-docs.xml b/harfbuzz-1.9.0/docs/harfbuzz-docs.xml
similarity index 100%
rename from docs/harfbuzz-docs.xml
rename to harfbuzz-1.9.0/docs/harfbuzz-docs.xml
diff --git a/docs/harfbuzz-overrides.txt b/harfbuzz-1.9.0/docs/harfbuzz-overrides.txt
similarity index 100%
rename from docs/harfbuzz-overrides.txt
rename to harfbuzz-1.9.0/docs/harfbuzz-overrides.txt
diff --git a/docs/harfbuzz-sections.txt b/harfbuzz-1.9.0/docs/harfbuzz-sections.txt
similarity index 100%
rename from docs/harfbuzz-sections.txt
rename to harfbuzz-1.9.0/docs/harfbuzz-sections.txt
diff --git a/docs/harfbuzz.types b/harfbuzz-1.9.0/docs/harfbuzz.types
similarity index 100%
rename from docs/harfbuzz.types
rename to harfbuzz-1.9.0/docs/harfbuzz.types
diff --git a/docs/html/HarfBuzz.png b/harfbuzz-1.9.0/docs/html/HarfBuzz.png
similarity index 99%
rename from docs/html/HarfBuzz.png
rename to harfbuzz-1.9.0/docs/html/HarfBuzz.png
index d8498d61b..771d955d0 100644
Binary files a/docs/html/HarfBuzz.png and b/harfbuzz-1.9.0/docs/html/HarfBuzz.png differ
diff --git a/docs/html/HarfBuzz.svg b/harfbuzz-1.9.0/docs/html/HarfBuzz.svg
similarity index 100%
rename from docs/html/HarfBuzz.svg
rename to harfbuzz-1.9.0/docs/html/HarfBuzz.svg
diff --git a/docs/html/a-clustering-example-for-levels-0-and-1.html b/harfbuzz-1.9.0/docs/html/a-clustering-example-for-levels-0-and-1.html
similarity index 100%
rename from docs/html/a-clustering-example-for-levels-0-and-1.html
rename to harfbuzz-1.9.0/docs/html/a-clustering-example-for-levels-0-and-1.html
diff --git a/docs/html/adding-text-to-the-buffer.html b/harfbuzz-1.9.0/docs/html/adding-text-to-the-buffer.html
similarity index 100%
rename from docs/html/adding-text-to-the-buffer.html
rename to harfbuzz-1.9.0/docs/html/adding-text-to-the-buffer.html
diff --git a/docs/html/annotation-glossary.html b/harfbuzz-1.9.0/docs/html/annotation-glossary.html
similarity index 100%
rename from docs/html/annotation-glossary.html
rename to harfbuzz-1.9.0/docs/html/annotation-glossary.html
diff --git a/docs/html/api-index-0-9-10.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-10.html
similarity index 100%
rename from docs/html/api-index-0-9-10.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-10.html
diff --git a/docs/html/api-index-0-9-11.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-11.html
similarity index 100%
rename from docs/html/api-index-0-9-11.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-11.html
diff --git a/docs/html/api-index-0-9-2.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-2.html
similarity index 100%
rename from docs/html/api-index-0-9-2.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-2.html
diff --git a/docs/html/api-index-0-9-20.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-20.html
similarity index 100%
rename from docs/html/api-index-0-9-20.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-20.html
diff --git a/docs/html/api-index-0-9-22.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-22.html
similarity index 100%
rename from docs/html/api-index-0-9-22.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-22.html
diff --git a/docs/html/api-index-0-9-28.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-28.html
similarity index 100%
rename from docs/html/api-index-0-9-28.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-28.html
diff --git a/docs/html/api-index-0-9-30.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-30.html
similarity index 100%
rename from docs/html/api-index-0-9-30.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-30.html
diff --git a/docs/html/api-index-0-9-31.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-31.html
similarity index 100%
rename from docs/html/api-index-0-9-31.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-31.html
diff --git a/docs/html/api-index-0-9-38.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-38.html
similarity index 100%
rename from docs/html/api-index-0-9-38.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-38.html
diff --git a/docs/html/api-index-0-9-39.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-39.html
similarity index 100%
rename from docs/html/api-index-0-9-39.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-39.html
diff --git a/docs/html/api-index-0-9-41.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-41.html
similarity index 100%
rename from docs/html/api-index-0-9-41.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-41.html
diff --git a/docs/html/api-index-0-9-42.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-42.html
similarity index 100%
rename from docs/html/api-index-0-9-42.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-42.html
diff --git a/docs/html/api-index-0-9-5.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-5.html
similarity index 100%
rename from docs/html/api-index-0-9-5.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-5.html
diff --git a/docs/html/api-index-0-9-7.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-7.html
similarity index 100%
rename from docs/html/api-index-0-9-7.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-7.html
diff --git a/docs/html/api-index-0-9-8.html b/harfbuzz-1.9.0/docs/html/api-index-0-9-8.html
similarity index 100%
rename from docs/html/api-index-0-9-8.html
rename to harfbuzz-1.9.0/docs/html/api-index-0-9-8.html
diff --git a/docs/html/api-index-1-0-5.html b/harfbuzz-1.9.0/docs/html/api-index-1-0-5.html
similarity index 100%
rename from docs/html/api-index-1-0-5.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-0-5.html
diff --git a/docs/html/api-index-1-1-2.html b/harfbuzz-1.9.0/docs/html/api-index-1-1-2.html
similarity index 100%
rename from docs/html/api-index-1-1-2.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-1-2.html
diff --git a/docs/html/api-index-1-1-3.html b/harfbuzz-1.9.0/docs/html/api-index-1-1-3.html
similarity index 100%
rename from docs/html/api-index-1-1-3.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-1-3.html
diff --git a/docs/html/api-index-1-2-3.html b/harfbuzz-1.9.0/docs/html/api-index-1-2-3.html
similarity index 100%
rename from docs/html/api-index-1-2-3.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-2-3.html
diff --git a/docs/html/api-index-1-3-3.html b/harfbuzz-1.9.0/docs/html/api-index-1-3-3.html
similarity index 100%
rename from docs/html/api-index-1-3-3.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-3-3.html
diff --git a/docs/html/api-index-1-4-2.html b/harfbuzz-1.9.0/docs/html/api-index-1-4-2.html
similarity index 100%
rename from docs/html/api-index-1-4-2.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-4-2.html
diff --git a/docs/html/api-index-1-4-3.html b/harfbuzz-1.9.0/docs/html/api-index-1-4-3.html
similarity index 100%
rename from docs/html/api-index-1-4-3.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-4-3.html
diff --git a/docs/html/api-index-1-5-0.html b/harfbuzz-1.9.0/docs/html/api-index-1-5-0.html
similarity index 100%
rename from docs/html/api-index-1-5-0.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-5-0.html
diff --git a/docs/html/api-index-1-6-0.html b/harfbuzz-1.9.0/docs/html/api-index-1-6-0.html
similarity index 100%
rename from docs/html/api-index-1-6-0.html
rename to harfbuzz-1.9.0/docs/html/api-index-1-6-0.html
diff --git a/docs/html/api-index-full.html b/harfbuzz-1.9.0/docs/html/api-index-full.html
similarity index 100%
rename from docs/html/api-index-full.html
rename to harfbuzz-1.9.0/docs/html/api-index-full.html
diff --git a/docs/html/buffers-language-script-and-direction.html b/harfbuzz-1.9.0/docs/html/buffers-language-script-and-direction.html
similarity index 100%
rename from docs/html/buffers-language-script-and-direction.html
rename to harfbuzz-1.9.0/docs/html/buffers-language-script-and-direction.html
diff --git a/docs/html/building.html b/harfbuzz-1.9.0/docs/html/building.html
similarity index 100%
rename from docs/html/building.html
rename to harfbuzz-1.9.0/docs/html/building.html
diff --git a/docs/html/ch08.html b/harfbuzz-1.9.0/docs/html/ch08.html
similarity index 100%
rename from docs/html/ch08.html
rename to harfbuzz-1.9.0/docs/html/ch08.html
diff --git a/docs/html/clusters.html b/harfbuzz-1.9.0/docs/html/clusters.html
similarity index 100%
rename from docs/html/clusters.html
rename to harfbuzz-1.9.0/docs/html/clusters.html
diff --git a/docs/html/customizing-unicode-functions.html b/harfbuzz-1.9.0/docs/html/customizing-unicode-functions.html
similarity index 100%
rename from docs/html/customizing-unicode-functions.html
rename to harfbuzz-1.9.0/docs/html/customizing-unicode-functions.html
diff --git a/docs/html/deprecated-api-index.html b/harfbuzz-1.9.0/docs/html/deprecated-api-index.html
similarity index 100%
rename from docs/html/deprecated-api-index.html
rename to harfbuzz-1.9.0/docs/html/deprecated-api-index.html
diff --git a/docs/html/fonts-and-faces.html b/harfbuzz-1.9.0/docs/html/fonts-and-faces.html
similarity index 100%
rename from docs/html/fonts-and-faces.html
rename to harfbuzz-1.9.0/docs/html/fonts-and-faces.html
diff --git a/docs/html/harfbuzz-Buffers.html b/harfbuzz-1.9.0/docs/html/harfbuzz-Buffers.html
similarity index 100%
rename from docs/html/harfbuzz-Buffers.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-Buffers.html
diff --git a/docs/html/harfbuzz-Shaping.html b/harfbuzz-1.9.0/docs/html/harfbuzz-Shaping.html
similarity index 100%
rename from docs/html/harfbuzz-Shaping.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-Shaping.html
diff --git a/docs/html/harfbuzz-hb-blob.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-blob.html
similarity index 100%
rename from docs/html/harfbuzz-hb-blob.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-blob.html
diff --git a/docs/html/harfbuzz-hb-common.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-common.html
similarity index 100%
rename from docs/html/harfbuzz-hb-common.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-common.html
diff --git a/docs/html/harfbuzz-hb-coretext.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-coretext.html
similarity index 100%
rename from docs/html/harfbuzz-hb-coretext.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-coretext.html
diff --git a/docs/html/harfbuzz-hb-deprecated.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-deprecated.html
similarity index 100%
rename from docs/html/harfbuzz-hb-deprecated.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-deprecated.html
diff --git a/docs/html/harfbuzz-hb-face.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-face.html
similarity index 100%
rename from docs/html/harfbuzz-hb-face.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-face.html
diff --git a/docs/html/harfbuzz-hb-font.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-font.html
similarity index 100%
rename from docs/html/harfbuzz-hb-font.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-font.html
diff --git a/docs/html/harfbuzz-hb-ft.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ft.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ft.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ft.html
diff --git a/docs/html/harfbuzz-hb-glib.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-glib.html
similarity index 100%
rename from docs/html/harfbuzz-hb-glib.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-glib.html
diff --git a/docs/html/harfbuzz-hb-gobject.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-gobject.html
similarity index 100%
rename from docs/html/harfbuzz-hb-gobject.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-gobject.html
diff --git a/docs/html/harfbuzz-hb-graphite2.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-graphite2.html
similarity index 100%
rename from docs/html/harfbuzz-hb-graphite2.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-graphite2.html
diff --git a/docs/html/harfbuzz-hb-icu.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-icu.html
similarity index 100%
rename from docs/html/harfbuzz-hb-icu.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-icu.html
diff --git a/docs/html/harfbuzz-hb-ot-font.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-font.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ot-font.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-font.html
diff --git a/docs/html/harfbuzz-hb-ot-layout.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-layout.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ot-layout.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-layout.html
diff --git a/docs/html/harfbuzz-hb-ot-math.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-math.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ot-math.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-math.html
diff --git a/docs/html/harfbuzz-hb-ot-shape.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-shape.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ot-shape.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-shape.html
diff --git a/docs/html/harfbuzz-hb-ot-tag.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-tag.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ot-tag.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot-tag.html
diff --git a/docs/html/harfbuzz-hb-ot.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot.html
similarity index 100%
rename from docs/html/harfbuzz-hb-ot.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-ot.html
diff --git a/docs/html/harfbuzz-hb-set.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-set.html
similarity index 100%
rename from docs/html/harfbuzz-hb-set.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-set.html
diff --git a/docs/html/harfbuzz-hb-shape-plan.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-shape-plan.html
similarity index 100%
rename from docs/html/harfbuzz-hb-shape-plan.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-shape-plan.html
diff --git a/docs/html/harfbuzz-hb-unicode.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-unicode.html
similarity index 100%
rename from docs/html/harfbuzz-hb-unicode.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-unicode.html
diff --git a/docs/html/harfbuzz-hb-uniscribe.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-uniscribe.html
similarity index 100%
rename from docs/html/harfbuzz-hb-uniscribe.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-uniscribe.html
diff --git a/docs/html/harfbuzz-hb-version.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb-version.html
similarity index 100%
rename from docs/html/harfbuzz-hb-version.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb-version.html
diff --git a/docs/html/harfbuzz-hb.html b/harfbuzz-1.9.0/docs/html/harfbuzz-hb.html
similarity index 100%
rename from docs/html/harfbuzz-hb.html
rename to harfbuzz-1.9.0/docs/html/harfbuzz-hb.html
diff --git a/docs/html/harfbuzz.devhelp2 b/harfbuzz-1.9.0/docs/html/harfbuzz.devhelp2
similarity index 100%
rename from docs/html/harfbuzz.devhelp2
rename to harfbuzz-1.9.0/docs/html/harfbuzz.devhelp2
diff --git a/docs/html/hello-harfbuzz.html b/harfbuzz-1.9.0/docs/html/hello-harfbuzz.html
similarity index 100%
rename from docs/html/hello-harfbuzz.html
rename to harfbuzz-1.9.0/docs/html/hello-harfbuzz.html
diff --git a/docs/html/home.png b/harfbuzz-1.9.0/docs/html/home.png
similarity index 97%
rename from docs/html/home.png
rename to harfbuzz-1.9.0/docs/html/home.png
index a8046cc6d..9346b336a 100644
Binary files a/docs/html/home.png and b/harfbuzz-1.9.0/docs/html/home.png differ
diff --git a/docs/html/index.html b/harfbuzz-1.9.0/docs/html/index.html
similarity index 100%
rename from docs/html/index.html
rename to harfbuzz-1.9.0/docs/html/index.html
diff --git a/docs/html/install-harfbuzz.html b/harfbuzz-1.9.0/docs/html/install-harfbuzz.html
similarity index 100%
rename from docs/html/install-harfbuzz.html
rename to harfbuzz-1.9.0/docs/html/install-harfbuzz.html
diff --git a/docs/html/left-insensitive.png b/harfbuzz-1.9.0/docs/html/left-insensitive.png
similarity index 98%
rename from docs/html/left-insensitive.png
rename to harfbuzz-1.9.0/docs/html/left-insensitive.png
index 983fd66fb..3269393a7 100644
Binary files a/docs/html/left-insensitive.png and b/harfbuzz-1.9.0/docs/html/left-insensitive.png differ
diff --git a/docs/html/left.png b/harfbuzz-1.9.0/docs/html/left.png
similarity index 97%
rename from docs/html/left.png
rename to harfbuzz-1.9.0/docs/html/left.png
index 438192f35..2abde032b 100644
Binary files a/docs/html/left.png and b/harfbuzz-1.9.0/docs/html/left.png differ
diff --git a/docs/html/level-2.html b/harfbuzz-1.9.0/docs/html/level-2.html
similarity index 100%
rename from docs/html/level-2.html
rename to harfbuzz-1.9.0/docs/html/level-2.html
diff --git a/docs/html/object-tree.html b/harfbuzz-1.9.0/docs/html/object-tree.html
similarity index 100%
rename from docs/html/object-tree.html
rename to harfbuzz-1.9.0/docs/html/object-tree.html
diff --git a/docs/html/plans-and-caching.html b/harfbuzz-1.9.0/docs/html/plans-and-caching.html
similarity index 100%
rename from docs/html/plans-and-caching.html
rename to harfbuzz-1.9.0/docs/html/plans-and-caching.html
diff --git a/docs/html/pt01.html b/harfbuzz-1.9.0/docs/html/pt01.html
similarity index 100%
rename from docs/html/pt01.html
rename to harfbuzz-1.9.0/docs/html/pt01.html
diff --git a/docs/html/pt02.html b/harfbuzz-1.9.0/docs/html/pt02.html
similarity index 100%
rename from docs/html/pt02.html
rename to harfbuzz-1.9.0/docs/html/pt02.html
diff --git a/docs/html/reordering-in-levels-0-and-1.html b/harfbuzz-1.9.0/docs/html/reordering-in-levels-0-and-1.html
similarity index 100%
rename from docs/html/reordering-in-levels-0-and-1.html
rename to harfbuzz-1.9.0/docs/html/reordering-in-levels-0-and-1.html
diff --git a/docs/html/right-insensitive.png b/harfbuzz-1.9.0/docs/html/right-insensitive.png
similarity index 98%
rename from docs/html/right-insensitive.png
rename to harfbuzz-1.9.0/docs/html/right-insensitive.png
index 6ef41e8d1..4c95785b9 100644
Binary files a/docs/html/right-insensitive.png and b/harfbuzz-1.9.0/docs/html/right-insensitive.png differ
diff --git a/docs/html/right.png b/harfbuzz-1.9.0/docs/html/right.png
similarity index 97%
rename from docs/html/right.png
rename to harfbuzz-1.9.0/docs/html/right.png
index d24458d74..76260ec88 100644
Binary files a/docs/html/right.png and b/harfbuzz-1.9.0/docs/html/right.png differ
diff --git a/docs/html/setting-buffer-properties.html b/harfbuzz-1.9.0/docs/html/setting-buffer-properties.html
similarity index 100%
rename from docs/html/setting-buffer-properties.html
rename to harfbuzz-1.9.0/docs/html/setting-buffer-properties.html
diff --git a/docs/html/shaping-and-shape-plans.html b/harfbuzz-1.9.0/docs/html/shaping-and-shape-plans.html
similarity index 100%
rename from docs/html/shaping-and-shape-plans.html
rename to harfbuzz-1.9.0/docs/html/shaping-and-shape-plans.html
diff --git a/docs/html/style.css b/harfbuzz-1.9.0/docs/html/style.css
similarity index 100%
rename from docs/html/style.css
rename to harfbuzz-1.9.0/docs/html/style.css
diff --git a/docs/html/the-distinction-between-levels-0-and-1.html b/harfbuzz-1.9.0/docs/html/the-distinction-between-levels-0-and-1.html
similarity index 100%
rename from docs/html/the-distinction-between-levels-0-and-1.html
rename to harfbuzz-1.9.0/docs/html/the-distinction-between-levels-0-and-1.html
diff --git a/docs/html/up-insensitive.png b/harfbuzz-1.9.0/docs/html/up-insensitive.png
similarity index 98%
rename from docs/html/up-insensitive.png
rename to harfbuzz-1.9.0/docs/html/up-insensitive.png
index 7dac3f182..f40498606 100644
Binary files a/docs/html/up-insensitive.png and b/harfbuzz-1.9.0/docs/html/up-insensitive.png differ
diff --git a/docs/html/up.png b/harfbuzz-1.9.0/docs/html/up.png
similarity index 97%
rename from docs/html/up.png
rename to harfbuzz-1.9.0/docs/html/up.png
index 8c2b8dc2d..80b4b37e9 100644
Binary files a/docs/html/up.png and b/harfbuzz-1.9.0/docs/html/up.png differ
diff --git a/docs/html/using-harfbuzzs-native-opentype-implementation.html b/harfbuzz-1.9.0/docs/html/using-harfbuzzs-native-opentype-implementation.html
similarity index 100%
rename from docs/html/using-harfbuzzs-native-opentype-implementation.html
rename to harfbuzz-1.9.0/docs/html/using-harfbuzzs-native-opentype-implementation.html
diff --git a/docs/html/using-your-own-font-functions.html b/harfbuzz-1.9.0/docs/html/using-your-own-font-functions.html
similarity index 100%
rename from docs/html/using-your-own-font-functions.html
rename to harfbuzz-1.9.0/docs/html/using-your-own-font-functions.html
diff --git a/docs/html/what-about-the-other-scripts.html b/harfbuzz-1.9.0/docs/html/what-about-the-other-scripts.html
similarity index 100%
rename from docs/html/what-about-the-other-scripts.html
rename to harfbuzz-1.9.0/docs/html/what-about-the-other-scripts.html
diff --git a/docs/html/what-is-harfbuzz.html b/harfbuzz-1.9.0/docs/html/what-is-harfbuzz.html
similarity index 100%
rename from docs/html/what-is-harfbuzz.html
rename to harfbuzz-1.9.0/docs/html/what-is-harfbuzz.html
diff --git a/docs/html/why-is-it-called-harfbuzz.html b/harfbuzz-1.9.0/docs/html/why-is-it-called-harfbuzz.html
similarity index 100%
rename from docs/html/why-is-it-called-harfbuzz.html
rename to harfbuzz-1.9.0/docs/html/why-is-it-called-harfbuzz.html
diff --git a/docs/usermanual-buffers-language-script-and-direction.xml b/harfbuzz-1.9.0/docs/usermanual-buffers-language-script-and-direction.xml
similarity index 100%
rename from docs/usermanual-buffers-language-script-and-direction.xml
rename to harfbuzz-1.9.0/docs/usermanual-buffers-language-script-and-direction.xml
diff --git a/docs/usermanual-clusters.xml b/harfbuzz-1.9.0/docs/usermanual-clusters.xml
similarity index 100%
rename from docs/usermanual-clusters.xml
rename to harfbuzz-1.9.0/docs/usermanual-clusters.xml
diff --git a/docs/usermanual-fonts-and-faces.xml b/harfbuzz-1.9.0/docs/usermanual-fonts-and-faces.xml
similarity index 100%
rename from docs/usermanual-fonts-and-faces.xml
rename to harfbuzz-1.9.0/docs/usermanual-fonts-and-faces.xml
diff --git a/docs/usermanual-glyph-information.xml b/harfbuzz-1.9.0/docs/usermanual-glyph-information.xml
similarity index 100%
rename from docs/usermanual-glyph-information.xml
rename to harfbuzz-1.9.0/docs/usermanual-glyph-information.xml
diff --git a/docs/usermanual-hello-harfbuzz.xml b/harfbuzz-1.9.0/docs/usermanual-hello-harfbuzz.xml
similarity index 100%
rename from docs/usermanual-hello-harfbuzz.xml
rename to harfbuzz-1.9.0/docs/usermanual-hello-harfbuzz.xml
diff --git a/docs/usermanual-install-harfbuzz.xml b/harfbuzz-1.9.0/docs/usermanual-install-harfbuzz.xml
similarity index 100%
rename from docs/usermanual-install-harfbuzz.xml
rename to harfbuzz-1.9.0/docs/usermanual-install-harfbuzz.xml
diff --git a/docs/usermanual-opentype-features.xml b/harfbuzz-1.9.0/docs/usermanual-opentype-features.xml
similarity index 100%
rename from docs/usermanual-opentype-features.xml
rename to harfbuzz-1.9.0/docs/usermanual-opentype-features.xml
diff --git a/docs/usermanual-what-is-harfbuzz.xml b/harfbuzz-1.9.0/docs/usermanual-what-is-harfbuzz.xml
similarity index 100%
rename from docs/usermanual-what-is-harfbuzz.xml
rename to harfbuzz-1.9.0/docs/usermanual-what-is-harfbuzz.xml
diff --git a/docs/version.xml b/harfbuzz-1.9.0/docs/version.xml
similarity index 100%
rename from docs/version.xml
rename to harfbuzz-1.9.0/docs/version.xml
diff --git a/docs/version.xml.in b/harfbuzz-1.9.0/docs/version.xml.in
similarity index 100%
rename from docs/version.xml.in
rename to harfbuzz-1.9.0/docs/version.xml.in
diff --git a/gtk-doc.make b/harfbuzz-1.9.0/gtk-doc.make
similarity index 100%
rename from gtk-doc.make
rename to harfbuzz-1.9.0/gtk-doc.make
diff --git a/harfbuzz.doap b/harfbuzz-1.9.0/harfbuzz.doap
similarity index 100%
rename from harfbuzz.doap
rename to harfbuzz-1.9.0/harfbuzz.doap
diff --git a/install-sh b/harfbuzz-1.9.0/install-sh
old mode 100644
new mode 100755
similarity index 100%
rename from install-sh
rename to harfbuzz-1.9.0/install-sh
diff --git a/ltmain.sh b/harfbuzz-1.9.0/ltmain.sh
similarity index 100%
rename from ltmain.sh
rename to harfbuzz-1.9.0/ltmain.sh
diff --git a/m4/ax_check_link_flag.m4 b/harfbuzz-1.9.0/m4/ax_check_link_flag.m4
similarity index 100%
rename from m4/ax_check_link_flag.m4
rename to harfbuzz-1.9.0/m4/ax_check_link_flag.m4
diff --git a/m4/ax_code_coverage.m4 b/harfbuzz-1.9.0/m4/ax_code_coverage.m4
similarity index 100%
rename from m4/ax_code_coverage.m4
rename to harfbuzz-1.9.0/m4/ax_code_coverage.m4
diff --git a/m4/ax_pthread.m4 b/harfbuzz-1.9.0/m4/ax_pthread.m4
similarity index 100%
rename from m4/ax_pthread.m4
rename to harfbuzz-1.9.0/m4/ax_pthread.m4
diff --git a/m4/gtk-doc.m4 b/harfbuzz-1.9.0/m4/gtk-doc.m4
similarity index 100%
rename from m4/gtk-doc.m4
rename to harfbuzz-1.9.0/m4/gtk-doc.m4
diff --git a/m4/libtool.m4 b/harfbuzz-1.9.0/m4/libtool.m4
similarity index 100%
rename from m4/libtool.m4
rename to harfbuzz-1.9.0/m4/libtool.m4
diff --git a/m4/ltoptions.m4 b/harfbuzz-1.9.0/m4/ltoptions.m4
similarity index 100%
rename from m4/ltoptions.m4
rename to harfbuzz-1.9.0/m4/ltoptions.m4
diff --git a/m4/ltsugar.m4 b/harfbuzz-1.9.0/m4/ltsugar.m4
similarity index 100%
rename from m4/ltsugar.m4
rename to harfbuzz-1.9.0/m4/ltsugar.m4
diff --git a/m4/ltversion.m4 b/harfbuzz-1.9.0/m4/ltversion.m4
similarity index 100%
rename from m4/ltversion.m4
rename to harfbuzz-1.9.0/m4/ltversion.m4
diff --git a/m4/lt~obsolete.m4 b/harfbuzz-1.9.0/m4/lt~obsolete.m4
similarity index 100%
rename from m4/lt~obsolete.m4
rename to harfbuzz-1.9.0/m4/lt~obsolete.m4
diff --git a/missing b/harfbuzz-1.9.0/missing
similarity index 100%
rename from missing
rename to harfbuzz-1.9.0/missing
diff --git a/replace-enum-strings.cmake b/harfbuzz-1.9.0/replace-enum-strings.cmake
similarity index 100%
rename from replace-enum-strings.cmake
rename to harfbuzz-1.9.0/replace-enum-strings.cmake
diff --git a/src/Makefile.am b/harfbuzz-1.9.0/src/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to harfbuzz-1.9.0/src/Makefile.am
diff --git a/src/Makefile.in b/harfbuzz-1.9.0/src/Makefile.in
similarity index 100%
rename from src/Makefile.in
rename to harfbuzz-1.9.0/src/Makefile.in
diff --git a/src/Makefile.sources b/harfbuzz-1.9.0/src/Makefile.sources
similarity index 100%
rename from src/Makefile.sources
rename to harfbuzz-1.9.0/src/Makefile.sources
diff --git a/src/check-c-linkage-decls.sh b/harfbuzz-1.9.0/src/check-c-linkage-decls.sh
similarity index 100%
rename from src/check-c-linkage-decls.sh
rename to harfbuzz-1.9.0/src/check-c-linkage-decls.sh
diff --git a/src/check-externs.sh b/harfbuzz-1.9.0/src/check-externs.sh
similarity index 100%
rename from src/check-externs.sh
rename to harfbuzz-1.9.0/src/check-externs.sh
diff --git a/src/check-header-guards.sh b/harfbuzz-1.9.0/src/check-header-guards.sh
similarity index 100%
rename from src/check-header-guards.sh
rename to harfbuzz-1.9.0/src/check-header-guards.sh
diff --git a/src/check-includes.sh b/harfbuzz-1.9.0/src/check-includes.sh
similarity index 100%
rename from src/check-includes.sh
rename to harfbuzz-1.9.0/src/check-includes.sh
diff --git a/src/check-libstdc++.sh b/harfbuzz-1.9.0/src/check-libstdc++.sh
similarity index 100%
rename from src/check-libstdc++.sh
rename to harfbuzz-1.9.0/src/check-libstdc++.sh
diff --git a/src/check-static-inits.sh b/harfbuzz-1.9.0/src/check-static-inits.sh
similarity index 100%
rename from src/check-static-inits.sh
rename to harfbuzz-1.9.0/src/check-static-inits.sh
diff --git a/src/check-symbols.sh b/harfbuzz-1.9.0/src/check-symbols.sh
similarity index 100%
rename from src/check-symbols.sh
rename to harfbuzz-1.9.0/src/check-symbols.sh
diff --git a/src/dump-emoji.cc b/harfbuzz-1.9.0/src/dump-emoji.cc
similarity index 100%
rename from src/dump-emoji.cc
rename to harfbuzz-1.9.0/src/dump-emoji.cc
diff --git a/src/dump-indic-data.cc b/harfbuzz-1.9.0/src/dump-indic-data.cc
similarity index 100%
rename from src/dump-indic-data.cc
rename to harfbuzz-1.9.0/src/dump-indic-data.cc
diff --git a/src/dump-khmer-data.cc b/harfbuzz-1.9.0/src/dump-khmer-data.cc
similarity index 100%
rename from src/dump-khmer-data.cc
rename to harfbuzz-1.9.0/src/dump-khmer-data.cc
diff --git a/src/dump-myanmar-data.cc b/harfbuzz-1.9.0/src/dump-myanmar-data.cc
similarity index 100%
rename from src/dump-myanmar-data.cc
rename to harfbuzz-1.9.0/src/dump-myanmar-data.cc
diff --git a/src/dump-use-data.cc b/harfbuzz-1.9.0/src/dump-use-data.cc
similarity index 100%
rename from src/dump-use-data.cc
rename to harfbuzz-1.9.0/src/dump-use-data.cc
diff --git a/src/gen-arabic-table.py b/harfbuzz-1.9.0/src/gen-arabic-table.py
similarity index 100%
rename from src/gen-arabic-table.py
rename to harfbuzz-1.9.0/src/gen-arabic-table.py
diff --git a/src/gen-def.py b/harfbuzz-1.9.0/src/gen-def.py
similarity index 100%
rename from src/gen-def.py
rename to harfbuzz-1.9.0/src/gen-def.py
diff --git a/src/gen-indic-table.py b/harfbuzz-1.9.0/src/gen-indic-table.py
similarity index 100%
rename from src/gen-indic-table.py
rename to harfbuzz-1.9.0/src/gen-indic-table.py
diff --git a/src/gen-use-table.py b/harfbuzz-1.9.0/src/gen-use-table.py
similarity index 100%
rename from src/gen-use-table.py
rename to harfbuzz-1.9.0/src/gen-use-table.py
diff --git a/src/harfbuzz-config.cmake.in b/harfbuzz-1.9.0/src/harfbuzz-config.cmake.in
similarity index 100%
rename from src/harfbuzz-config.cmake.in
rename to harfbuzz-1.9.0/src/harfbuzz-config.cmake.in
diff --git a/src/harfbuzz-gobject.pc.in b/harfbuzz-1.9.0/src/harfbuzz-gobject.pc.in
similarity index 100%
rename from src/harfbuzz-gobject.pc.in
rename to harfbuzz-1.9.0/src/harfbuzz-gobject.pc.in
diff --git a/src/harfbuzz-icu.pc.in b/harfbuzz-1.9.0/src/harfbuzz-icu.pc.in
similarity index 100%
rename from src/harfbuzz-icu.pc.in
rename to harfbuzz-1.9.0/src/harfbuzz-icu.pc.in
diff --git a/src/harfbuzz-subset.pc.in b/harfbuzz-1.9.0/src/harfbuzz-subset.pc.in
similarity index 100%
rename from src/harfbuzz-subset.pc.in
rename to harfbuzz-1.9.0/src/harfbuzz-subset.pc.in
diff --git a/src/harfbuzz.pc.in b/harfbuzz-1.9.0/src/harfbuzz.pc.in
similarity index 100%
rename from src/harfbuzz.pc.in
rename to harfbuzz-1.9.0/src/harfbuzz.pc.in
diff --git a/src/hb-aat-layout-ankr-table.hh b/harfbuzz-1.9.0/src/hb-aat-layout-ankr-table.hh
similarity index 100%
rename from src/hb-aat-layout-ankr-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-ankr-table.hh
diff --git a/src/hb-aat-layout-bsln-table.hh b/harfbuzz-1.9.0/src/hb-aat-layout-bsln-table.hh
similarity index 100%
rename from src/hb-aat-layout-bsln-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-bsln-table.hh
diff --git a/src/hb-aat-layout-common.hh b/harfbuzz-1.9.0/src/hb-aat-layout-common.hh
similarity index 100%
rename from src/hb-aat-layout-common.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-common.hh
diff --git a/src/hb-aat-layout-feat-table.hh b/harfbuzz-1.9.0/src/hb-aat-layout-feat-table.hh
similarity index 100%
rename from src/hb-aat-layout-feat-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-feat-table.hh
diff --git a/src/hb-aat-layout-kerx-table.hh b/harfbuzz-1.9.0/src/hb-aat-layout-kerx-table.hh
similarity index 100%
rename from src/hb-aat-layout-kerx-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-kerx-table.hh
diff --git a/src/hb-aat-layout-morx-table.hh b/harfbuzz-1.9.0/src/hb-aat-layout-morx-table.hh
similarity index 100%
rename from src/hb-aat-layout-morx-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-morx-table.hh
diff --git a/src/hb-aat-layout-trak-table.hh b/harfbuzz-1.9.0/src/hb-aat-layout-trak-table.hh
similarity index 100%
rename from src/hb-aat-layout-trak-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout-trak-table.hh
diff --git a/src/hb-aat-layout.cc b/harfbuzz-1.9.0/src/hb-aat-layout.cc
similarity index 100%
rename from src/hb-aat-layout.cc
rename to harfbuzz-1.9.0/src/hb-aat-layout.cc
diff --git a/src/hb-aat-layout.hh b/harfbuzz-1.9.0/src/hb-aat-layout.hh
similarity index 100%
rename from src/hb-aat-layout.hh
rename to harfbuzz-1.9.0/src/hb-aat-layout.hh
diff --git a/src/hb-aat-ltag-table.hh b/harfbuzz-1.9.0/src/hb-aat-ltag-table.hh
similarity index 100%
rename from src/hb-aat-ltag-table.hh
rename to harfbuzz-1.9.0/src/hb-aat-ltag-table.hh
diff --git a/src/hb-atomic.hh b/harfbuzz-1.9.0/src/hb-atomic.hh
similarity index 100%
rename from src/hb-atomic.hh
rename to harfbuzz-1.9.0/src/hb-atomic.hh
diff --git a/src/hb-blob.cc b/harfbuzz-1.9.0/src/hb-blob.cc
similarity index 100%
rename from src/hb-blob.cc
rename to harfbuzz-1.9.0/src/hb-blob.cc
diff --git a/src/hb-blob.h b/harfbuzz-1.9.0/src/hb-blob.h
similarity index 100%
rename from src/hb-blob.h
rename to harfbuzz-1.9.0/src/hb-blob.h
diff --git a/src/hb-blob.hh b/harfbuzz-1.9.0/src/hb-blob.hh
similarity index 100%
rename from src/hb-blob.hh
rename to harfbuzz-1.9.0/src/hb-blob.hh
diff --git a/src/hb-buffer-deserialize-json.hh b/harfbuzz-1.9.0/src/hb-buffer-deserialize-json.hh
similarity index 100%
rename from src/hb-buffer-deserialize-json.hh
rename to harfbuzz-1.9.0/src/hb-buffer-deserialize-json.hh
diff --git a/src/hb-buffer-deserialize-json.rl b/harfbuzz-1.9.0/src/hb-buffer-deserialize-json.rl
similarity index 100%
rename from src/hb-buffer-deserialize-json.rl
rename to harfbuzz-1.9.0/src/hb-buffer-deserialize-json.rl
diff --git a/src/hb-buffer-deserialize-text.hh b/harfbuzz-1.9.0/src/hb-buffer-deserialize-text.hh
similarity index 100%
rename from src/hb-buffer-deserialize-text.hh
rename to harfbuzz-1.9.0/src/hb-buffer-deserialize-text.hh
diff --git a/src/hb-buffer-deserialize-text.rl b/harfbuzz-1.9.0/src/hb-buffer-deserialize-text.rl
similarity index 100%
rename from src/hb-buffer-deserialize-text.rl
rename to harfbuzz-1.9.0/src/hb-buffer-deserialize-text.rl
diff --git a/src/hb-buffer-serialize.cc b/harfbuzz-1.9.0/src/hb-buffer-serialize.cc
similarity index 100%
rename from src/hb-buffer-serialize.cc
rename to harfbuzz-1.9.0/src/hb-buffer-serialize.cc
diff --git a/src/hb-buffer.cc b/harfbuzz-1.9.0/src/hb-buffer.cc
similarity index 100%
rename from src/hb-buffer.cc
rename to harfbuzz-1.9.0/src/hb-buffer.cc
diff --git a/src/hb-buffer.h b/harfbuzz-1.9.0/src/hb-buffer.h
similarity index 100%
rename from src/hb-buffer.h
rename to harfbuzz-1.9.0/src/hb-buffer.h
diff --git a/src/hb-buffer.hh b/harfbuzz-1.9.0/src/hb-buffer.hh
similarity index 100%
rename from src/hb-buffer.hh
rename to harfbuzz-1.9.0/src/hb-buffer.hh
diff --git a/src/hb-common.cc b/harfbuzz-1.9.0/src/hb-common.cc
similarity index 100%
rename from src/hb-common.cc
rename to harfbuzz-1.9.0/src/hb-common.cc
diff --git a/src/hb-common.h b/harfbuzz-1.9.0/src/hb-common.h
similarity index 100%
rename from src/hb-common.h
rename to harfbuzz-1.9.0/src/hb-common.h
diff --git a/src/hb-coretext.cc b/harfbuzz-1.9.0/src/hb-coretext.cc
similarity index 100%
rename from src/hb-coretext.cc
rename to harfbuzz-1.9.0/src/hb-coretext.cc
diff --git a/src/hb-coretext.h b/harfbuzz-1.9.0/src/hb-coretext.h
similarity index 100%
rename from src/hb-coretext.h
rename to harfbuzz-1.9.0/src/hb-coretext.h
diff --git a/src/hb-debug.hh b/harfbuzz-1.9.0/src/hb-debug.hh
similarity index 100%
rename from src/hb-debug.hh
rename to harfbuzz-1.9.0/src/hb-debug.hh
diff --git a/src/hb-deprecated.h b/harfbuzz-1.9.0/src/hb-deprecated.h
similarity index 100%
rename from src/hb-deprecated.h
rename to harfbuzz-1.9.0/src/hb-deprecated.h
diff --git a/src/hb-directwrite.cc b/harfbuzz-1.9.0/src/hb-directwrite.cc
similarity index 100%
rename from src/hb-directwrite.cc
rename to harfbuzz-1.9.0/src/hb-directwrite.cc
diff --git a/src/hb-directwrite.h b/harfbuzz-1.9.0/src/hb-directwrite.h
similarity index 100%
rename from src/hb-directwrite.h
rename to harfbuzz-1.9.0/src/hb-directwrite.h
diff --git a/src/hb-dsalgs.hh b/harfbuzz-1.9.0/src/hb-dsalgs.hh
similarity index 100%
rename from src/hb-dsalgs.hh
rename to harfbuzz-1.9.0/src/hb-dsalgs.hh
diff --git a/src/hb-face.cc b/harfbuzz-1.9.0/src/hb-face.cc
similarity index 100%
rename from src/hb-face.cc
rename to harfbuzz-1.9.0/src/hb-face.cc
diff --git a/src/hb-face.h b/harfbuzz-1.9.0/src/hb-face.h
similarity index 100%
rename from src/hb-face.h
rename to harfbuzz-1.9.0/src/hb-face.h
diff --git a/src/hb-face.hh b/harfbuzz-1.9.0/src/hb-face.hh
similarity index 100%
rename from src/hb-face.hh
rename to harfbuzz-1.9.0/src/hb-face.hh
diff --git a/src/hb-fallback-shape.cc b/harfbuzz-1.9.0/src/hb-fallback-shape.cc
similarity index 100%
rename from src/hb-fallback-shape.cc
rename to harfbuzz-1.9.0/src/hb-fallback-shape.cc
diff --git a/src/hb-font.cc b/harfbuzz-1.9.0/src/hb-font.cc
similarity index 100%
rename from src/hb-font.cc
rename to harfbuzz-1.9.0/src/hb-font.cc
diff --git a/src/hb-font.h b/harfbuzz-1.9.0/src/hb-font.h
similarity index 100%
rename from src/hb-font.h
rename to harfbuzz-1.9.0/src/hb-font.h
diff --git a/src/hb-font.hh b/harfbuzz-1.9.0/src/hb-font.hh
similarity index 100%
rename from src/hb-font.hh
rename to harfbuzz-1.9.0/src/hb-font.hh
diff --git a/src/hb-ft.cc b/harfbuzz-1.9.0/src/hb-ft.cc
similarity index 100%
rename from src/hb-ft.cc
rename to harfbuzz-1.9.0/src/hb-ft.cc
diff --git a/src/hb-ft.h b/harfbuzz-1.9.0/src/hb-ft.h
similarity index 100%
rename from src/hb-ft.h
rename to harfbuzz-1.9.0/src/hb-ft.h
diff --git a/src/hb-glib.cc b/harfbuzz-1.9.0/src/hb-glib.cc
similarity index 100%
rename from src/hb-glib.cc
rename to harfbuzz-1.9.0/src/hb-glib.cc
diff --git a/src/hb-glib.h b/harfbuzz-1.9.0/src/hb-glib.h
similarity index 100%
rename from src/hb-glib.h
rename to harfbuzz-1.9.0/src/hb-glib.h
diff --git a/src/hb-gobject-enums.cc.tmpl b/harfbuzz-1.9.0/src/hb-gobject-enums.cc.tmpl
similarity index 100%
rename from src/hb-gobject-enums.cc.tmpl
rename to harfbuzz-1.9.0/src/hb-gobject-enums.cc.tmpl
diff --git a/src/hb-gobject-enums.h.tmpl b/harfbuzz-1.9.0/src/hb-gobject-enums.h.tmpl
similarity index 100%
rename from src/hb-gobject-enums.h.tmpl
rename to harfbuzz-1.9.0/src/hb-gobject-enums.h.tmpl
diff --git a/src/hb-gobject-structs.cc b/harfbuzz-1.9.0/src/hb-gobject-structs.cc
similarity index 100%
rename from src/hb-gobject-structs.cc
rename to harfbuzz-1.9.0/src/hb-gobject-structs.cc
diff --git a/src/hb-gobject-structs.h b/harfbuzz-1.9.0/src/hb-gobject-structs.h
similarity index 100%
rename from src/hb-gobject-structs.h
rename to harfbuzz-1.9.0/src/hb-gobject-structs.h
diff --git a/src/hb-gobject.h b/harfbuzz-1.9.0/src/hb-gobject.h
similarity index 100%
rename from src/hb-gobject.h
rename to harfbuzz-1.9.0/src/hb-gobject.h
diff --git a/src/hb-graphite2.cc b/harfbuzz-1.9.0/src/hb-graphite2.cc
similarity index 100%
rename from src/hb-graphite2.cc
rename to harfbuzz-1.9.0/src/hb-graphite2.cc
diff --git a/src/hb-graphite2.h b/harfbuzz-1.9.0/src/hb-graphite2.h
similarity index 100%
rename from src/hb-graphite2.h
rename to harfbuzz-1.9.0/src/hb-graphite2.h
diff --git a/src/hb-icu.cc b/harfbuzz-1.9.0/src/hb-icu.cc
similarity index 100%
rename from src/hb-icu.cc
rename to harfbuzz-1.9.0/src/hb-icu.cc
diff --git a/src/hb-icu.h b/harfbuzz-1.9.0/src/hb-icu.h
similarity index 100%
rename from src/hb-icu.h
rename to harfbuzz-1.9.0/src/hb-icu.h
diff --git a/src/hb-iter.hh b/harfbuzz-1.9.0/src/hb-iter.hh
similarity index 100%
rename from src/hb-iter.hh
rename to harfbuzz-1.9.0/src/hb-iter.hh
diff --git a/src/hb-machinery.hh b/harfbuzz-1.9.0/src/hb-machinery.hh
similarity index 100%
rename from src/hb-machinery.hh
rename to harfbuzz-1.9.0/src/hb-machinery.hh
diff --git a/src/hb-map.cc b/harfbuzz-1.9.0/src/hb-map.cc
similarity index 100%
rename from src/hb-map.cc
rename to harfbuzz-1.9.0/src/hb-map.cc
diff --git a/src/hb-map.h b/harfbuzz-1.9.0/src/hb-map.h
similarity index 100%
rename from src/hb-map.h
rename to harfbuzz-1.9.0/src/hb-map.h
diff --git a/src/hb-map.hh b/harfbuzz-1.9.0/src/hb-map.hh
similarity index 100%
rename from src/hb-map.hh
rename to harfbuzz-1.9.0/src/hb-map.hh
diff --git a/src/hb-mutex.hh b/harfbuzz-1.9.0/src/hb-mutex.hh
similarity index 100%
rename from src/hb-mutex.hh
rename to harfbuzz-1.9.0/src/hb-mutex.hh
diff --git a/src/hb-null.hh b/harfbuzz-1.9.0/src/hb-null.hh
similarity index 100%
rename from src/hb-null.hh
rename to harfbuzz-1.9.0/src/hb-null.hh
diff --git a/src/hb-object.hh b/harfbuzz-1.9.0/src/hb-object.hh
similarity index 100%
rename from src/hb-object.hh
rename to harfbuzz-1.9.0/src/hb-object.hh
diff --git a/src/hb-open-file.hh b/harfbuzz-1.9.0/src/hb-open-file.hh
similarity index 100%
rename from src/hb-open-file.hh
rename to harfbuzz-1.9.0/src/hb-open-file.hh
diff --git a/src/hb-open-type.hh b/harfbuzz-1.9.0/src/hb-open-type.hh
similarity index 100%
rename from src/hb-open-type.hh
rename to harfbuzz-1.9.0/src/hb-open-type.hh
diff --git a/src/hb-ot-cmap-table.hh b/harfbuzz-1.9.0/src/hb-ot-cmap-table.hh
similarity index 100%
rename from src/hb-ot-cmap-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-cmap-table.hh
diff --git a/src/hb-ot-color-cbdt-table.hh b/harfbuzz-1.9.0/src/hb-ot-color-cbdt-table.hh
similarity index 100%
rename from src/hb-ot-color-cbdt-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-color-cbdt-table.hh
diff --git a/src/hb-ot-color-colr-table.hh b/harfbuzz-1.9.0/src/hb-ot-color-colr-table.hh
similarity index 100%
rename from src/hb-ot-color-colr-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-color-colr-table.hh
diff --git a/src/hb-ot-color-cpal-table.hh b/harfbuzz-1.9.0/src/hb-ot-color-cpal-table.hh
similarity index 100%
rename from src/hb-ot-color-cpal-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-color-cpal-table.hh
diff --git a/src/hb-ot-color-sbix-table.hh b/harfbuzz-1.9.0/src/hb-ot-color-sbix-table.hh
similarity index 100%
rename from src/hb-ot-color-sbix-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-color-sbix-table.hh
diff --git a/src/hb-ot-color-svg-table.hh b/harfbuzz-1.9.0/src/hb-ot-color-svg-table.hh
similarity index 100%
rename from src/hb-ot-color-svg-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-color-svg-table.hh
diff --git a/src/hb-ot-color.cc b/harfbuzz-1.9.0/src/hb-ot-color.cc
similarity index 100%
rename from src/hb-ot-color.cc
rename to harfbuzz-1.9.0/src/hb-ot-color.cc
diff --git a/src/hb-ot-face.cc b/harfbuzz-1.9.0/src/hb-ot-face.cc
similarity index 100%
rename from src/hb-ot-face.cc
rename to harfbuzz-1.9.0/src/hb-ot-face.cc
diff --git a/src/hb-ot-face.hh b/harfbuzz-1.9.0/src/hb-ot-face.hh
similarity index 100%
rename from src/hb-ot-face.hh
rename to harfbuzz-1.9.0/src/hb-ot-face.hh
diff --git a/src/hb-ot-font.cc b/harfbuzz-1.9.0/src/hb-ot-font.cc
similarity index 100%
rename from src/hb-ot-font.cc
rename to harfbuzz-1.9.0/src/hb-ot-font.cc
diff --git a/src/hb-ot-font.h b/harfbuzz-1.9.0/src/hb-ot-font.h
similarity index 100%
rename from src/hb-ot-font.h
rename to harfbuzz-1.9.0/src/hb-ot-font.h
diff --git a/src/hb-ot-glyf-table.hh b/harfbuzz-1.9.0/src/hb-ot-glyf-table.hh
similarity index 100%
rename from src/hb-ot-glyf-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-glyf-table.hh
diff --git a/src/hb-ot-hdmx-table.hh b/harfbuzz-1.9.0/src/hb-ot-hdmx-table.hh
similarity index 100%
rename from src/hb-ot-hdmx-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-hdmx-table.hh
diff --git a/src/hb-ot-head-table.hh b/harfbuzz-1.9.0/src/hb-ot-head-table.hh
similarity index 100%
rename from src/hb-ot-head-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-head-table.hh
diff --git a/src/hb-ot-hhea-table.hh b/harfbuzz-1.9.0/src/hb-ot-hhea-table.hh
similarity index 100%
rename from src/hb-ot-hhea-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-hhea-table.hh
diff --git a/src/hb-ot-hmtx-table.hh b/harfbuzz-1.9.0/src/hb-ot-hmtx-table.hh
similarity index 100%
rename from src/hb-ot-hmtx-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-hmtx-table.hh
diff --git a/src/hb-ot-kern-table.hh b/harfbuzz-1.9.0/src/hb-ot-kern-table.hh
similarity index 100%
rename from src/hb-ot-kern-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-kern-table.hh
diff --git a/src/hb-ot-layout-base-table.hh b/harfbuzz-1.9.0/src/hb-ot-layout-base-table.hh
similarity index 100%
rename from src/hb-ot-layout-base-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-base-table.hh
diff --git a/src/hb-ot-layout-common.hh b/harfbuzz-1.9.0/src/hb-ot-layout-common.hh
similarity index 100%
rename from src/hb-ot-layout-common.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-common.hh
diff --git a/src/hb-ot-layout-gdef-table.hh b/harfbuzz-1.9.0/src/hb-ot-layout-gdef-table.hh
similarity index 100%
rename from src/hb-ot-layout-gdef-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-gdef-table.hh
diff --git a/src/hb-ot-layout-gpos-table.hh b/harfbuzz-1.9.0/src/hb-ot-layout-gpos-table.hh
similarity index 100%
rename from src/hb-ot-layout-gpos-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-gpos-table.hh
diff --git a/src/hb-ot-layout-gsub-table.hh b/harfbuzz-1.9.0/src/hb-ot-layout-gsub-table.hh
similarity index 100%
rename from src/hb-ot-layout-gsub-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-gsub-table.hh
diff --git a/src/hb-ot-layout-gsubgpos.hh b/harfbuzz-1.9.0/src/hb-ot-layout-gsubgpos.hh
similarity index 100%
rename from src/hb-ot-layout-gsubgpos.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-gsubgpos.hh
diff --git a/src/hb-ot-layout-jstf-table.hh b/harfbuzz-1.9.0/src/hb-ot-layout-jstf-table.hh
similarity index 100%
rename from src/hb-ot-layout-jstf-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout-jstf-table.hh
diff --git a/src/hb-ot-layout.cc b/harfbuzz-1.9.0/src/hb-ot-layout.cc
similarity index 100%
rename from src/hb-ot-layout.cc
rename to harfbuzz-1.9.0/src/hb-ot-layout.cc
diff --git a/src/hb-ot-layout.h b/harfbuzz-1.9.0/src/hb-ot-layout.h
similarity index 100%
rename from src/hb-ot-layout.h
rename to harfbuzz-1.9.0/src/hb-ot-layout.h
diff --git a/src/hb-ot-layout.hh b/harfbuzz-1.9.0/src/hb-ot-layout.hh
similarity index 100%
rename from src/hb-ot-layout.hh
rename to harfbuzz-1.9.0/src/hb-ot-layout.hh
diff --git a/src/hb-ot-map.cc b/harfbuzz-1.9.0/src/hb-ot-map.cc
similarity index 100%
rename from src/hb-ot-map.cc
rename to harfbuzz-1.9.0/src/hb-ot-map.cc
diff --git a/src/hb-ot-map.hh b/harfbuzz-1.9.0/src/hb-ot-map.hh
similarity index 100%
rename from src/hb-ot-map.hh
rename to harfbuzz-1.9.0/src/hb-ot-map.hh
diff --git a/src/hb-ot-math-table.hh b/harfbuzz-1.9.0/src/hb-ot-math-table.hh
similarity index 100%
rename from src/hb-ot-math-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-math-table.hh
diff --git a/src/hb-ot-math.cc b/harfbuzz-1.9.0/src/hb-ot-math.cc
similarity index 100%
rename from src/hb-ot-math.cc
rename to harfbuzz-1.9.0/src/hb-ot-math.cc
diff --git a/src/hb-ot-math.h b/harfbuzz-1.9.0/src/hb-ot-math.h
similarity index 100%
rename from src/hb-ot-math.h
rename to harfbuzz-1.9.0/src/hb-ot-math.h
diff --git a/src/hb-ot-maxp-table.hh b/harfbuzz-1.9.0/src/hb-ot-maxp-table.hh
similarity index 100%
rename from src/hb-ot-maxp-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-maxp-table.hh
diff --git a/src/hb-ot-name-table.hh b/harfbuzz-1.9.0/src/hb-ot-name-table.hh
similarity index 100%
rename from src/hb-ot-name-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-name-table.hh
diff --git a/src/hb-ot-os2-table.hh b/harfbuzz-1.9.0/src/hb-ot-os2-table.hh
similarity index 100%
rename from src/hb-ot-os2-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-os2-table.hh
diff --git a/src/hb-ot-os2-unicode-ranges.hh b/harfbuzz-1.9.0/src/hb-ot-os2-unicode-ranges.hh
similarity index 100%
rename from src/hb-ot-os2-unicode-ranges.hh
rename to harfbuzz-1.9.0/src/hb-ot-os2-unicode-ranges.hh
diff --git a/src/hb-ot-post-macroman.hh b/harfbuzz-1.9.0/src/hb-ot-post-macroman.hh
similarity index 100%
rename from src/hb-ot-post-macroman.hh
rename to harfbuzz-1.9.0/src/hb-ot-post-macroman.hh
diff --git a/src/hb-ot-post-table.hh b/harfbuzz-1.9.0/src/hb-ot-post-table.hh
similarity index 100%
rename from src/hb-ot-post-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-post-table.hh
diff --git a/src/hb-ot-shape-complex-arabic-fallback.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic-fallback.hh
similarity index 100%
rename from src/hb-ot-shape-complex-arabic-fallback.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic-fallback.hh
diff --git a/src/hb-ot-shape-complex-arabic-table.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic-table.hh
similarity index 100%
rename from src/hb-ot-shape-complex-arabic-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic-table.hh
diff --git a/src/hb-ot-shape-complex-arabic-win1256.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic-win1256.hh
similarity index 100%
rename from src/hb-ot-shape-complex-arabic-win1256.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic-win1256.hh
diff --git a/src/hb-ot-shape-complex-arabic.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic.cc
similarity index 100%
rename from src/hb-ot-shape-complex-arabic.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic.cc
diff --git a/src/hb-ot-shape-complex-arabic.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic.hh
similarity index 100%
rename from src/hb-ot-shape-complex-arabic.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-arabic.hh
diff --git a/src/hb-ot-shape-complex-default.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-default.cc
similarity index 100%
rename from src/hb-ot-shape-complex-default.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-default.cc
diff --git a/src/hb-ot-shape-complex-hangul.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-hangul.cc
similarity index 100%
rename from src/hb-ot-shape-complex-hangul.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-hangul.cc
diff --git a/src/hb-ot-shape-complex-hebrew.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-hebrew.cc
similarity index 100%
rename from src/hb-ot-shape-complex-hebrew.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-hebrew.cc
diff --git a/src/hb-ot-shape-complex-indic-machine.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-indic-machine.hh
similarity index 100%
rename from src/hb-ot-shape-complex-indic-machine.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-indic-machine.hh
diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/harfbuzz-1.9.0/src/hb-ot-shape-complex-indic-machine.rl
similarity index 100%
rename from src/hb-ot-shape-complex-indic-machine.rl
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-indic-machine.rl
diff --git a/src/hb-ot-shape-complex-indic-table.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-indic-table.cc
similarity index 100%
rename from src/hb-ot-shape-complex-indic-table.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-indic-table.cc
diff --git a/src/hb-ot-shape-complex-indic.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-indic.cc
similarity index 100%
rename from src/hb-ot-shape-complex-indic.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-indic.cc
diff --git a/src/hb-ot-shape-complex-indic.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-indic.hh
similarity index 100%
rename from src/hb-ot-shape-complex-indic.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-indic.hh
diff --git a/src/hb-ot-shape-complex-khmer-machine.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer-machine.hh
similarity index 100%
rename from src/hb-ot-shape-complex-khmer-machine.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer-machine.hh
diff --git a/src/hb-ot-shape-complex-khmer-machine.rl b/harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer-machine.rl
similarity index 100%
rename from src/hb-ot-shape-complex-khmer-machine.rl
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer-machine.rl
diff --git a/src/hb-ot-shape-complex-khmer.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer.cc
similarity index 100%
rename from src/hb-ot-shape-complex-khmer.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer.cc
diff --git a/src/hb-ot-shape-complex-khmer.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer.hh
similarity index 100%
rename from src/hb-ot-shape-complex-khmer.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-khmer.hh
diff --git a/src/hb-ot-shape-complex-myanmar-machine.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar-machine.hh
similarity index 100%
rename from src/hb-ot-shape-complex-myanmar-machine.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar-machine.hh
diff --git a/src/hb-ot-shape-complex-myanmar-machine.rl b/harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar-machine.rl
similarity index 100%
rename from src/hb-ot-shape-complex-myanmar-machine.rl
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar-machine.rl
diff --git a/src/hb-ot-shape-complex-myanmar.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar.cc
similarity index 100%
rename from src/hb-ot-shape-complex-myanmar.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar.cc
diff --git a/src/hb-ot-shape-complex-myanmar.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar.hh
similarity index 100%
rename from src/hb-ot-shape-complex-myanmar.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-myanmar.hh
diff --git a/src/hb-ot-shape-complex-thai.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-thai.cc
similarity index 100%
rename from src/hb-ot-shape-complex-thai.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-thai.cc
diff --git a/src/hb-ot-shape-complex-tibetan.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-tibetan.cc
similarity index 100%
rename from src/hb-ot-shape-complex-tibetan.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-tibetan.cc
diff --git a/src/hb-ot-shape-complex-use-machine.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-use-machine.hh
similarity index 100%
rename from src/hb-ot-shape-complex-use-machine.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-use-machine.hh
diff --git a/src/hb-ot-shape-complex-use-machine.rl b/harfbuzz-1.9.0/src/hb-ot-shape-complex-use-machine.rl
similarity index 100%
rename from src/hb-ot-shape-complex-use-machine.rl
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-use-machine.rl
diff --git a/src/hb-ot-shape-complex-use-table.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-use-table.cc
similarity index 100%
rename from src/hb-ot-shape-complex-use-table.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-use-table.cc
diff --git a/src/hb-ot-shape-complex-use.cc b/harfbuzz-1.9.0/src/hb-ot-shape-complex-use.cc
similarity index 100%
rename from src/hb-ot-shape-complex-use.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-use.cc
diff --git a/src/hb-ot-shape-complex-use.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex-use.hh
similarity index 100%
rename from src/hb-ot-shape-complex-use.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex-use.hh
diff --git a/src/hb-ot-shape-complex.hh b/harfbuzz-1.9.0/src/hb-ot-shape-complex.hh
similarity index 100%
rename from src/hb-ot-shape-complex.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-complex.hh
diff --git a/src/hb-ot-shape-fallback.cc b/harfbuzz-1.9.0/src/hb-ot-shape-fallback.cc
similarity index 100%
rename from src/hb-ot-shape-fallback.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-fallback.cc
diff --git a/src/hb-ot-shape-fallback.hh b/harfbuzz-1.9.0/src/hb-ot-shape-fallback.hh
similarity index 100%
rename from src/hb-ot-shape-fallback.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-fallback.hh
diff --git a/src/hb-ot-shape-normalize.cc b/harfbuzz-1.9.0/src/hb-ot-shape-normalize.cc
similarity index 100%
rename from src/hb-ot-shape-normalize.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape-normalize.cc
diff --git a/src/hb-ot-shape-normalize.hh b/harfbuzz-1.9.0/src/hb-ot-shape-normalize.hh
similarity index 100%
rename from src/hb-ot-shape-normalize.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape-normalize.hh
diff --git a/src/hb-ot-shape.cc b/harfbuzz-1.9.0/src/hb-ot-shape.cc
similarity index 100%
rename from src/hb-ot-shape.cc
rename to harfbuzz-1.9.0/src/hb-ot-shape.cc
diff --git a/src/hb-ot-shape.h b/harfbuzz-1.9.0/src/hb-ot-shape.h
similarity index 100%
rename from src/hb-ot-shape.h
rename to harfbuzz-1.9.0/src/hb-ot-shape.h
diff --git a/src/hb-ot-shape.hh b/harfbuzz-1.9.0/src/hb-ot-shape.hh
similarity index 100%
rename from src/hb-ot-shape.hh
rename to harfbuzz-1.9.0/src/hb-ot-shape.hh
diff --git a/src/hb-ot-tag.cc b/harfbuzz-1.9.0/src/hb-ot-tag.cc
similarity index 100%
rename from src/hb-ot-tag.cc
rename to harfbuzz-1.9.0/src/hb-ot-tag.cc
diff --git a/src/hb-ot-tag.h b/harfbuzz-1.9.0/src/hb-ot-tag.h
similarity index 100%
rename from src/hb-ot-tag.h
rename to harfbuzz-1.9.0/src/hb-ot-tag.h
diff --git a/src/hb-ot-var-avar-table.hh b/harfbuzz-1.9.0/src/hb-ot-var-avar-table.hh
similarity index 100%
rename from src/hb-ot-var-avar-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-var-avar-table.hh
diff --git a/src/hb-ot-var-fvar-table.hh b/harfbuzz-1.9.0/src/hb-ot-var-fvar-table.hh
similarity index 100%
rename from src/hb-ot-var-fvar-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-var-fvar-table.hh
diff --git a/src/hb-ot-var-hvar-table.hh b/harfbuzz-1.9.0/src/hb-ot-var-hvar-table.hh
similarity index 100%
rename from src/hb-ot-var-hvar-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-var-hvar-table.hh
diff --git a/src/hb-ot-var-mvar-table.hh b/harfbuzz-1.9.0/src/hb-ot-var-mvar-table.hh
similarity index 100%
rename from src/hb-ot-var-mvar-table.hh
rename to harfbuzz-1.9.0/src/hb-ot-var-mvar-table.hh
diff --git a/src/hb-ot-var.cc b/harfbuzz-1.9.0/src/hb-ot-var.cc
similarity index 100%
rename from src/hb-ot-var.cc
rename to harfbuzz-1.9.0/src/hb-ot-var.cc
diff --git a/src/hb-ot-var.h b/harfbuzz-1.9.0/src/hb-ot-var.h
similarity index 100%
rename from src/hb-ot-var.h
rename to harfbuzz-1.9.0/src/hb-ot-var.h
diff --git a/src/hb-ot.h b/harfbuzz-1.9.0/src/hb-ot.h
similarity index 100%
rename from src/hb-ot.h
rename to harfbuzz-1.9.0/src/hb-ot.h
diff --git a/src/hb-set-digest.hh b/harfbuzz-1.9.0/src/hb-set-digest.hh
similarity index 100%
rename from src/hb-set-digest.hh
rename to harfbuzz-1.9.0/src/hb-set-digest.hh
diff --git a/src/hb-set.cc b/harfbuzz-1.9.0/src/hb-set.cc
similarity index 100%
rename from src/hb-set.cc
rename to harfbuzz-1.9.0/src/hb-set.cc
diff --git a/src/hb-set.h b/harfbuzz-1.9.0/src/hb-set.h
similarity index 100%
rename from src/hb-set.h
rename to harfbuzz-1.9.0/src/hb-set.h
diff --git a/src/hb-set.hh b/harfbuzz-1.9.0/src/hb-set.hh
similarity index 100%
rename from src/hb-set.hh
rename to harfbuzz-1.9.0/src/hb-set.hh
diff --git a/src/hb-shape-plan.cc b/harfbuzz-1.9.0/src/hb-shape-plan.cc
similarity index 100%
rename from src/hb-shape-plan.cc
rename to harfbuzz-1.9.0/src/hb-shape-plan.cc
diff --git a/src/hb-shape-plan.h b/harfbuzz-1.9.0/src/hb-shape-plan.h
similarity index 100%
rename from src/hb-shape-plan.h
rename to harfbuzz-1.9.0/src/hb-shape-plan.h
diff --git a/src/hb-shape-plan.hh b/harfbuzz-1.9.0/src/hb-shape-plan.hh
similarity index 100%
rename from src/hb-shape-plan.hh
rename to harfbuzz-1.9.0/src/hb-shape-plan.hh
diff --git a/src/hb-shape.cc b/harfbuzz-1.9.0/src/hb-shape.cc
similarity index 100%
rename from src/hb-shape.cc
rename to harfbuzz-1.9.0/src/hb-shape.cc
diff --git a/src/hb-shape.h b/harfbuzz-1.9.0/src/hb-shape.h
similarity index 100%
rename from src/hb-shape.h
rename to harfbuzz-1.9.0/src/hb-shape.h
diff --git a/src/hb-shaper-impl.hh b/harfbuzz-1.9.0/src/hb-shaper-impl.hh
similarity index 100%
rename from src/hb-shaper-impl.hh
rename to harfbuzz-1.9.0/src/hb-shaper-impl.hh
diff --git a/src/hb-shaper-list.hh b/harfbuzz-1.9.0/src/hb-shaper-list.hh
similarity index 100%
rename from src/hb-shaper-list.hh
rename to harfbuzz-1.9.0/src/hb-shaper-list.hh
diff --git a/src/hb-shaper.cc b/harfbuzz-1.9.0/src/hb-shaper.cc
similarity index 100%
rename from src/hb-shaper.cc
rename to harfbuzz-1.9.0/src/hb-shaper.cc
diff --git a/src/hb-shaper.hh b/harfbuzz-1.9.0/src/hb-shaper.hh
similarity index 100%
rename from src/hb-shaper.hh
rename to harfbuzz-1.9.0/src/hb-shaper.hh
diff --git a/src/hb-static.cc b/harfbuzz-1.9.0/src/hb-static.cc
similarity index 100%
rename from src/hb-static.cc
rename to harfbuzz-1.9.0/src/hb-static.cc
diff --git a/src/hb-string-array.hh b/harfbuzz-1.9.0/src/hb-string-array.hh
similarity index 100%
rename from src/hb-string-array.hh
rename to harfbuzz-1.9.0/src/hb-string-array.hh
diff --git a/src/hb-subset-glyf.cc b/harfbuzz-1.9.0/src/hb-subset-glyf.cc
similarity index 100%
rename from src/hb-subset-glyf.cc
rename to harfbuzz-1.9.0/src/hb-subset-glyf.cc
diff --git a/src/hb-subset-glyf.hh b/harfbuzz-1.9.0/src/hb-subset-glyf.hh
similarity index 100%
rename from src/hb-subset-glyf.hh
rename to harfbuzz-1.9.0/src/hb-subset-glyf.hh
diff --git a/src/hb-subset-input.cc b/harfbuzz-1.9.0/src/hb-subset-input.cc
similarity index 100%
rename from src/hb-subset-input.cc
rename to harfbuzz-1.9.0/src/hb-subset-input.cc
diff --git a/src/hb-subset-input.hh b/harfbuzz-1.9.0/src/hb-subset-input.hh
similarity index 100%
rename from src/hb-subset-input.hh
rename to harfbuzz-1.9.0/src/hb-subset-input.hh
diff --git a/src/hb-subset-plan.cc b/harfbuzz-1.9.0/src/hb-subset-plan.cc
similarity index 100%
rename from src/hb-subset-plan.cc
rename to harfbuzz-1.9.0/src/hb-subset-plan.cc
diff --git a/src/hb-subset-plan.hh b/harfbuzz-1.9.0/src/hb-subset-plan.hh
similarity index 100%
rename from src/hb-subset-plan.hh
rename to harfbuzz-1.9.0/src/hb-subset-plan.hh
diff --git a/src/hb-subset.cc b/harfbuzz-1.9.0/src/hb-subset.cc
similarity index 100%
rename from src/hb-subset.cc
rename to harfbuzz-1.9.0/src/hb-subset.cc
diff --git a/src/hb-subset.h b/harfbuzz-1.9.0/src/hb-subset.h
similarity index 100%
rename from src/hb-subset.h
rename to harfbuzz-1.9.0/src/hb-subset.h
diff --git a/src/hb-subset.hh b/harfbuzz-1.9.0/src/hb-subset.hh
similarity index 100%
rename from src/hb-subset.hh
rename to harfbuzz-1.9.0/src/hb-subset.hh
diff --git a/src/hb-ucdn.cc b/harfbuzz-1.9.0/src/hb-ucdn.cc
similarity index 100%
rename from src/hb-ucdn.cc
rename to harfbuzz-1.9.0/src/hb-ucdn.cc
diff --git a/src/hb-ucdn/COPYING b/harfbuzz-1.9.0/src/hb-ucdn/COPYING
similarity index 100%
rename from src/hb-ucdn/COPYING
rename to harfbuzz-1.9.0/src/hb-ucdn/COPYING
diff --git a/src/hb-ucdn/Makefile.am b/harfbuzz-1.9.0/src/hb-ucdn/Makefile.am
similarity index 100%
rename from src/hb-ucdn/Makefile.am
rename to harfbuzz-1.9.0/src/hb-ucdn/Makefile.am
diff --git a/src/hb-ucdn/Makefile.in b/harfbuzz-1.9.0/src/hb-ucdn/Makefile.in
similarity index 100%
rename from src/hb-ucdn/Makefile.in
rename to harfbuzz-1.9.0/src/hb-ucdn/Makefile.in
diff --git a/src/hb-ucdn/Makefile.sources b/harfbuzz-1.9.0/src/hb-ucdn/Makefile.sources
similarity index 100%
rename from src/hb-ucdn/Makefile.sources
rename to harfbuzz-1.9.0/src/hb-ucdn/Makefile.sources
diff --git a/src/hb-ucdn/README b/harfbuzz-1.9.0/src/hb-ucdn/README
similarity index 100%
rename from src/hb-ucdn/README
rename to harfbuzz-1.9.0/src/hb-ucdn/README
diff --git a/src/hb-ucdn/ucdn.c b/harfbuzz-1.9.0/src/hb-ucdn/ucdn.c
similarity index 100%
rename from src/hb-ucdn/ucdn.c
rename to harfbuzz-1.9.0/src/hb-ucdn/ucdn.c
diff --git a/src/hb-ucdn/ucdn.h b/harfbuzz-1.9.0/src/hb-ucdn/ucdn.h
similarity index 100%
rename from src/hb-ucdn/ucdn.h
rename to harfbuzz-1.9.0/src/hb-ucdn/ucdn.h
diff --git a/src/hb-ucdn/ucdn_db.h b/harfbuzz-1.9.0/src/hb-ucdn/ucdn_db.h
similarity index 100%
rename from src/hb-ucdn/ucdn_db.h
rename to harfbuzz-1.9.0/src/hb-ucdn/ucdn_db.h
diff --git a/src/hb-unicode.cc b/harfbuzz-1.9.0/src/hb-unicode.cc
similarity index 100%
rename from src/hb-unicode.cc
rename to harfbuzz-1.9.0/src/hb-unicode.cc
diff --git a/src/hb-unicode.h b/harfbuzz-1.9.0/src/hb-unicode.h
similarity index 100%
rename from src/hb-unicode.h
rename to harfbuzz-1.9.0/src/hb-unicode.h
diff --git a/src/hb-unicode.hh b/harfbuzz-1.9.0/src/hb-unicode.hh
similarity index 100%
rename from src/hb-unicode.hh
rename to harfbuzz-1.9.0/src/hb-unicode.hh
diff --git a/src/hb-uniscribe.cc b/harfbuzz-1.9.0/src/hb-uniscribe.cc
similarity index 100%
rename from src/hb-uniscribe.cc
rename to harfbuzz-1.9.0/src/hb-uniscribe.cc
diff --git a/src/hb-uniscribe.h b/harfbuzz-1.9.0/src/hb-uniscribe.h
similarity index 100%
rename from src/hb-uniscribe.h
rename to harfbuzz-1.9.0/src/hb-uniscribe.h
diff --git a/src/hb-utf.hh b/harfbuzz-1.9.0/src/hb-utf.hh
similarity index 100%
rename from src/hb-utf.hh
rename to harfbuzz-1.9.0/src/hb-utf.hh
diff --git a/src/hb-vector.hh b/harfbuzz-1.9.0/src/hb-vector.hh
similarity index 100%
rename from src/hb-vector.hh
rename to harfbuzz-1.9.0/src/hb-vector.hh
diff --git a/src/hb-version.h b/harfbuzz-1.9.0/src/hb-version.h
similarity index 100%
rename from src/hb-version.h
rename to harfbuzz-1.9.0/src/hb-version.h
diff --git a/src/hb-version.h.in b/harfbuzz-1.9.0/src/hb-version.h.in
similarity index 100%
rename from src/hb-version.h.in
rename to harfbuzz-1.9.0/src/hb-version.h.in
diff --git a/src/hb-warning.cc b/harfbuzz-1.9.0/src/hb-warning.cc
similarity index 100%
rename from src/hb-warning.cc
rename to harfbuzz-1.9.0/src/hb-warning.cc
diff --git a/src/hb.h b/harfbuzz-1.9.0/src/hb.h
similarity index 100%
rename from src/hb.h
rename to harfbuzz-1.9.0/src/hb.h
diff --git a/src/hb.hh b/harfbuzz-1.9.0/src/hb.hh
similarity index 100%
rename from src/hb.hh
rename to harfbuzz-1.9.0/src/hb.hh
diff --git a/src/main.cc b/harfbuzz-1.9.0/src/main.cc
similarity index 100%
rename from src/main.cc
rename to harfbuzz-1.9.0/src/main.cc
diff --git a/src/test-buffer-serialize.cc b/harfbuzz-1.9.0/src/test-buffer-serialize.cc
similarity index 100%
rename from src/test-buffer-serialize.cc
rename to harfbuzz-1.9.0/src/test-buffer-serialize.cc
diff --git a/src/test-size-params.cc b/harfbuzz-1.9.0/src/test-size-params.cc
similarity index 100%
rename from src/test-size-params.cc
rename to harfbuzz-1.9.0/src/test-size-params.cc
diff --git a/src/test-unicode-ranges.cc b/harfbuzz-1.9.0/src/test-unicode-ranges.cc
similarity index 100%
rename from src/test-unicode-ranges.cc
rename to harfbuzz-1.9.0/src/test-unicode-ranges.cc
diff --git a/src/test-would-substitute.cc b/harfbuzz-1.9.0/src/test-would-substitute.cc
similarity index 100%
rename from src/test-would-substitute.cc
rename to harfbuzz-1.9.0/src/test-would-substitute.cc
diff --git a/src/test.cc b/harfbuzz-1.9.0/src/test.cc
similarity index 100%
rename from src/test.cc
rename to harfbuzz-1.9.0/src/test.cc
diff --git a/test-driver b/harfbuzz-1.9.0/test-driver
similarity index 100%
rename from test-driver
rename to harfbuzz-1.9.0/test-driver
diff --git a/test/CMakeLists.txt b/harfbuzz-1.9.0/test/CMakeLists.txt
similarity index 100%
rename from test/CMakeLists.txt
rename to harfbuzz-1.9.0/test/CMakeLists.txt
diff --git a/test/Makefile.am b/harfbuzz-1.9.0/test/Makefile.am
similarity index 100%
rename from test/Makefile.am
rename to harfbuzz-1.9.0/test/Makefile.am
diff --git a/test/Makefile.in b/harfbuzz-1.9.0/test/Makefile.in
similarity index 100%
rename from test/Makefile.in
rename to harfbuzz-1.9.0/test/Makefile.in
diff --git a/test/api/CMakeLists.txt b/harfbuzz-1.9.0/test/api/CMakeLists.txt
similarity index 100%
rename from test/api/CMakeLists.txt
rename to harfbuzz-1.9.0/test/api/CMakeLists.txt
diff --git a/test/api/Makefile.am b/harfbuzz-1.9.0/test/api/Makefile.am
similarity index 100%
rename from test/api/Makefile.am
rename to harfbuzz-1.9.0/test/api/Makefile.am
diff --git a/test/api/Makefile.in b/harfbuzz-1.9.0/test/api/Makefile.in
similarity index 100%
rename from test/api/Makefile.in
rename to harfbuzz-1.9.0/test/api/Makefile.in
diff --git a/test/api/fonts/Inconsolata-Regular.ab.ttf b/harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.ab.ttf
similarity index 100%
rename from test/api/fonts/Inconsolata-Regular.ab.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.ab.ttf
diff --git a/test/api/fonts/Inconsolata-Regular.abc.ttf b/harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.abc.ttf
similarity index 100%
rename from test/api/fonts/Inconsolata-Regular.abc.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.abc.ttf
diff --git a/test/api/fonts/Inconsolata-Regular.abc.widerc.ttf b/harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.abc.widerc.ttf
similarity index 100%
rename from test/api/fonts/Inconsolata-Regular.abc.widerc.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.abc.widerc.ttf
diff --git a/test/api/fonts/Inconsolata-Regular.ac.ttf b/harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.ac.ttf
similarity index 100%
rename from test/api/fonts/Inconsolata-Regular.ac.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.ac.ttf
diff --git a/test/api/fonts/Inconsolata-Regular.ac.widerc.ttf b/harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.ac.widerc.ttf
similarity index 100%
rename from test/api/fonts/Inconsolata-Regular.ac.widerc.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Inconsolata-Regular.ac.widerc.ttf
diff --git a/test/api/fonts/MathTestFontEmpty.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontEmpty.otf
similarity index 100%
rename from test/api/fonts/MathTestFontEmpty.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontEmpty.otf
diff --git a/test/api/fonts/MathTestFontFull.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontFull.otf
similarity index 100%
rename from test/api/fonts/MathTestFontFull.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontFull.otf
diff --git a/test/api/fonts/MathTestFontFull.ttx b/harfbuzz-1.9.0/test/api/fonts/MathTestFontFull.ttx
similarity index 100%
rename from test/api/fonts/MathTestFontFull.ttx
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontFull.ttx
diff --git a/test/api/fonts/MathTestFontNone.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontNone.otf
similarity index 100%
rename from test/api/fonts/MathTestFontNone.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontNone.otf
diff --git a/test/api/fonts/MathTestFontPartial1.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial1.otf
similarity index 100%
rename from test/api/fonts/MathTestFontPartial1.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial1.otf
diff --git a/test/api/fonts/MathTestFontPartial2.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial2.otf
similarity index 100%
rename from test/api/fonts/MathTestFontPartial2.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial2.otf
diff --git a/test/api/fonts/MathTestFontPartial3.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial3.otf
similarity index 100%
rename from test/api/fonts/MathTestFontPartial3.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial3.otf
diff --git a/test/api/fonts/MathTestFontPartial4.otf b/harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial4.otf
similarity index 100%
rename from test/api/fonts/MathTestFontPartial4.otf
rename to harfbuzz-1.9.0/test/api/fonts/MathTestFontPartial4.otf
diff --git a/test/api/fonts/Mplus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf b/harfbuzz-1.9.0/test/api/fonts/Mplus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf
similarity index 100%
rename from test/api/fonts/Mplus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Mplus1p-Regular.660E,6975,73E0,5EA6,8F38,6E05.ttf
diff --git a/test/api/fonts/Mplus1p-Regular.660E.ttf b/harfbuzz-1.9.0/test/api/fonts/Mplus1p-Regular.660E.ttf
similarity index 100%
rename from test/api/fonts/Mplus1p-Regular.660E.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Mplus1p-Regular.660E.ttf
diff --git a/test/api/fonts/README b/harfbuzz-1.9.0/test/api/fonts/README
similarity index 100%
rename from test/api/fonts/README
rename to harfbuzz-1.9.0/test/api/fonts/README
diff --git a/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
diff --git a/test/api/fonts/Roboto-Regular.abc.cmap-format12-only.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.cmap-format12-only.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.abc.cmap-format12-only.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.cmap-format12-only.ttf
diff --git a/test/api/fonts/Roboto-Regular.abc.format12.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.format12.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.abc.format12.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.format12.ttf
diff --git a/test/api/fonts/Roboto-Regular.abc.format4.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.format4.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.abc.format4.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.format4.ttf
diff --git a/test/api/fonts/Roboto-Regular.abc.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.abc.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.abc.ttf
diff --git a/test/api/fonts/Roboto-Regular.ac.cmap-format12-only.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.ac.cmap-format12-only.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.ac.cmap-format12-only.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.ac.cmap-format12-only.ttf
diff --git a/test/api/fonts/Roboto-Regular.ac.nohints.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.ac.nohints.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.ac.nohints.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.ac.nohints.ttf
diff --git a/test/api/fonts/Roboto-Regular.ac.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.ac.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.ac.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.ac.ttf
diff --git a/test/api/fonts/Roboto-Regular.b.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.b.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.b.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.b.ttf
diff --git a/test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.components.1fc.nohints.ttf
diff --git a/test/api/fonts/Roboto-Regular.components.subset.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.components.subset.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.components.subset.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.components.subset.ttf
diff --git a/test/api/fonts/Roboto-Regular.components.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.components.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.components.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.components.ttf
diff --git a/test/api/fonts/Roboto-Regular.gsub.fi.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.gsub.fi.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.gsub.fi.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.gsub.fi.ttf
diff --git a/test/api/fonts/Roboto-Regular.gsub.fil.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.gsub.fil.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.gsub.fil.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.gsub.fil.ttf
diff --git a/test/api/fonts/Roboto-Regular.multihdmx.a.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.multihdmx.a.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.multihdmx.a.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.multihdmx.a.ttf
diff --git a/test/api/fonts/Roboto-Regular.multihdmx.abc.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.multihdmx.abc.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.multihdmx.abc.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.multihdmx.abc.ttf
diff --git a/test/api/fonts/Roboto-Regular.nogsub.fi.ttf b/harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.nogsub.fi.ttf
similarity index 100%
rename from test/api/fonts/Roboto-Regular.nogsub.fi.ttf
rename to harfbuzz-1.9.0/test/api/fonts/Roboto-Regular.nogsub.fi.ttf
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5521982557782016
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5542653037903872
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5609911946838016
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5670861909524480 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5670861909524480
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5670861909524480
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5670861909524480
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5750092395970560
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6651660668502016 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6651660668502016
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6651660668502016
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-6651660668502016
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5973295416475648 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5973295416475648
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5973295416475648
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-5973295416475648
diff --git a/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912 b/harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912
similarity index 100%
rename from test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912
rename to harfbuzz-1.9.0/test/api/fonts/clusterfuzz-testcase-minimized-hb-subset-get-codepoints-fuzzer-6136125075750912
diff --git a/test/api/fonts/crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249 b/harfbuzz-1.9.0/test/api/fonts/crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249
similarity index 100%
rename from test/api/fonts/crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249
rename to harfbuzz-1.9.0/test/api/fonts/crash-4b60576767ee4d9fe1cc10959d89baf73d4e8249
diff --git a/test/api/fonts/crash-b577db318b30f2851828a4c9ef97cb30678b1b54 b/harfbuzz-1.9.0/test/api/fonts/crash-b577db318b30f2851828a4c9ef97cb30678b1b54
similarity index 100%
rename from test/api/fonts/crash-b577db318b30f2851828a4c9ef97cb30678b1b54
rename to harfbuzz-1.9.0/test/api/fonts/crash-b577db318b30f2851828a4c9ef97cb30678b1b54
diff --git a/test/api/fonts/crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a b/harfbuzz-1.9.0/test/api/fonts/crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
similarity index 100%
rename from test/api/fonts/crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
rename to harfbuzz-1.9.0/test/api/fonts/crash-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
diff --git a/test/api/fonts/crash-e4e0bb1458a91b692eba492c907ae1f94e635480 b/harfbuzz-1.9.0/test/api/fonts/crash-e4e0bb1458a91b692eba492c907ae1f94e635480
similarity index 100%
rename from test/api/fonts/crash-e4e0bb1458a91b692eba492c907ae1f94e635480
rename to harfbuzz-1.9.0/test/api/fonts/crash-e4e0bb1458a91b692eba492c907ae1f94e635480
diff --git a/test/api/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653 b/harfbuzz-1.9.0/test/api/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653
similarity index 100%
rename from test/api/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653
rename to harfbuzz-1.9.0/test/api/fonts/oom-6ef8c96d3710262511bcc730dce9c00e722cb653
diff --git a/test/api/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a b/harfbuzz-1.9.0/test/api/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
similarity index 100%
rename from test/api/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
rename to harfbuzz-1.9.0/test/api/fonts/oom-ccc61c92d589f895174cdef6ff2e3b20e9999a1a
diff --git a/test/api/hb-subset-test.h b/harfbuzz-1.9.0/test/api/hb-subset-test.h
similarity index 100%
rename from test/api/hb-subset-test.h
rename to harfbuzz-1.9.0/test/api/hb-subset-test.h
diff --git a/test/api/hb-test.h b/harfbuzz-1.9.0/test/api/hb-test.h
similarity index 100%
rename from test/api/hb-test.h
rename to harfbuzz-1.9.0/test/api/hb-test.h
diff --git a/test/api/test-blob.c b/harfbuzz-1.9.0/test/api/test-blob.c
similarity index 100%
rename from test/api/test-blob.c
rename to harfbuzz-1.9.0/test/api/test-blob.c
diff --git a/test/api/test-buffer.c b/harfbuzz-1.9.0/test/api/test-buffer.c
similarity index 100%
rename from test/api/test-buffer.c
rename to harfbuzz-1.9.0/test/api/test-buffer.c
diff --git a/test/api/test-c.c b/harfbuzz-1.9.0/test/api/test-c.c
similarity index 100%
rename from test/api/test-c.c
rename to harfbuzz-1.9.0/test/api/test-c.c
diff --git a/test/api/test-common.c b/harfbuzz-1.9.0/test/api/test-common.c
similarity index 100%
rename from test/api/test-common.c
rename to harfbuzz-1.9.0/test/api/test-common.c
diff --git a/test/api/test-cplusplus.cc b/harfbuzz-1.9.0/test/api/test-cplusplus.cc
similarity index 100%
rename from test/api/test-cplusplus.cc
rename to harfbuzz-1.9.0/test/api/test-cplusplus.cc
diff --git a/test/api/test-font.c b/harfbuzz-1.9.0/test/api/test-font.c
similarity index 100%
rename from test/api/test-font.c
rename to harfbuzz-1.9.0/test/api/test-font.c
diff --git a/test/api/test-object.c b/harfbuzz-1.9.0/test/api/test-object.c
similarity index 100%
rename from test/api/test-object.c
rename to harfbuzz-1.9.0/test/api/test-object.c
diff --git a/test/api/test-ot-color.c b/harfbuzz-1.9.0/test/api/test-ot-color.c
similarity index 100%
rename from test/api/test-ot-color.c
rename to harfbuzz-1.9.0/test/api/test-ot-color.c
diff --git a/test/api/test-ot-math.c b/harfbuzz-1.9.0/test/api/test-ot-math.c
similarity index 100%
rename from test/api/test-ot-math.c
rename to harfbuzz-1.9.0/test/api/test-ot-math.c
diff --git a/test/api/test-ot-tag.c b/harfbuzz-1.9.0/test/api/test-ot-tag.c
similarity index 100%
rename from test/api/test-ot-tag.c
rename to harfbuzz-1.9.0/test/api/test-ot-tag.c
diff --git a/test/api/test-set.c b/harfbuzz-1.9.0/test/api/test-set.c
similarity index 100%
rename from test/api/test-set.c
rename to harfbuzz-1.9.0/test/api/test-set.c
diff --git a/test/api/test-shape.c b/harfbuzz-1.9.0/test/api/test-shape.c
similarity index 100%
rename from test/api/test-shape.c
rename to harfbuzz-1.9.0/test/api/test-shape.c
diff --git a/test/api/test-subset-cmap.c b/harfbuzz-1.9.0/test/api/test-subset-cmap.c
similarity index 100%
rename from test/api/test-subset-cmap.c
rename to harfbuzz-1.9.0/test/api/test-subset-cmap.c
diff --git a/test/api/test-subset-codepoints.c b/harfbuzz-1.9.0/test/api/test-subset-codepoints.c
similarity index 100%
rename from test/api/test-subset-codepoints.c
rename to harfbuzz-1.9.0/test/api/test-subset-codepoints.c
diff --git a/test/api/test-subset-glyf.c b/harfbuzz-1.9.0/test/api/test-subset-glyf.c
similarity index 100%
rename from test/api/test-subset-glyf.c
rename to harfbuzz-1.9.0/test/api/test-subset-glyf.c
diff --git a/test/api/test-subset-hdmx.c b/harfbuzz-1.9.0/test/api/test-subset-hdmx.c
similarity index 100%
rename from test/api/test-subset-hdmx.c
rename to harfbuzz-1.9.0/test/api/test-subset-hdmx.c
diff --git a/test/api/test-subset-hmtx.c b/harfbuzz-1.9.0/test/api/test-subset-hmtx.c
similarity index 100%
rename from test/api/test-subset-hmtx.c
rename to harfbuzz-1.9.0/test/api/test-subset-hmtx.c
diff --git a/test/api/test-subset-os2.c b/harfbuzz-1.9.0/test/api/test-subset-os2.c
similarity index 100%
rename from test/api/test-subset-os2.c
rename to harfbuzz-1.9.0/test/api/test-subset-os2.c
diff --git a/test/api/test-subset-post.c b/harfbuzz-1.9.0/test/api/test-subset-post.c
similarity index 100%
rename from test/api/test-subset-post.c
rename to harfbuzz-1.9.0/test/api/test-subset-post.c
diff --git a/test/api/test-subset-vmtx.c b/harfbuzz-1.9.0/test/api/test-subset-vmtx.c
similarity index 100%
rename from test/api/test-subset-vmtx.c
rename to harfbuzz-1.9.0/test/api/test-subset-vmtx.c
diff --git a/test/api/test-subset.c b/harfbuzz-1.9.0/test/api/test-subset.c
similarity index 100%
rename from test/api/test-subset.c
rename to harfbuzz-1.9.0/test/api/test-subset.c
diff --git a/test/api/test-unicode.c b/harfbuzz-1.9.0/test/api/test-unicode.c
similarity index 100%
rename from test/api/test-unicode.c
rename to harfbuzz-1.9.0/test/api/test-unicode.c
diff --git a/test/api/test-version.c b/harfbuzz-1.9.0/test/api/test-version.c
similarity index 100%
rename from test/api/test-version.c
rename to harfbuzz-1.9.0/test/api/test-version.c
diff --git a/test/fuzzing/CMakeLists.txt b/harfbuzz-1.9.0/test/fuzzing/CMakeLists.txt
similarity index 100%
rename from test/fuzzing/CMakeLists.txt
rename to harfbuzz-1.9.0/test/fuzzing/CMakeLists.txt
diff --git a/test/fuzzing/Makefile.am b/harfbuzz-1.9.0/test/fuzzing/Makefile.am
similarity index 100%
rename from test/fuzzing/Makefile.am
rename to harfbuzz-1.9.0/test/fuzzing/Makefile.am
diff --git a/test/fuzzing/Makefile.in b/harfbuzz-1.9.0/test/fuzzing/Makefile.in
similarity index 100%
rename from test/fuzzing/Makefile.in
rename to harfbuzz-1.9.0/test/fuzzing/Makefile.in
diff --git a/test/fuzzing/README b/harfbuzz-1.9.0/test/fuzzing/README
similarity index 100%
rename from test/fuzzing/README
rename to harfbuzz-1.9.0/test/fuzzing/README
diff --git a/test/fuzzing/hb-fuzzer.hh b/harfbuzz-1.9.0/test/fuzzing/hb-fuzzer.hh
similarity index 100%
rename from test/fuzzing/hb-fuzzer.hh
rename to harfbuzz-1.9.0/test/fuzzing/hb-fuzzer.hh
diff --git a/test/fuzzing/hb-shape-fuzzer.cc b/harfbuzz-1.9.0/test/fuzzing/hb-shape-fuzzer.cc
similarity index 100%
rename from test/fuzzing/hb-shape-fuzzer.cc
rename to harfbuzz-1.9.0/test/fuzzing/hb-shape-fuzzer.cc
diff --git a/test/fuzzing/hb-subset-fuzzer.cc b/harfbuzz-1.9.0/test/fuzzing/hb-subset-fuzzer.cc
similarity index 100%
rename from test/fuzzing/hb-subset-fuzzer.cc
rename to harfbuzz-1.9.0/test/fuzzing/hb-subset-fuzzer.cc
diff --git a/test/fuzzing/hb-subset-get-codepoints-fuzzer.cc b/harfbuzz-1.9.0/test/fuzzing/hb-subset-get-codepoints-fuzzer.cc
similarity index 100%
rename from test/fuzzing/hb-subset-get-codepoints-fuzzer.cc
rename to harfbuzz-1.9.0/test/fuzzing/hb-subset-get-codepoints-fuzzer.cc
diff --git a/test/fuzzing/main.cc b/harfbuzz-1.9.0/test/fuzzing/main.cc
similarity index 100%
rename from test/fuzzing/main.cc
rename to harfbuzz-1.9.0/test/fuzzing/main.cc
diff --git a/test/fuzzing/run-shape-fuzzer-tests.py b/harfbuzz-1.9.0/test/fuzzing/run-shape-fuzzer-tests.py
similarity index 100%
rename from test/fuzzing/run-shape-fuzzer-tests.py
rename to harfbuzz-1.9.0/test/fuzzing/run-shape-fuzzer-tests.py
diff --git a/test/fuzzing/run-subset-fuzzer-tests.py b/harfbuzz-1.9.0/test/fuzzing/run-subset-fuzzer-tests.py
similarity index 100%
rename from test/fuzzing/run-subset-fuzzer-tests.py
rename to harfbuzz-1.9.0/test/fuzzing/run-subset-fuzzer-tests.py
diff --git a/test/shaping/CMakeLists.txt b/harfbuzz-1.9.0/test/shaping/CMakeLists.txt
similarity index 100%
rename from test/shaping/CMakeLists.txt
rename to harfbuzz-1.9.0/test/shaping/CMakeLists.txt
diff --git a/test/shaping/Makefile.am b/harfbuzz-1.9.0/test/shaping/Makefile.am
similarity index 100%
rename from test/shaping/Makefile.am
rename to harfbuzz-1.9.0/test/shaping/Makefile.am
diff --git a/test/shaping/Makefile.in b/harfbuzz-1.9.0/test/shaping/Makefile.in
similarity index 100%
rename from test/shaping/Makefile.in
rename to harfbuzz-1.9.0/test/shaping/Makefile.in
diff --git a/test/shaping/README.md b/harfbuzz-1.9.0/test/shaping/README.md
similarity index 100%
rename from test/shaping/README.md
rename to harfbuzz-1.9.0/test/shaping/README.md
diff --git a/test/shaping/data/Makefile.am b/harfbuzz-1.9.0/test/shaping/data/Makefile.am
similarity index 100%
rename from test/shaping/data/Makefile.am
rename to harfbuzz-1.9.0/test/shaping/data/Makefile.am
diff --git a/test/shaping/data/Makefile.in b/harfbuzz-1.9.0/test/shaping/data/Makefile.in
similarity index 100%
rename from test/shaping/data/Makefile.in
rename to harfbuzz-1.9.0/test/shaping/data/Makefile.in
diff --git a/test/shaping/data/in-house/COPYING b/harfbuzz-1.9.0/test/shaping/data/in-house/COPYING
similarity index 100%
rename from test/shaping/data/in-house/COPYING
rename to harfbuzz-1.9.0/test/shaping/data/in-house/COPYING
diff --git a/test/shaping/data/in-house/Makefile.am b/harfbuzz-1.9.0/test/shaping/data/in-house/Makefile.am
similarity index 100%
rename from test/shaping/data/in-house/Makefile.am
rename to harfbuzz-1.9.0/test/shaping/data/in-house/Makefile.am
diff --git a/test/shaping/data/in-house/Makefile.in b/harfbuzz-1.9.0/test/shaping/data/in-house/Makefile.in
similarity index 100%
rename from test/shaping/data/in-house/Makefile.in
rename to harfbuzz-1.9.0/test/shaping/data/in-house/Makefile.in
diff --git a/test/shaping/data/in-house/Makefile.sources b/harfbuzz-1.9.0/test/shaping/data/in-house/Makefile.sources
similarity index 100%
rename from test/shaping/data/in-house/Makefile.sources
rename to harfbuzz-1.9.0/test/shaping/data/in-house/Makefile.sources
diff --git a/test/shaping/data/in-house/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf
diff --git a/test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/051d92f8bc6ff724511b296c27623f824de256e9.ttf
diff --git a/test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf
diff --git a/test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/07f054357ff8638bac3711b422a1e31180bba863.ttf
diff --git a/test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf
diff --git a/test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1735326da89f0818cd8c51a0600e9789812c0f94.ttf
diff --git a/test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/191826b9643e3f124d865d617ae609db6a2ce203.ttf
diff --git a/test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1a3d8f381387dd29be1e897e4b5100ac8b4829e1.ttf
diff --git a/test/shaping/data/in-house/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf
diff --git a/test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
diff --git a/test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf
diff --git a/test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf
diff --git a/test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf
diff --git a/test/shaping/data/in-house/fonts/205edd09bd3d141cc9580f650109556cc28b22cb.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/205edd09bd3d141cc9580f650109556cc28b22cb.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/205edd09bd3d141cc9580f650109556cc28b22cb.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/205edd09bd3d141cc9580f650109556cc28b22cb.ttf
diff --git a/test/shaping/data/in-house/fonts/217a934cfe15c548b572c203dceb2befdf026462.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/217a934cfe15c548b572c203dceb2befdf026462.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/217a934cfe15c548b572c203dceb2befdf026462.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/217a934cfe15c548b572c203dceb2befdf026462.ttf
diff --git a/test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/21b7fb9c1eeae260473809fbc1fe330f66a507cd.ttf
diff --git a/test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/226bc2deab3846f1a682085f70c67d0421014144.ttf
diff --git a/test/shaping/data/in-house/fonts/233c1e252e737ca79e03a9fd56b71aaa4a230f2b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/233c1e252e737ca79e03a9fd56b71aaa4a230f2b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/233c1e252e737ca79e03a9fd56b71aaa4a230f2b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/233c1e252e737ca79e03a9fd56b71aaa4a230f2b.ttf
diff --git a/test/shaping/data/in-house/fonts/243798dd281c1c77c065958e1ff467420faa9bde.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/243798dd281c1c77c065958e1ff467420faa9bde.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/243798dd281c1c77c065958e1ff467420faa9bde.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/243798dd281c1c77c065958e1ff467420faa9bde.ttf
diff --git a/test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/24b8d24d00ae86f49791b746da4c9d3f717a51a8.ttf
diff --git a/test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/270b89df543a7e48e206a2d830c0e10e5265c630.ttf
diff --git a/test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf
diff --git a/test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf
diff --git a/test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/2de1ab4907ab688c0cfc236b0bf51151db38bf2e.ttf
diff --git a/test/shaping/data/in-house/fonts/319f5d7ebffbefc5c5e6569f8cea73444d7a7268.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/319f5d7ebffbefc5c5e6569f8cea73444d7a7268.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/319f5d7ebffbefc5c5e6569f8cea73444d7a7268.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/319f5d7ebffbefc5c5e6569f8cea73444d7a7268.ttf
diff --git a/test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/341421e629668b1a1242245d39238ca48432d35d.ttf
diff --git a/test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3493e92eaded2661cadde752a39f9d58b11f0326.ttf
diff --git a/test/shaping/data/in-house/fonts/3511ff5c1647150595846ac414c595cccac34f18.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3511ff5c1647150595846ac414c595cccac34f18.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/3511ff5c1647150595846ac414c595cccac34f18.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3511ff5c1647150595846ac414c595cccac34f18.ttf
diff --git a/test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/37033cc5cf37bb223d7355153016b6ccece93b28.ttf
diff --git a/test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf
diff --git a/test/shaping/data/in-house/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf
diff --git a/test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf
diff --git a/test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3cae6bfe5b57c07ba81ddbd54c02fe4f3a1e3bf6.ttf
diff --git a/test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf
diff --git a/test/shaping/data/in-house/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf
diff --git a/test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/43ef465752be9af900745f72fe29cb853a1401a5.ttf
diff --git a/test/shaping/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf
diff --git a/test/shaping/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf
diff --git a/test/shaping/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf
diff --git a/test/shaping/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/4fac3929fc3332834e93673780ec0fe94342d193.ttf
diff --git a/test/shaping/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5028afb650b1bb718ed2131e872fbcce57828fff.ttf
diff --git a/test/shaping/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/53374c7ca3657be37efde7ed02ae34229a56ae1f.ttf
diff --git a/test/shaping/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf
diff --git a/test/shaping/data/in-house/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/558661aa659912f4d30ecd27bd09835171a8e2b0.ttf
diff --git a/test/shaping/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/55c88ebbe938680b08f92c3de20713183e0c7481.ttf
diff --git a/test/shaping/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf
diff --git a/test/shaping/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf
diff --git a/test/shaping/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf
diff --git a/test/shaping/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf
diff --git a/test/shaping/data/in-house/fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf
diff --git a/test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5af5361ed4d1e8305780b100e1730cb09132f8d1.ttf
diff --git a/test/shaping/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/5dfad7735c6a67085f1b90d4d497e32907db4c78.ttf
diff --git a/test/shaping/data/in-house/fonts/641bd9db850193064d17575053ae2bf8ec149ddc.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/641bd9db850193064d17575053ae2bf8ec149ddc.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/641bd9db850193064d17575053ae2bf8ec149ddc.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/641bd9db850193064d17575053ae2bf8ec149ddc.ttf
diff --git a/test/shaping/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/663aef6b019dbf45ffd74089e2b5f2496ceceb18.ttf
diff --git a/test/shaping/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf
diff --git a/test/shaping/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf
diff --git a/test/shaping/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf
diff --git a/test/shaping/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/73e84dac2fc6a2d1bc9250d1414353661088937d.ttf
diff --git a/test/shaping/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf
diff --git a/test/shaping/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf
diff --git a/test/shaping/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/7e14e7883ed152baa158b80e207b66114c823a8b.ttf
diff --git a/test/shaping/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
diff --git a/test/shaping/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8116e5d8fedfbec74e45dc350d2416d810bed8c4.ttf
diff --git a/test/shaping/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
diff --git a/test/shaping/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/81c368a33816fb20e9f647e8f24e2180f4720263.ttf
diff --git a/test/shaping/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8228d035fcd65d62ec9728fb34f42c63be93a5d3.ttf
diff --git a/test/shaping/data/in-house/fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf
diff --git a/test/shaping/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/82f4f3b57bb55344e72e70231380202a52af5805.ttf
diff --git a/test/shaping/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8454d22037f892e76614e1645d066689a0200e61.ttf
diff --git a/test/shaping/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf
diff --git a/test/shaping/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/856ff9562451293cbeff6f396d4e3877c4f0a436.ttf
diff --git a/test/shaping/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/85fe0be440c64ac77699e21c2f1bd933a919167e.ttf
diff --git a/test/shaping/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf
diff --git a/test/shaping/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
diff --git a/test/shaping/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/932ad5132c2761297c74e9976fe25b08e5ffa10b.ttf
diff --git a/test/shaping/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/94a5d6fb15a27521fba9ea4aee9cb39b2d03322a.ttf
diff --git a/test/shaping/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/96490dd2ff81233b335a650e7eb660e0e7b2eeea.ttf
diff --git a/test/shaping/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/98b7887cff91f722b92a8ff800120954606354f9.ttf
diff --git a/test/shaping/data/in-house/fonts/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/9d8a94a67932a3ab75a596fc8b5c6d0392ca9e49.ttf
diff --git a/test/shaping/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a014549f766436cf55b2ceb40e462038938ee899.ttf
diff --git a/test/shaping/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a02a7f0ad42c2922cb37ad1358c9df4eb81f1bca.ttf
diff --git a/test/shaping/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf
diff --git a/test/shaping/data/in-house/fonts/a34a9191d9376bda419836effeef7e75c1386016.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a34a9191d9376bda419836effeef7e75c1386016.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a34a9191d9376bda419836effeef7e75c1386016.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a34a9191d9376bda419836effeef7e75c1386016.ttf
diff --git a/test/shaping/data/in-house/fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a69118c2c2ada48ff803d9149daa54c9ebdae30e.ttf
diff --git a/test/shaping/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a6c76d1bafde4a0b1026ebcc932d2e5c6fd02442.ttf
diff --git a/test/shaping/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a919b33197965846f21074b24e30250d67277bce.ttf
diff --git a/test/shaping/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf
diff --git a/test/shaping/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/af3086380b743099c54a3b11b96766039ea62fcd.ttf
diff --git a/test/shaping/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b151cfcdaa77585d77f17a42158e0873fc8e2633.ttf
diff --git a/test/shaping/data/in-house/fonts/b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b6acef662e0beb8d5fcf5b61c6b0ca69537b7402.ttf
diff --git a/test/shaping/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b722a7d09e60421f3efbc706ad348ab47b88567b.ttf
diff --git a/test/shaping/data/in-house/fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
diff --git a/test/shaping/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
diff --git a/test/shaping/data/in-house/fonts/bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
diff --git a/test/shaping/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bb9473d2403488714043bcfb946c9f78b86ad627.ttf
diff --git a/test/shaping/data/in-house/fonts/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bbf4a308c402f0678c3e82844892a4da2ebe598f.ttf
diff --git a/test/shaping/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bf39b0e91ef9807f15a9e283a21a14a209fd2cfc.ttf
diff --git a/test/shaping/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/bf962d3202883a820aed019d9b5c1838c2ff69c6.ttf
diff --git a/test/shaping/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf
diff --git a/test/shaping/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf
diff --git a/test/shaping/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/d23d76ea0909c14972796937ba072b5a40c1e257.ttf
diff --git a/test/shaping/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/d629e7fedc0b350222d7987345fe61613fa3929a.ttf
diff --git a/test/shaping/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/d9b8bc10985f24796826c29f7ccba3d0ae11ec02.ttf
diff --git a/test/shaping/data/in-house/fonts/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/dd9f0c7c7c36f75a18be0cab1cddf8f3ab0f366b.ttf
diff --git a/test/shaping/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/df768b9c257e0c9c35786c47cae15c46571d56be.ttf
diff --git a/test/shaping/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e207635780b42f898d58654b65098763e340f5c7.ttf
diff --git a/test/shaping/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf
diff --git a/test/shaping/data/in-house/fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e88c339237f52d21e01c55f01b9c1b4cc14a0467.ttf
diff --git a/test/shaping/data/in-house/fonts/e90374e5e439e00725b4fe7a8d73db57c5a97f82.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e90374e5e439e00725b4fe7a8d73db57c5a97f82.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/e90374e5e439e00725b4fe7a8d73db57c5a97f82.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/e90374e5e439e00725b4fe7a8d73db57c5a97f82.ttf
diff --git a/test/shaping/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf
diff --git a/test/shaping/data/in-house/fonts/ef2511f215aa3ca847cbfffbf861793b42170875.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ef2511f215aa3ca847cbfffbf861793b42170875.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/ef2511f215aa3ca847cbfffbf861793b42170875.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ef2511f215aa3ca847cbfffbf861793b42170875.ttf
diff --git a/test/shaping/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf
diff --git a/test/shaping/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf
diff --git a/test/shaping/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f443753e8ffe8e8aae606cfba158e00334b6efb1.ttf
diff --git a/test/shaping/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f499fbc23865022234775c43503bba2e63978fe1.ttf
diff --git a/test/shaping/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf
diff --git a/test/shaping/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf
diff --git a/test/shaping/data/in-house/fonts/fab39d60d758cb586db5a504f218442cd1395725.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/fab39d60d758cb586db5a504f218442cd1395725.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/fab39d60d758cb586db5a504f218442cd1395725.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/fab39d60d758cb586db5a504f218442cd1395725.ttf
diff --git a/test/shaping/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf
diff --git a/test/shaping/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf
diff --git a/test/shaping/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf b/harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf
similarity index 100%
rename from test/shaping/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf
rename to harfbuzz-1.9.0/test/shaping/data/in-house/fonts/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf
diff --git a/test/shaping/data/in-house/tests/arabic-fallback-shaping.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-fallback-shaping.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/arabic-fallback-shaping.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-fallback-shaping.tests
diff --git a/test/shaping/data/in-house/tests/arabic-feature-order.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-feature-order.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/arabic-feature-order.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-feature-order.tests
diff --git a/test/shaping/data/in-house/tests/arabic-like-joining.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-like-joining.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/arabic-like-joining.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-like-joining.tests
diff --git a/test/shaping/data/in-house/tests/arabic-mark-order.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-mark-order.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/arabic-mark-order.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-mark-order.tests
diff --git a/test/shaping/data/in-house/tests/arabic-stch.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-stch.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/arabic-stch.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/arabic-stch.tests
diff --git a/test/shaping/data/in-house/tests/automatic-fractions.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/automatic-fractions.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/automatic-fractions.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/automatic-fractions.tests
diff --git a/test/shaping/data/in-house/tests/cluster.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/cluster.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/cluster.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/cluster.tests
diff --git a/test/shaping/data/in-house/tests/color-fonts.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/color-fonts.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/color-fonts.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/color-fonts.tests
diff --git a/test/shaping/data/in-house/tests/context-matching.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/context-matching.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/context-matching.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/context-matching.tests
diff --git a/test/shaping/data/in-house/tests/cursive-positioning.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/cursive-positioning.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/cursive-positioning.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/cursive-positioning.tests
diff --git a/test/shaping/data/in-house/tests/default-ignorables.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/default-ignorables.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/default-ignorables.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/default-ignorables.tests
diff --git a/test/shaping/data/in-house/tests/emoji-flag-tags.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/emoji-flag-tags.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/emoji-flag-tags.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/emoji-flag-tags.tests
diff --git a/test/shaping/data/in-house/tests/fallback-positioning.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/fallback-positioning.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/fallback-positioning.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/fallback-positioning.tests
diff --git a/test/shaping/data/in-house/tests/fuzzed.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/fuzzed.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/fuzzed.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/fuzzed.tests
diff --git a/test/shaping/data/in-house/tests/hangul-jamo.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/hangul-jamo.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/hangul-jamo.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/hangul-jamo.tests
diff --git a/test/shaping/data/in-house/tests/hyphens.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/hyphens.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/hyphens.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/hyphens.tests
diff --git a/test/shaping/data/in-house/tests/indic-consonant-with-stacker.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-consonant-with-stacker.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-consonant-with-stacker.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-consonant-with-stacker.tests
diff --git a/test/shaping/data/in-house/tests/indic-decompose.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-decompose.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-decompose.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-decompose.tests
diff --git a/test/shaping/data/in-house/tests/indic-init.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-init.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-init.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-init.tests
diff --git a/test/shaping/data/in-house/tests/indic-joiner-candrabindu.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-joiner-candrabindu.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-joiner-candrabindu.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-joiner-candrabindu.tests
diff --git a/test/shaping/data/in-house/tests/indic-joiners.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-joiners.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-joiners.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-joiners.tests
diff --git a/test/shaping/data/in-house/tests/indic-old-spec.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-old-spec.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-old-spec.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-old-spec.tests
diff --git a/test/shaping/data/in-house/tests/indic-pref-blocking.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-pref-blocking.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-pref-blocking.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-pref-blocking.tests
diff --git a/test/shaping/data/in-house/tests/indic-script-extensions.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-script-extensions.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-script-extensions.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-script-extensions.tests
diff --git a/test/shaping/data/in-house/tests/indic-special-cases.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-special-cases.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-special-cases.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-special-cases.tests
diff --git a/test/shaping/data/in-house/tests/indic-syllable.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-syllable.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/indic-syllable.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/indic-syllable.tests
diff --git a/test/shaping/data/in-house/tests/language-tags.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/language-tags.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/language-tags.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/language-tags.tests
diff --git a/test/shaping/data/in-house/tests/ligature-id.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/ligature-id.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/ligature-id.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/ligature-id.tests
diff --git a/test/shaping/data/in-house/tests/mark-attachment.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/mark-attachment.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/mark-attachment.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/mark-attachment.tests
diff --git a/test/shaping/data/in-house/tests/mark-filtering-sets.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/mark-filtering-sets.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/mark-filtering-sets.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/mark-filtering-sets.tests
diff --git a/test/shaping/data/in-house/tests/mongolian-variation-selector.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/mongolian-variation-selector.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/mongolian-variation-selector.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/mongolian-variation-selector.tests
diff --git a/test/shaping/data/in-house/tests/myanmar-syllable.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/myanmar-syllable.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/myanmar-syllable.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/myanmar-syllable.tests
diff --git a/test/shaping/data/in-house/tests/none-directional.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/none-directional.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/none-directional.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/none-directional.tests
diff --git a/test/shaping/data/in-house/tests/simple.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/simple.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/simple.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/simple.tests
diff --git a/test/shaping/data/in-house/tests/sinhala.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/sinhala.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/sinhala.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/sinhala.tests
diff --git a/test/shaping/data/in-house/tests/spaces.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/spaces.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/spaces.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/spaces.tests
diff --git a/test/shaping/data/in-house/tests/tibetan-contractions-1.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/tibetan-contractions-1.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/tibetan-contractions-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/tibetan-contractions-1.tests
diff --git a/test/shaping/data/in-house/tests/tibetan-contractions-2.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/tibetan-contractions-2.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/tibetan-contractions-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/tibetan-contractions-2.tests
diff --git a/test/shaping/data/in-house/tests/tibetan-vowels.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/tibetan-vowels.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/tibetan-vowels.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/tibetan-vowels.tests
diff --git a/test/shaping/data/in-house/tests/use-marchen.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/use-marchen.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/use-marchen.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/use-marchen.tests
diff --git a/test/shaping/data/in-house/tests/use-syllable.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/use-syllable.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/use-syllable.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/use-syllable.tests
diff --git a/test/shaping/data/in-house/tests/use.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/use.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/use.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/use.tests
diff --git a/test/shaping/data/in-house/tests/variations-rvrn.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/variations-rvrn.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/variations-rvrn.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/variations-rvrn.tests
diff --git a/test/shaping/data/in-house/tests/vertical.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/vertical.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/vertical.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/vertical.tests
diff --git a/test/shaping/data/in-house/tests/zero-width-marks.tests b/harfbuzz-1.9.0/test/shaping/data/in-house/tests/zero-width-marks.tests
similarity index 100%
rename from test/shaping/data/in-house/tests/zero-width-marks.tests
rename to harfbuzz-1.9.0/test/shaping/data/in-house/tests/zero-width-marks.tests
diff --git a/test/shaping/data/text-rendering-tests/COPYING b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/COPYING
similarity index 100%
rename from test/shaping/data/text-rendering-tests/COPYING
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/COPYING
diff --git a/test/shaping/data/text-rendering-tests/Makefile.am b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/Makefile.am
similarity index 100%
rename from test/shaping/data/text-rendering-tests/Makefile.am
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/Makefile.am
diff --git a/test/shaping/data/text-rendering-tests/Makefile.in b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/Makefile.in
similarity index 100%
rename from test/shaping/data/text-rendering-tests/Makefile.in
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/Makefile.in
diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/Makefile.sources
similarity index 100%
rename from test/shaping/data/text-rendering-tests/Makefile.sources
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/Makefile.sources
diff --git a/test/shaping/data/text-rendering-tests/README b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/README
similarity index 100%
rename from test/shaping/data/text-rendering-tests/README
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/README
diff --git a/test/shaping/data/text-rendering-tests/extract-tests.py b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/extract-tests.py
similarity index 100%
rename from test/shaping/data/text-rendering-tests/extract-tests.py
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/extract-tests.py
diff --git a/test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf
similarity index 99%
rename from test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf
index e2d6f5a28..5cc7279fc 100644
Binary files a/test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf and b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/AdobeVFPrototype-Subset.otf differ
diff --git a/test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf
similarity index 99%
rename from test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf
index 4324840db..a97b1f44c 100644
Binary files a/test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf and b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/FDArrayTest257.otf differ
diff --git a/test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf
similarity index 99%
rename from test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf
index bb6817162..835beb2d2 100644
Binary files a/test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf and b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/FDArrayTest65535.otf differ
diff --git a/test/shaping/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/NotoSansBalinese-Regular.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/NotoSansKannada-Regular.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/NotoSerifKannada-Regular.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/Selawik-README.md b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/Selawik-README.md
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/Selawik-README.md
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/Selawik-README.md
diff --git a/test/shaping/data/text-rendering-tests/fonts/Selawik-variable.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/Selawik-variable.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/Selawik-variable.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/Selawik-variable.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestAVAR.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestAVAR.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestAVAR.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestAVAR.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCMAP14.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCMAP14.otf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestCMAP14.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCMAP14.otf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCMAPMacTurkish.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCVARGVAROne.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestCVARGVARTwo.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGLYFOne.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGLYFOne.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGLYFOne.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGLYFOne.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSFour.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSFour.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSFour.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSFour.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSOne.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSOne.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSOne.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSOne.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSThree.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSThree.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSThree.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSThree.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGPOSTwo.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSTwo.otf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGPOSTwo.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGPOSTwo.otf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGSUBOne.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGSUBOne.otf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGSUBOne.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGSUBOne.otf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVAREight.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVAREight.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGVAREight.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVAREight.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARFour.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARFour.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGVARFour.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARFour.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARNine.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARNine.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGVARNine.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARNine.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVAROne.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVAROne.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGVAROne.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVAROne.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARThree.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARThree.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGVARThree.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARThree.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestGVARTwo.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARTwo.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestGVARTwo.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestGVARTwo.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestHVAROne.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestHVAROne.otf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestHVAROne.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestHVAROne.otf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestHVARTwo.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestHVARTwo.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestHVARTwo.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestHVARTwo.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestKERNOne.otf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestKERNOne.otf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestKERNOne.otf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestKERNOne.otf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXEight.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEighteen.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXEighteen.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXEighteen.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXEighteen.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXEleven.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXEleven.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXEleven.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXEleven.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXFour.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXFour.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXFour.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXFour.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXFourteen.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXFourteen.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXFourteen.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXFourteen.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXNine.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXOne.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXOne.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXOne.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXOne.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXSeventeen.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXSixteen.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXSixteen.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXSixteen.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXSixteen.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTen.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTen.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTen.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTen.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThirteen.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXThirteen.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThirteen.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXThirteen.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXThree.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXThree.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXThree.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXThree.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwelve.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwenty.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwenty.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwenty.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwenty.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyeight.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyfive.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyone.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentyseven.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentysix.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentythree.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwentytwo.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestMORXTwo.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwo.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestMORXTwo.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestMORXTwo.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeAran.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestShapeAran.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestShapeAran.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestShapeAran.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeEthi.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestShapeEthi.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestShapeEthi.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestShapeEthi.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/TestShapeKndaV3.ttf
diff --git a/test/shaping/data/text-rendering-tests/fonts/Zycon.ttf b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/Zycon.ttf
similarity index 100%
rename from test/shaping/data/text-rendering-tests/fonts/Zycon.ttf
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/fonts/Zycon.ttf
diff --git a/test/shaping/data/text-rendering-tests/tests/AVAR-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/AVAR-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/AVAR-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/AVAR-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CFF-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CFF-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CFF-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CFF-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CFF-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CFF-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CFF-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CFF-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CFF2-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CFF2-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CFF2-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CFF2-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CMAP-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CMAP-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CMAP-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CMAP-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CMAP-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CMAP-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CMAP-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CMAP-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CVAR-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CVAR-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CVAR-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CVAR-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/CVAR-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CVAR-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/CVAR-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/CVAR-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GLYF-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GLYF-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GLYF-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GLYF-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GPOS-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GPOS-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-3.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-3.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GPOS-3.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-3.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-4.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-4.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GPOS-4.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-4.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GPOS-5.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-5.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GPOS-5.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GPOS-5.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GSUB-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GSUB-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GSUB-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GSUB-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GSUB-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GSUB-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GSUB-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GSUB-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-3.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-3.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-3.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-3.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-4.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-4.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-4.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-4.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-5.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-5.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-5.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-5.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-6.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-6.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-6.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-6.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-7.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-7.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-7.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-7.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-8.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-8.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-8.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-8.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/GVAR-9.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-9.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/GVAR-9.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/GVAR-9.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/HVAR-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/HVAR-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/HVAR-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/HVAR-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/HVAR-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/HVAR-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/HVAR-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/HVAR-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/KERN-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/KERN-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/KERN-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/KERN-1.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/KERN-2.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/KERN-2.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/KERN-2.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/KERN-2.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/SHBALI-3.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/SHBALI-3.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/SHBALI-3.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/SHBALI-3.tests
diff --git a/test/shaping/data/text-rendering-tests/tests/SHKNDA-1.tests b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/SHKNDA-1.tests
similarity index 100%
rename from test/shaping/data/text-rendering-tests/tests/SHKNDA-1.tests
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/tests/SHKNDA-1.tests
diff --git a/test/shaping/data/text-rendering-tests/update.sh b/harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/update.sh
similarity index 100%
rename from test/shaping/data/text-rendering-tests/update.sh
rename to harfbuzz-1.9.0/test/shaping/data/text-rendering-tests/update.sh
diff --git a/test/shaping/hb-diff b/harfbuzz-1.9.0/test/shaping/hb-diff
similarity index 100%
rename from test/shaping/hb-diff
rename to harfbuzz-1.9.0/test/shaping/hb-diff
diff --git a/test/shaping/hb-diff-colorize b/harfbuzz-1.9.0/test/shaping/hb-diff-colorize
similarity index 100%
rename from test/shaping/hb-diff-colorize
rename to harfbuzz-1.9.0/test/shaping/hb-diff-colorize
diff --git a/test/shaping/hb-diff-filter-failures b/harfbuzz-1.9.0/test/shaping/hb-diff-filter-failures
similarity index 100%
rename from test/shaping/hb-diff-filter-failures
rename to harfbuzz-1.9.0/test/shaping/hb-diff-filter-failures
diff --git a/test/shaping/hb-diff-stat b/harfbuzz-1.9.0/test/shaping/hb-diff-stat
similarity index 100%
rename from test/shaping/hb-diff-stat
rename to harfbuzz-1.9.0/test/shaping/hb-diff-stat
diff --git a/test/shaping/hb-unicode-decode b/harfbuzz-1.9.0/test/shaping/hb-unicode-decode
similarity index 100%
rename from test/shaping/hb-unicode-decode
rename to harfbuzz-1.9.0/test/shaping/hb-unicode-decode
diff --git a/test/shaping/hb-unicode-encode b/harfbuzz-1.9.0/test/shaping/hb-unicode-encode
similarity index 100%
rename from test/shaping/hb-unicode-encode
rename to harfbuzz-1.9.0/test/shaping/hb-unicode-encode
diff --git a/test/shaping/hb-unicode-prettyname b/harfbuzz-1.9.0/test/shaping/hb-unicode-prettyname
similarity index 100%
rename from test/shaping/hb-unicode-prettyname
rename to harfbuzz-1.9.0/test/shaping/hb-unicode-prettyname
diff --git a/test/shaping/hb_test_tools.py b/harfbuzz-1.9.0/test/shaping/hb_test_tools.py
similarity index 100%
rename from test/shaping/hb_test_tools.py
rename to harfbuzz-1.9.0/test/shaping/hb_test_tools.py
diff --git a/test/shaping/record-test.sh b/harfbuzz-1.9.0/test/shaping/record-test.sh
similarity index 100%
rename from test/shaping/record-test.sh
rename to harfbuzz-1.9.0/test/shaping/record-test.sh
diff --git a/test/shaping/run-tests.py b/harfbuzz-1.9.0/test/shaping/run-tests.py
similarity index 100%
rename from test/shaping/run-tests.py
rename to harfbuzz-1.9.0/test/shaping/run-tests.py
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/non-joining.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/poem.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-mongolian/misc/variation-selectors.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-nko/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-nko/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-nko/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-nko/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-phags-pa/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/abbreviation-mark.txt
diff --git a/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-arabic/script-syriac/misc/alaph.txt
diff --git a/test/shaping/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-ethiopic/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-han/misc/cjk-compat.txt
diff --git a/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt
diff --git a/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-hiragana/misc/kazuraki-liga.txt
diff --git a/test/shaping/texts/in-house/shaper-default/script-linear-b/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-linear-b/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-default/script-linear-b/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-linear-b/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-default/script-tifinagh/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-hangul/script-hangul/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-hebrew/script-hebrew/misc/diacritics.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/reph.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/reph.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/misc/reph.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/misc/reph.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/dottedcircle.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/eyelash.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/joiners.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/spec-deviations.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/misc/tricky-reordering.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/misc/right-matras.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/cibu.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/dot-reph.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/bindu.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/extensive.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/reph.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/misc/split-matras.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/LICENSE
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/README b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/README
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/README
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/README
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/SOURCES
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt
diff --git a/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt
diff --git a/test/shaping/texts/in-house/shaper-khmer/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-khmer/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-khmer/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-khmer/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-khmer/other-marks-invalid.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-khmer/other-marks-invalid.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-khmer/other-marks-invalid.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-khmer/other-marks-invalid.txt
diff --git a/test/shaping/texts/in-house/shaper-khmer/other-marks.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-khmer/other-marks.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-khmer/other-marks.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-khmer/other-marks.txt
diff --git a/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/otspec.txt
diff --git a/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-myanmar/script-myanmar/misc/utn11.txt
diff --git a/test/shaping/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-lao/misc/sara-am.txt
diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/phinthu.txt
diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/pua-shaping.txt
diff --git a/test/shaping/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-thai/script-thai/misc/sara-am.txt
diff --git a/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/contractions.txt
diff --git a/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-tibetan/script-tibetan/misc/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-batak/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-batak/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-batak/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-batak/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-buginese/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-buginese/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-buginese/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-buginese/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-cham/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-cham/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-cham/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-cham/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-javanese/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-javanese/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-javanese/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-javanese/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-kaithi/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-kaithi/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-kaithi/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-kaithi/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-kharoshti/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-kharoshti/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-kharoshti/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-kharoshti/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-tai-tham/misc.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-tai-tham/misc.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-tai-tham/misc.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-tai-tham/misc.txt
diff --git a/test/shaping/texts/in-house/shaper-use/script-tai-tham/torture.txt b/harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-tai-tham/torture.txt
similarity index 100%
rename from test/shaping/texts/in-house/shaper-use/script-tai-tham/torture.txt
rename to harfbuzz-1.9.0/test/shaping/texts/in-house/shaper-use/script-tai-tham/torture.txt
diff --git a/test/subset/CMakeLists.txt b/harfbuzz-1.9.0/test/subset/CMakeLists.txt
similarity index 100%
rename from test/subset/CMakeLists.txt
rename to harfbuzz-1.9.0/test/subset/CMakeLists.txt
diff --git a/test/subset/Makefile.am b/harfbuzz-1.9.0/test/subset/Makefile.am
similarity index 100%
rename from test/subset/Makefile.am
rename to harfbuzz-1.9.0/test/subset/Makefile.am
diff --git a/test/subset/Makefile.in b/harfbuzz-1.9.0/test/subset/Makefile.in
similarity index 100%
rename from test/subset/Makefile.in
rename to harfbuzz-1.9.0/test/subset/Makefile.in
diff --git a/test/subset/data/Makefile.am b/harfbuzz-1.9.0/test/subset/data/Makefile.am
similarity index 100%
rename from test/subset/data/Makefile.am
rename to harfbuzz-1.9.0/test/subset/data/Makefile.am
diff --git a/test/subset/data/Makefile.in b/harfbuzz-1.9.0/test/subset/data/Makefile.in
similarity index 100%
rename from test/subset/data/Makefile.in
rename to harfbuzz-1.9.0/test/subset/data/Makefile.in
diff --git a/test/subset/data/Makefile.sources b/harfbuzz-1.9.0/test/subset/data/Makefile.sources
similarity index 100%
rename from test/subset/data/Makefile.sources
rename to harfbuzz-1.9.0/test/subset/data/Makefile.sources
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf
similarity index 100%
rename from test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf
similarity index 100%
rename from test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf
similarity index 100%
rename from test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf b/harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf
similarity index 100%
rename from test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf
similarity index 100%
rename from test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf b/harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf
similarity index 100%
rename from test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf b/harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf
similarity index 100%
rename from test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf b/harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf
similarity index 100%
rename from test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf
rename to harfbuzz-1.9.0/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf
diff --git a/test/subset/data/fonts/Mplus1p-Regular.ttf b/harfbuzz-1.9.0/test/subset/data/fonts/Mplus1p-Regular.ttf
similarity index 100%
rename from test/subset/data/fonts/Mplus1p-Regular.ttf
rename to harfbuzz-1.9.0/test/subset/data/fonts/Mplus1p-Regular.ttf
diff --git a/test/subset/data/fonts/Roboto-Regular.abc.ttf b/harfbuzz-1.9.0/test/subset/data/fonts/Roboto-Regular.abc.ttf
similarity index 100%
rename from test/subset/data/fonts/Roboto-Regular.abc.ttf
rename to harfbuzz-1.9.0/test/subset/data/fonts/Roboto-Regular.abc.ttf
diff --git a/test/subset/data/fonts/Roboto-Regular.ttf b/harfbuzz-1.9.0/test/subset/data/fonts/Roboto-Regular.ttf
similarity index 100%
rename from test/subset/data/fonts/Roboto-Regular.ttf
rename to harfbuzz-1.9.0/test/subset/data/fonts/Roboto-Regular.ttf
diff --git a/test/subset/data/profiles/default.txt b/harfbuzz-1.9.0/test/subset/data/profiles/default.txt
similarity index 100%
rename from test/subset/data/profiles/default.txt
rename to harfbuzz-1.9.0/test/subset/data/profiles/default.txt
diff --git a/test/subset/data/profiles/drop-hints.txt b/harfbuzz-1.9.0/test/subset/data/profiles/drop-hints.txt
similarity index 100%
rename from test/subset/data/profiles/drop-hints.txt
rename to harfbuzz-1.9.0/test/subset/data/profiles/drop-hints.txt
diff --git a/test/subset/data/tests/basics.tests b/harfbuzz-1.9.0/test/subset/data/tests/basics.tests
similarity index 100%
rename from test/subset/data/tests/basics.tests
rename to harfbuzz-1.9.0/test/subset/data/tests/basics.tests
diff --git a/test/subset/data/tests/full-font.tests b/harfbuzz-1.9.0/test/subset/data/tests/full-font.tests
similarity index 100%
rename from test/subset/data/tests/full-font.tests
rename to harfbuzz-1.9.0/test/subset/data/tests/full-font.tests
diff --git a/test/subset/data/tests/japanese.tests b/harfbuzz-1.9.0/test/subset/data/tests/japanese.tests
similarity index 100%
rename from test/subset/data/tests/japanese.tests
rename to harfbuzz-1.9.0/test/subset/data/tests/japanese.tests
diff --git a/test/subset/run-tests.py b/harfbuzz-1.9.0/test/subset/run-tests.py
similarity index 100%
rename from test/subset/run-tests.py
rename to harfbuzz-1.9.0/test/subset/run-tests.py
diff --git a/test/subset/subset_test_suite.py b/harfbuzz-1.9.0/test/subset/subset_test_suite.py
similarity index 100%
rename from test/subset/subset_test_suite.py
rename to harfbuzz-1.9.0/test/subset/subset_test_suite.py
diff --git a/util/Makefile.am b/harfbuzz-1.9.0/util/Makefile.am
similarity index 100%
rename from util/Makefile.am
rename to harfbuzz-1.9.0/util/Makefile.am
diff --git a/util/Makefile.in b/harfbuzz-1.9.0/util/Makefile.in
similarity index 100%
rename from util/Makefile.in
rename to harfbuzz-1.9.0/util/Makefile.in
diff --git a/util/Makefile.sources b/harfbuzz-1.9.0/util/Makefile.sources
similarity index 100%
rename from util/Makefile.sources
rename to harfbuzz-1.9.0/util/Makefile.sources
diff --git a/util/ansi-print.cc b/harfbuzz-1.9.0/util/ansi-print.cc
similarity index 100%
rename from util/ansi-print.cc
rename to harfbuzz-1.9.0/util/ansi-print.cc
diff --git a/util/ansi-print.hh b/harfbuzz-1.9.0/util/ansi-print.hh
similarity index 100%
rename from util/ansi-print.hh
rename to harfbuzz-1.9.0/util/ansi-print.hh
diff --git a/util/hb-ot-shape-closure.cc b/harfbuzz-1.9.0/util/hb-ot-shape-closure.cc
similarity index 100%
rename from util/hb-ot-shape-closure.cc
rename to harfbuzz-1.9.0/util/hb-ot-shape-closure.cc
diff --git a/util/hb-shape.cc b/harfbuzz-1.9.0/util/hb-shape.cc
similarity index 100%
rename from util/hb-shape.cc
rename to harfbuzz-1.9.0/util/hb-shape.cc
diff --git a/util/hb-subset.cc b/harfbuzz-1.9.0/util/hb-subset.cc
similarity index 100%
rename from util/hb-subset.cc
rename to harfbuzz-1.9.0/util/hb-subset.cc
diff --git a/util/hb-view.cc b/harfbuzz-1.9.0/util/hb-view.cc
similarity index 100%
rename from util/hb-view.cc
rename to harfbuzz-1.9.0/util/hb-view.cc
diff --git a/util/helper-cairo-ansi.cc b/harfbuzz-1.9.0/util/helper-cairo-ansi.cc
similarity index 100%
rename from util/helper-cairo-ansi.cc
rename to harfbuzz-1.9.0/util/helper-cairo-ansi.cc
diff --git a/util/helper-cairo-ansi.hh b/harfbuzz-1.9.0/util/helper-cairo-ansi.hh
similarity index 100%
rename from util/helper-cairo-ansi.hh
rename to harfbuzz-1.9.0/util/helper-cairo-ansi.hh
diff --git a/util/helper-cairo.cc b/harfbuzz-1.9.0/util/helper-cairo.cc
similarity index 100%
rename from util/helper-cairo.cc
rename to harfbuzz-1.9.0/util/helper-cairo.cc
diff --git a/util/helper-cairo.hh b/harfbuzz-1.9.0/util/helper-cairo.hh
similarity index 100%
rename from util/helper-cairo.hh
rename to harfbuzz-1.9.0/util/helper-cairo.hh
diff --git a/util/main-font-text.hh b/harfbuzz-1.9.0/util/main-font-text.hh
similarity index 100%
rename from util/main-font-text.hh
rename to harfbuzz-1.9.0/util/main-font-text.hh
diff --git a/util/options.cc b/harfbuzz-1.9.0/util/options.cc
similarity index 100%
rename from util/options.cc
rename to harfbuzz-1.9.0/util/options.cc
diff --git a/util/options.hh b/harfbuzz-1.9.0/util/options.hh
similarity index 100%
rename from util/options.hh
rename to harfbuzz-1.9.0/util/options.hh
diff --git a/util/shape-consumer.hh b/harfbuzz-1.9.0/util/shape-consumer.hh
similarity index 100%
rename from util/shape-consumer.hh
rename to harfbuzz-1.9.0/util/shape-consumer.hh
diff --git a/util/view-cairo.cc b/harfbuzz-1.9.0/util/view-cairo.cc
similarity index 100%
rename from util/view-cairo.cc
rename to harfbuzz-1.9.0/util/view-cairo.cc
diff --git a/util/view-cairo.hh b/harfbuzz-1.9.0/util/view-cairo.hh
similarity index 100%
rename from util/view-cairo.hh
rename to harfbuzz-1.9.0/util/view-cairo.hh
diff --git a/package.json b/package.json
index 8b3f388c4..264396b8e 100644
--- a/package.json
+++ b/package.json
@@ -5,15 +5,15 @@
   "license": "MIT",
   "esy": {
     "build": [
-        ["bash", "-c", "#{os == 'windows' ? './esy/configure-windows.sh' : './configure'}"],
-        ["make"],
-        ["make", "install"]
+        ["./esy/prep.sh"],
+        ["bash", "-c", "#{os == 'windows' ? './esy/configure-windows.sh' : './esy/configure.sh'}"],
+        ["./esy/build.sh"],
         ["./esy/test.sh"]
     ],
     "buildsInSource": "_build",
     "exportedEnv": {
         "HARFBUZZ_INCLUDE_PATH": {
-            "val": "#{self.install / 'include' / 'freetype2'}",
+            "val": "#{self.install / 'include' / 'harfbuzz'}",
             "scope": "global"
         },
         "HARFBUZZ_LIB_PATH": {
@@ -27,12 +27,5 @@
     }
   },
   "dependencies": {
-      "esy-cmake": "*"
-  },
-  "resolutions": {
-      "esy-cmake": "github:bryphe/esy-cmake#5a40a8e"
-  },
-  "devDependencies": {
-      "esy-cmake": "*"
   }
 }