41 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 3de1fadb..16d8c8d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS= pango pango-view examples docs tools tests win32
+SUBDIRS= pango utils examples docs tools tests win32
 
 meson_dist_files = \
 	pango/pango-features.h.meson \
-	pango-view/meson.build \
+	utils/meson.build \
 	meson.build \
 	meson_options.txt \
 	pango/meson.build \
diff --git a/configure.ac b/configure.ac
index a0cf1284..6964b14e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,7 +669,7 @@ pango/pangoft2.rc
 pango/pangowin32.rc
 pango/pangocairo.rc
 pango/pangoxft.rc
-pango-view/Makefile
+utils/Makefile
 examples/Makefile
 docs/Makefile
 docs/version.xml
diff --git a/meson.build b/meson.build
index dc50240c..3733f246 100644
--- a/meson.build
+++ b/meson.build
@@ -510,8 +510,8 @@ configure_file(output: 'config.h', configuration: pango_conf)
 root_inc = include_directories('.')
 
 subdir('pango')
+subdir('utils')
 subdir('examples')
-subdir('pango-view')
 subdir('tests')
 subdir('tools')
 
diff --git a/pango-view/EMOJI-MODIFIERS.txt b/utils/EMOJI-MODIFIERS.txt
index 11101e5f..11101e5f 100644
--- a/pango-view/EMOJI-MODIFIERS.txt
+++ b/utils/EMOJI-MODIFIERS.txt
diff --git a/pango-view/GLASS.txt b/utils/GLASS.txt
index 8eec3344..8eec3344 100644
--- a/pango-view/GLASS.txt
+++ b/utils/GLASS.txt
diff --git a/pango-view/HELLO.txt b/utils/HELLO.txt
index 21acb941..21acb941 100644
--- a/pango-view/HELLO.txt
+++ b/utils/HELLO.txt
diff --git a/pango-view/Makefile.am b/utils/Makefile.am
index b432e50f..b432e50f 100644
--- a/pango-view/Makefile.am
+++ b/utils/Makefile.am
diff --git a/pango-view/meson.build b/utils/meson.build
index a0043fc7..a0043fc7 100644
--- a/pango-view/meson.build
+++ b/utils/meson.build
diff --git a/pango-view/pango-view.c b/utils/pango-view.c
index fec00be9..fec00be9 100644
--- a/pango-view/pango-view.c
+++ b/utils/pango-view.c
diff --git a/pango-view/test-arabic.txt b/utils/test-arabic.txt
index b75f9a6c..b75f9a6c 100644
--- a/pango-view/test-arabic.txt
+++ b/utils/test-arabic.txt
diff --git a/pango-view/test-chinese.txt b/utils/test-chinese.txt
index bddc8234..bddc8234 100644
--- a/pango-view/test-chinese.txt
+++ b/utils/test-chinese.txt
diff --git a/pango-view/test-devanagari.txt b/utils/test-devanagari.txt
index 9cfccc56..9cfccc56 100644
--- a/pango-view/test-devanagari.txt
+++ b/utils/test-devanagari.txt
diff --git a/pango-view/test-feature-tag.markup b/utils/test-feature-tag.markup
index c92fc646..c92fc646 100644
--- a/pango-view/test-feature-tag.markup
+++ b/utils/test-feature-tag.markup
diff --git a/pango-view/test-font-variations.markup b/utils/test-font-variations.markup
index ae277e35..ae277e35 100644
--- a/pango-view/test-font-variations.markup
+++ b/utils/test-font-variations.markup
diff --git a/pango-view/test-gurmukhi.txt b/utils/test-gurmukhi.txt
index f3d05920..f3d05920 100644
--- a/pango-view/test-gurmukhi.txt
+++ b/utils/test-gurmukhi.txt
diff --git a/pango-view/test-hebrew.txt b/utils/test-hebrew.txt
index 15467d87..15467d87 100644
--- a/pango-view/test-hebrew.txt
+++ b/utils/test-hebrew.txt
diff --git a/pango-view/test-ipa.txt b/utils/test-ipa.txt
index 2fdd5e2c..2fdd5e2c 100644
--- a/pango-view/test-ipa.txt
+++ b/utils/test-ipa.txt
diff --git a/pango-view/test-justify.txt b/utils/test-justify.txt
index 754ed28c..754ed28c 100644
--- a/pango-view/test-justify.txt
+++ b/utils/test-justify.txt
diff --git a/pango-view/test-lao.txt b/utils/test-lao.txt
index 012025e4..012025e4 100644
--- a/pango-view/test-lao.txt
+++ b/utils/test-lao.txt
diff --git a/pango-view/test-latin.txt b/utils/test-latin.txt
index 31fe90bd..31fe90bd 100644
--- a/pango-view/test-latin.txt
+++ b/utils/test-latin.txt
diff --git a/pango-view/test-long-paragraph.txt b/utils/test-long-paragraph.txt
index 95c795b5..95c795b5 100644
--- a/pango-view/test-long-paragraph.txt
+++ b/utils/test-long-paragraph.txt
diff --git a/pango-view/test-mixed.markup b/utils/test-mixed.markup
index 894a1b81..894a1b81 100644
--- a/pango-view/test-mixed.markup
+++ b/utils/test-mixed.markup
diff --git a/pango-view/test-mixed.txt b/utils/test-mixed.txt
index e23f0314..e23f0314 100644
--- a/pango-view/test-mixed.txt
+++ b/utils/test-mixed.txt
diff --git a/pango-view/test-mongolian.txt b/utils/test-mongolian.txt
index 9117b7b1..9117b7b1 100644
--- a/pango-view/test-mongolian.txt
+++ b/utils/test-mongolian.txt
diff --git a/pango-view/test-nko.txt b/utils/test-nko.txt
index 65a4347e..65a4347e 100644
--- a/pango-view/test-nko.txt
+++ b/utils/test-nko.txt
diff --git a/pango-view/test-opentype-language.markup b/utils/test-opentype-language.markup
index 3d956aa4..3d956aa4 100644
--- a/pango-view/test-opentype-language.markup
+++ b/utils/test-opentype-language.markup
diff --git a/pango-view/test-syriac.txt b/utils/test-syriac.txt
index 05fedc7b..05fedc7b 100644
--- a/pango-view/test-syriac.txt
+++ b/utils/test-syriac.txt
diff --git a/pango-view/test-tamil.txt b/utils/test-tamil.txt
index ff080a24..ff080a24 100644
--- a/pango-view/test-tamil.txt
+++ b/utils/test-tamil.txt
diff --git a/pango-view/test-thai.txt b/utils/test-thai.txt
index 4bb8d2e0..4bb8d2e0 100644
--- a/pango-view/test-thai.txt
+++ b/utils/test-thai.txt
diff --git a/pango-view/test-tibetan.txt b/utils/test-tibetan.txt
index 83d44aab..83d44aab 100644
--- a/pango-view/test-tibetan.txt
+++ b/utils/test-tibetan.txt
diff --git a/pango-view/viewer-cairo.c b/utils/viewer-cairo.c
index ca98c1cd..ca98c1cd 100644
--- a/pango-view/viewer-cairo.c
+++ b/utils/viewer-cairo.c
diff --git a/pango-view/viewer-cairo.h b/utils/viewer-cairo.h
index e843664f..e843664f 100644
--- a/pango-view/viewer-cairo.h
+++ b/utils/viewer-cairo.h
diff --git a/pango-view/viewer-main.c b/utils/viewer-main.c
index 525599a7..525599a7 100644
--- a/pango-view/viewer-main.c
+++ b/utils/viewer-main.c
diff --git a/pango-view/viewer-pangocairo.c b/utils/viewer-pangocairo.c
index 3e893207..3e893207 100644
--- a/pango-view/viewer-pangocairo.c
+++ b/utils/viewer-pangocairo.c
diff --git a/pango-view/viewer-pangoft2.c b/utils/viewer-pangoft2.c
index 87973c80..87973c80 100644
--- a/pango-view/viewer-pangoft2.c
+++ b/utils/viewer-pangoft2.c
diff --git a/pango-view/viewer-pangoxft.c b/utils/viewer-pangoxft.c
index 948cd90e..948cd90e 100644
--- a/pango-view/viewer-pangoxft.c
+++ b/utils/viewer-pangoxft.c
diff --git a/pango-view/viewer-render.c b/utils/viewer-render.c
index 573cb59a..573cb59a 100644
--- a/pango-view/viewer-render.c
+++ b/utils/viewer-render.c
diff --git a/pango-view/viewer-render.h b/utils/viewer-render.h
index ade22986..ade22986 100644
--- a/pango-view/viewer-render.h
+++ b/utils/viewer-render.h
diff --git a/pango-view/viewer-x.c b/utils/viewer-x.c
index ad1c9a8d..ad1c9a8d 100644
--- a/pango-view/viewer-x.c
+++ b/utils/viewer-x.c
diff --git a/pango-view/viewer-x.h b/utils/viewer-x.h
index 28f61f6b..28f61f6b 100644
--- a/pango-view/viewer-x.h
+++ b/utils/viewer-x.h
diff --git a/pango-view/viewer.h b/utils/viewer.h
index a4937693..a4937693 100644
--- a/pango-view/viewer.h
+++ b/utils/viewer.h