diff --git a/test/feature/table-of-contents/appendix.tex b/test/examples/book-multifile/appendix.tex
similarity index 100%
rename from test/feature/table-of-contents/appendix.tex
rename to test/examples/book-multifile/appendix.tex
diff --git a/test/feature/table-of-contents/backmatter.tex b/test/examples/book-multifile/backmatter.tex
similarity index 100%
rename from test/feature/table-of-contents/backmatter.tex
rename to test/examples/book-multifile/backmatter.tex
diff --git a/test/feature/table-of-contents/chapters.tex b/test/examples/book-multifile/chapters.tex
similarity index 100%
rename from test/feature/table-of-contents/chapters.tex
rename to test/examples/book-multifile/chapters.tex
diff --git a/test/feature/table-of-contents/frontmatter.tex b/test/examples/book-multifile/frontmatter.tex
similarity index 100%
rename from test/feature/table-of-contents/frontmatter.tex
rename to test/examples/book-multifile/frontmatter.tex
diff --git a/test/feature/table-of-contents/main.tex b/test/examples/book-multifile/main.tex
similarity index 100%
rename from test/feature/table-of-contents/main.tex
rename to test/examples/book-multifile/main.tex
diff --git a/test/feature/folding/main.tex b/test/examples/book/main.tex
similarity index 100%
rename from test/feature/folding/main.tex
rename to test/examples/book/main.tex
diff --git a/test/example/minimal/main.tex b/test/examples/minimal/main.tex
similarity index 100%
rename from test/example/minimal/main.tex
rename to test/examples/minimal/main.tex
diff --git a/test/feature/completions/fig1.png b/test/features/completions/fig1.png
similarity index 100%
rename from test/feature/completions/fig1.png
rename to test/features/completions/fig1.png
diff --git a/test/feature/completions/figures/fig10.png b/test/features/completions/figures/fig10.png
similarity index 100%
rename from test/feature/completions/figures/fig10.png
rename to test/features/completions/figures/fig10.png
diff --git a/test/feature/completions/figures/fig11.eps b/test/features/completions/figures/fig11.eps
similarity index 100%
rename from test/feature/completions/figures/fig11.eps
rename to test/features/completions/figures/fig11.eps
diff --git a/test/feature/completions/figures/fig12.pdf b/test/features/completions/figures/fig12.pdf
similarity index 100%
rename from test/feature/completions/figures/fig12.pdf
rename to test/features/completions/figures/fig12.pdf
diff --git a/test/feature/completions/figures/fig13.jpg b/test/features/completions/figures/fig13.jpg
similarity index 100%
rename from test/feature/completions/figures/fig13.jpg
rename to test/features/completions/figures/fig13.jpg
diff --git a/test/feature/completions/figures/fig2.png b/test/features/completions/figures/fig2.png
similarity index 100%
rename from test/feature/completions/figures/fig2.png
rename to test/features/completions/figures/fig2.png
diff --git a/test/feature/completions/figures/fig3.png b/test/features/completions/figures/fig3.png
similarity index 100%
rename from test/feature/completions/figures/fig3.png
rename to test/features/completions/figures/fig3.png
diff --git a/test/feature/completions/figures/fig4.png b/test/features/completions/figures/fig4.png
similarity index 100%
rename from test/feature/completions/figures/fig4.png
rename to test/features/completions/figures/fig4.png
diff --git a/test/feature/completions/figures/fig5.png b/test/features/completions/figures/fig5.png
similarity index 100%
rename from test/feature/completions/figures/fig5.png
rename to test/features/completions/figures/fig5.png
diff --git a/test/feature/completions/figures/fig6.png b/test/features/completions/figures/fig6.png
similarity index 100%
rename from test/feature/completions/figures/fig6.png
rename to test/features/completions/figures/fig6.png
diff --git a/test/feature/completions/figures/fig7.png b/test/features/completions/figures/fig7.png
similarity index 100%
rename from test/feature/completions/figures/fig7.png
rename to test/features/completions/figures/fig7.png
diff --git a/test/feature/completions/figures/fig8.png b/test/features/completions/figures/fig8.png
similarity index 100%
rename from test/feature/completions/figures/fig8.png
rename to test/features/completions/figures/fig8.png
diff --git a/test/feature/completions/figures/fig9.png b/test/features/completions/figures/fig9.png
similarity index 100%
rename from test/feature/completions/figures/fig9.png
rename to test/features/completions/figures/fig9.png
diff --git a/test/feature/completions/glossary.tex b/test/features/completions/glossary.tex
similarity index 100%
rename from test/feature/completions/glossary.tex
rename to test/features/completions/glossary.tex
diff --git a/test/feature/completions/latexmkrc b/test/features/completions/latexmkrc
similarity index 100%
rename from test/feature/completions/latexmkrc
rename to test/features/completions/latexmkrc
diff --git a/test/feature/completions/local1.bib b/test/features/completions/local1.bib
similarity index 100%
rename from test/feature/completions/local1.bib
rename to test/features/completions/local1.bib
diff --git a/test/feature/completions/local2.bib b/test/features/completions/local2.bib
similarity index 100%
rename from test/feature/completions/local2.bib
rename to test/features/completions/local2.bib
diff --git a/test/feature/completions/main.tex b/test/features/completions/main.tex
similarity index 100%
rename from test/feature/completions/main.tex
rename to test/features/completions/main.tex
diff --git a/test/feature/completions/sub1.tex b/test/features/completions/sub1.tex
similarity index 100%
rename from test/feature/completions/sub1.tex
rename to test/features/completions/sub1.tex
diff --git a/test/feature/completions/sub2 with spaces.tex b/test/features/completions/sub2 with spaces.tex
similarity index 100%
rename from test/feature/completions/sub2 with spaces.tex
rename to test/features/completions/sub2 with spaces.tex
diff --git a/test/feature/completions/sub3 with spaces.tex b/test/features/completions/sub3 with spaces.tex
similarity index 100%
rename from test/feature/completions/sub3 with spaces.tex
rename to test/features/completions/sub3 with spaces.tex
diff --git a/test/feature/error-messages/file with errors.tex b/test/features/error-messages/file with errors.tex
similarity index 100%
rename from test/feature/error-messages/file with errors.tex
rename to test/features/error-messages/file with errors.tex
diff --git a/test/feature/error-messages/input with spaces.tex b/test/features/error-messages/input with spaces.tex
similarity index 100%
rename from test/feature/error-messages/input with spaces.tex
rename to test/features/error-messages/input with spaces.tex
diff --git a/test/feature/formatter/format.tex b/test/features/formatter/format.tex
similarity index 100%
rename from test/feature/formatter/format.tex
rename to test/features/formatter/format.tex
diff --git a/test/feature/imaps/main.tex b/test/features/imaps/main.tex
similarity index 100%
rename from test/feature/imaps/main.tex
rename to test/features/imaps/main.tex
diff --git a/test/feature/imaps/vimrc b/test/features/imaps/vimrc
similarity index 100%
rename from test/feature/imaps/vimrc
rename to test/features/imaps/vimrc
diff --git a/test/feature/latexmain/document.tex b/test/features/latexmain/document.tex
similarity index 100%
rename from test/feature/latexmain/document.tex
rename to test/features/latexmain/document.tex
diff --git a/test/feature/latexmain/main.tex b/test/features/latexmain/main.tex
similarity index 100%
rename from test/feature/latexmain/main.tex
rename to test/features/latexmain/main.tex
diff --git a/test/feature/latexmain/mymain.tex b/test/features/latexmain/mymain.tex
similarity index 100%
rename from test/feature/latexmain/mymain.tex
rename to test/features/latexmain/mymain.tex
diff --git a/test/feature/latexmain/mymain.tex.latexmain b/test/features/latexmain/mymain.tex.latexmain
similarity index 100%
rename from test/feature/latexmain/mymain.tex.latexmain
rename to test/features/latexmain/mymain.tex.latexmain
diff --git a/test/feature/latexmk-internal/latexmk.rc b/test/features/latexmk-internal/latexmk.rc
similarity index 100%
rename from test/feature/latexmk-internal/latexmk.rc
rename to test/features/latexmk-internal/latexmk.rc
diff --git a/test/feature/latexmk-internal/test-internal.tex b/test/features/latexmk-internal/test-internal.tex
similarity index 100%
rename from test/feature/latexmk-internal/test-internal.tex
rename to test/features/latexmk-internal/test-internal.tex
diff --git a/test/feature/syntax/test-syntax.tex b/test/features/syntax/test-syntax.tex
similarity index 100%
rename from test/feature/syntax/test-syntax.tex
rename to test/features/syntax/test-syntax.tex
diff --git a/test/issue/218/main.tex b/test/issues/218/main.tex
similarity index 100%
rename from test/issue/218/main.tex
rename to test/issues/218/main.tex
diff --git a/test/issue/218/section.tex b/test/issues/218/section.tex
similarity index 100%
rename from test/issue/218/section.tex
rename to test/issues/218/section.tex
diff --git a/test/issue/225/chapters/chapter.tex b/test/issues/225/chapters/chapter.tex
similarity index 100%
rename from test/issue/225/chapters/chapter.tex
rename to test/issues/225/chapters/chapter.tex
diff --git a/test/issue/225/chapters/preamble.tex b/test/issues/225/chapters/preamble.tex
similarity index 100%
rename from test/issue/225/chapters/preamble.tex
rename to test/issues/225/chapters/preamble.tex
diff --git a/test/issue/225/chapters/preamble_tex.tex b/test/issues/225/chapters/preamble_tex.tex
similarity index 100%
rename from test/issue/225/chapters/preamble_tex.tex
rename to test/issues/225/chapters/preamble_tex.tex
diff --git a/test/issue/225/chapters/preamble_tex_.tex b/test/issues/225/chapters/preamble_tex_.tex
similarity index 100%
rename from test/issue/225/chapters/preamble_tex_.tex
rename to test/issues/225/chapters/preamble_tex_.tex
diff --git a/test/issue/225/main.tex b/test/issues/225/main.tex
similarity index 100%
rename from test/issue/225/main.tex
rename to test/issues/225/main.tex
diff --git a/test/issue/225/main.tex.latexmain b/test/issues/225/main.tex.latexmain
similarity index 100%
rename from test/issue/225/main.tex.latexmain
rename to test/issues/225/main.tex.latexmain
diff --git a/test/issue/232/vimrc b/test/issues/232/vimrc
similarity index 100%
rename from test/issue/232/vimrc
rename to test/issues/232/vimrc
diff --git a/test/issue/237/[code college-1] title/test.tex b/test/issues/237/[code college-1] title/test.tex
similarity index 100%
rename from test/issue/237/[code college-1] title/test.tex
rename to test/issues/237/[code college-1] title/test.tex
diff --git a/test/issue/241/main.pdf b/test/issues/241/main.pdf
similarity index 100%
rename from test/issue/241/main.pdf
rename to test/issues/241/main.pdf
diff --git a/test/issue/241/main.tex b/test/issues/241/main.tex
similarity index 100%
rename from test/issue/241/main.tex
rename to test/issues/241/main.tex
diff --git a/test/issue/241/parts/chapter.tex b/test/issues/241/parts/chapter.tex
similarity index 100%
rename from test/issue/241/parts/chapter.tex
rename to test/issues/241/parts/chapter.tex
diff --git a/test/issue/241/parts/section.tex b/test/issues/241/parts/section.tex
similarity index 100%
rename from test/issue/241/parts/section.tex
rename to test/issues/241/parts/section.tex
diff --git a/test/issue/241/preamble/preamble.tex b/test/issues/241/preamble/preamble.tex
similarity index 100%
rename from test/issue/241/preamble/preamble.tex
rename to test/issues/241/preamble/preamble.tex
diff --git a/test/issue/245 b/test/issues/245
similarity index 100%
rename from test/issue/245
rename to test/issues/245
diff --git a/test/issue/256/minivimrc b/test/issues/256/minivimrc
similarity index 100%
rename from test/issue/256/minivimrc
rename to test/issues/256/minivimrc
diff --git a/test/issue/256/test-dir/main.log b/test/issues/256/test-dir/main.log
similarity index 100%
rename from test/issue/256/test-dir/main.log
rename to test/issues/256/test-dir/main.log
diff --git a/test/issue/256/test-dir/main.tex b/test/issues/256/test-dir/main.tex
similarity index 100%
rename from test/issue/256/test-dir/main.tex
rename to test/issues/256/test-dir/main.tex
diff --git a/test/issue/256/test-dir/test.tex b/test/issues/256/test-dir/test.tex
similarity index 100%
rename from test/issue/256/test-dir/test.tex
rename to test/issues/256/test-dir/test.tex
diff --git a/test/issue/272/main.tex b/test/issues/272/main.tex
similarity index 100%
rename from test/issue/272/main.tex
rename to test/issues/272/main.tex
diff --git a/test/issue/272/minivimrc b/test/issues/272/minivimrc
similarity index 100%
rename from test/issue/272/minivimrc
rename to test/issues/272/minivimrc
diff --git a/test/issue/274/main.tex b/test/issues/274/main.tex
similarity index 100%
rename from test/issue/274/main.tex
rename to test/issues/274/main.tex
diff --git a/test/issue/274/minivimrc b/test/issues/274/minivimrc
similarity index 100%
rename from test/issue/274/minivimrc
rename to test/issues/274/minivimrc
diff --git a/test/issue/310/main.tex b/test/issues/310/main.tex
similarity index 100%
rename from test/issue/310/main.tex
rename to test/issues/310/main.tex
diff --git a/test/issue/310/subfile.tex b/test/issues/310/subfile.tex
similarity index 100%
rename from test/issue/310/subfile.tex
rename to test/issues/310/subfile.tex
diff --git a/test/issue/312/minimal.tex b/test/issues/312/minimal.tex
similarity index 100%
rename from test/issue/312/minimal.tex
rename to test/issues/312/minimal.tex
diff --git a/test/issue/312/sections/first.tex b/test/issues/312/sections/first.tex
similarity index 100%
rename from test/issue/312/sections/first.tex
rename to test/issues/312/sections/first.tex
diff --git a/test/issue/312/vimrc b/test/issues/312/vimrc
similarity index 100%
rename from test/issue/312/vimrc
rename to test/issues/312/vimrc
diff --git a/test/issue/324/minimal.aux b/test/issues/324/minimal.aux
similarity index 100%
rename from test/issue/324/minimal.aux
rename to test/issues/324/minimal.aux
diff --git a/test/issue/324/minimal.tex b/test/issues/324/minimal.tex
similarity index 100%
rename from test/issue/324/minimal.tex
rename to test/issues/324/minimal.tex
diff --git a/test/issue/324/vimrc b/test/issues/324/vimrc
similarity index 100%
rename from test/issue/324/vimrc
rename to test/issues/324/vimrc
diff --git a/test/issue/328/minimal.tex b/test/issues/328/minimal.tex
similarity index 100%
rename from test/issue/328/minimal.tex
rename to test/issues/328/minimal.tex
diff --git a/test/issue/328/minivimrc b/test/issues/328/minivimrc
similarity index 100%
rename from test/issue/328/minivimrc
rename to test/issues/328/minivimrc
diff --git a/test/issue/331/minimal.aux b/test/issues/331/minimal.aux
similarity index 100%
rename from test/issue/331/minimal.aux
rename to test/issues/331/minimal.aux
diff --git a/test/issue/331/minimal.tex b/test/issues/331/minimal.tex
similarity index 100%
rename from test/issue/331/minimal.tex
rename to test/issues/331/minimal.tex
diff --git a/test/issue/331/minivimrc b/test/issues/331/minivimrc
similarity index 100%
rename from test/issue/331/minivimrc
rename to test/issues/331/minivimrc
diff --git a/test/issue/332/data/chap1.tex b/test/issues/332/data/chap1.tex
similarity index 100%
rename from test/issue/332/data/chap1.tex
rename to test/issues/332/data/chap1.tex
diff --git a/test/issue/332/main.tex b/test/issues/332/main.tex
similarity index 100%
rename from test/issue/332/main.tex
rename to test/issues/332/main.tex
diff --git a/test/issue/332/minivimrc b/test/issues/332/minivimrc
similarity index 100%
rename from test/issue/332/minivimrc
rename to test/issues/332/minivimrc
diff --git a/test/issue/386/minivimrc b/test/issues/386/minivimrc
similarity index 100%
rename from test/issue/386/minivimrc
rename to test/issues/386/minivimrc
diff --git a/test/issue/386/proof.tex b/test/issues/386/proof.tex
similarity index 100%
rename from test/issue/386/proof.tex
rename to test/issues/386/proof.tex
diff --git a/test/issue/389/minivimrc b/test/issues/389/minivimrc
similarity index 100%
rename from test/issue/389/minivimrc
rename to test/issues/389/minivimrc
diff --git a/test/issue/389/test.tex b/test/issues/389/test.tex
similarity index 100%
rename from test/issue/389/test.tex
rename to test/issues/389/test.tex
diff --git a/test/issue/392/input1.aux b/test/issues/392/input1.aux
similarity index 100%
rename from test/issue/392/input1.aux
rename to test/issues/392/input1.aux
diff --git a/test/issue/392/input2.aux b/test/issues/392/input2.aux
similarity index 100%
rename from test/issue/392/input2.aux
rename to test/issues/392/input2.aux
diff --git a/test/issue/392/main.tex b/test/issues/392/main.tex
similarity index 100%
rename from test/issue/392/main.tex
rename to test/issues/392/main.tex
diff --git a/test/template/minimal.tex b/test/issues/template/minimal.tex
similarity index 100%
rename from test/template/minimal.tex
rename to test/issues/template/minimal.tex
diff --git a/test/template/minivimrc b/test/issues/template/minivimrc
similarity index 100%
rename from test/template/minivimrc
rename to test/issues/template/minivimrc