diff --git a/.gitattributes b/.gitattributes
index 20508cf3..35216a56 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,7 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 * text=auto eol=lf
-
-# vendored files
-src/decNumber/** linguist-vendored
+vendor/** linguist-vendored
 
 # generated files
 src/lexer.[ch] linguist-generated=true
diff --git a/.gitmodules b/.gitmodules
index 3fff3b88..193b8030 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "modules/oniguruma"]
-	path = modules/oniguruma
+[submodule "vendor/oniguruma"]
+	path = vendor/oniguruma
 	url = https://github.com/kkos/oniguruma.git
diff --git a/Makefile.am b/Makefile.am
index 40ca3bd7..c7504e41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,16 +5,16 @@ LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h                 \
         src/exec_stack.h src/jq_parser.h src/jv_alloc.h src/jv_dtoa.h   \
         src/jv_unicode.h src/jv_utf8_tables.h src/lexer.l src/libm.h    \
         src/linker.h src/locfile.h src/opcode_list.h src/parser.y       \
-        src/util.h src/decNumber/decContext.h src/decNumber/decNumber.h \
-        src/decNumber/decNumberLocal.h src/jv_dtoa_tsd.h src/jv_thread.h \
-        src/jv_private.h
+        src/util.h src/jv_dtoa_tsd.h src/jv_thread.h src/jv_private.h   \
+        vendor/decNumber/decContext.h vendor/decNumber/decNumber.h      \
+        vendor/decNumber/decNumberLocal.h
 
 LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c    \
         src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c              \
         src/jv_dtoa.c src/jv_file.c src/jv_parse.c src/jv_print.c       \
         src/jv_unicode.c src/linker.c src/locfile.c src/util.c          \
-        src/decNumber/decContext.c src/decNumber/decNumber.c            \
         src/jv_dtoa_tsd.c                                               \
+        vendor/decNumber/decContext.c vendor/decNumber/decNumber.c      \
         ${LIBJQ_INCS}
 
 ### C build options
@@ -69,7 +69,7 @@ if ENABLE_UBSAN
 AM_CFLAGS += -fsanitize=undefined
 endif
 
-AM_CPPFLAGS = -I$(srcdir)/src
+AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/vendor
 
 ### Running tests under Valgrind
 
@@ -176,8 +176,8 @@ CLEANFILES += jq.1
 ### Build oniguruma
 
 if BUILD_ONIGURUMA
-libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
-SUBDIRS = modules/oniguruma
+libjq_la_LIBADD += vendor/oniguruma/src/.libs/libonig.la
+SUBDIRS = vendor/oniguruma
 endif
 
 AM_CFLAGS += $(onig_CFLAGS)
diff --git a/configure.ac b/configure.ac
index ada08730..88dc60b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,10 +277,10 @@ AS_IF([test "x$with_oniguruma" != xno], [
           AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
        ])
    ])
-   AS_IF([test "x$build_oniguruma" = xyes && test -f "${srcdir}/modules/oniguruma/configure.ac" ], [
-       onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
-       onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
-       AC_CONFIG_SUBDIRS([modules/oniguruma])
+   AS_IF([test "x$build_oniguruma" = xyes && test -f "${srcdir}/vendor/oniguruma/configure.ac" ], [
+       onig_CFLAGS="-I${srcdir}/vendor/oniguruma/src"
+       onig_LDFLAGS="-L${srcdir}/vendor/oniguruma/src -Wl,-rpath,${libdir}"
+       AC_CONFIG_SUBDIRS([vendor/oniguruma])
        AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
    ])
    CFLAGS="$save_CFLAGS"
diff --git a/src/decNumber/ICU-license.html b/vendor/decNumber/ICU-license.html
similarity index 100%
rename from src/decNumber/ICU-license.html
rename to vendor/decNumber/ICU-license.html
diff --git a/src/decNumber/decBasic.c b/vendor/decNumber/decBasic.c
similarity index 100%
rename from src/decNumber/decBasic.c
rename to vendor/decNumber/decBasic.c
diff --git a/src/decNumber/decCommon.c b/vendor/decNumber/decCommon.c
similarity index 100%
rename from src/decNumber/decCommon.c
rename to vendor/decNumber/decCommon.c
diff --git a/src/decNumber/decContext.c b/vendor/decNumber/decContext.c
similarity index 100%
rename from src/decNumber/decContext.c
rename to vendor/decNumber/decContext.c
diff --git a/src/decNumber/decContext.h b/vendor/decNumber/decContext.h
similarity index 100%
rename from src/decNumber/decContext.h
rename to vendor/decNumber/decContext.h
diff --git a/src/decNumber/decDPD.h b/vendor/decNumber/decDPD.h
similarity index 100%
rename from src/decNumber/decDPD.h
rename to vendor/decNumber/decDPD.h
diff --git a/src/decNumber/decDouble.c b/vendor/decNumber/decDouble.c
similarity index 100%
rename from src/decNumber/decDouble.c
rename to vendor/decNumber/decDouble.c
diff --git a/src/decNumber/decDouble.h b/vendor/decNumber/decDouble.h
similarity index 100%
rename from src/decNumber/decDouble.h
rename to vendor/decNumber/decDouble.h
diff --git a/src/decNumber/decNumber.c b/vendor/decNumber/decNumber.c
similarity index 100%
rename from src/decNumber/decNumber.c
rename to vendor/decNumber/decNumber.c
diff --git a/src/decNumber/decNumber.h b/vendor/decNumber/decNumber.h
similarity index 100%
rename from src/decNumber/decNumber.h
rename to vendor/decNumber/decNumber.h
diff --git a/src/decNumber/decNumberLocal.h b/vendor/decNumber/decNumberLocal.h
similarity index 100%
rename from src/decNumber/decNumberLocal.h
rename to vendor/decNumber/decNumberLocal.h
diff --git a/src/decNumber/decPacked.c b/vendor/decNumber/decPacked.c
similarity index 100%
rename from src/decNumber/decPacked.c
rename to vendor/decNumber/decPacked.c
diff --git a/src/decNumber/decPacked.h b/vendor/decNumber/decPacked.h
similarity index 100%
rename from src/decNumber/decPacked.h
rename to vendor/decNumber/decPacked.h
diff --git a/src/decNumber/decQuad.c b/vendor/decNumber/decQuad.c
similarity index 100%
rename from src/decNumber/decQuad.c
rename to vendor/decNumber/decQuad.c
diff --git a/src/decNumber/decQuad.h b/vendor/decNumber/decQuad.h
similarity index 100%
rename from src/decNumber/decQuad.h
rename to vendor/decNumber/decQuad.h
diff --git a/src/decNumber/decSingle.c b/vendor/decNumber/decSingle.c
similarity index 100%
rename from src/decNumber/decSingle.c
rename to vendor/decNumber/decSingle.c
diff --git a/src/decNumber/decSingle.h b/vendor/decNumber/decSingle.h
similarity index 100%
rename from src/decNumber/decSingle.h
rename to vendor/decNumber/decSingle.h
diff --git a/src/decNumber/decimal128.c b/vendor/decNumber/decimal128.c
similarity index 100%
rename from src/decNumber/decimal128.c
rename to vendor/decNumber/decimal128.c
diff --git a/src/decNumber/decimal128.h b/vendor/decNumber/decimal128.h
similarity index 100%
rename from src/decNumber/decimal128.h
rename to vendor/decNumber/decimal128.h
diff --git a/src/decNumber/decimal32.c b/vendor/decNumber/decimal32.c
similarity index 100%
rename from src/decNumber/decimal32.c
rename to vendor/decNumber/decimal32.c
diff --git a/src/decNumber/decimal32.h b/vendor/decNumber/decimal32.h
similarity index 100%
rename from src/decNumber/decimal32.h
rename to vendor/decNumber/decimal32.h
diff --git a/src/decNumber/decimal64.c b/vendor/decNumber/decimal64.c
similarity index 100%
rename from src/decNumber/decimal64.c
rename to vendor/decNumber/decimal64.c
diff --git a/src/decNumber/decimal64.h b/vendor/decNumber/decimal64.h
similarity index 100%
rename from src/decNumber/decimal64.h
rename to vendor/decNumber/decimal64.h
diff --git a/src/decNumber/decnumber.pdf b/vendor/decNumber/decnumber.pdf
similarity index 100%
rename from src/decNumber/decnumber.pdf
rename to vendor/decNumber/decnumber.pdf
diff --git a/src/decNumber/example1.c b/vendor/decNumber/example1.c
similarity index 100%
rename from src/decNumber/example1.c
rename to vendor/decNumber/example1.c
diff --git a/src/decNumber/example2.c b/vendor/decNumber/example2.c
similarity index 100%
rename from src/decNumber/example2.c
rename to vendor/decNumber/example2.c
diff --git a/src/decNumber/example3.c b/vendor/decNumber/example3.c
similarity index 100%
rename from src/decNumber/example3.c
rename to vendor/decNumber/example3.c
diff --git a/src/decNumber/example4.c b/vendor/decNumber/example4.c
similarity index 100%
rename from src/decNumber/example4.c
rename to vendor/decNumber/example4.c
diff --git a/src/decNumber/example5.c b/vendor/decNumber/example5.c
similarity index 100%
rename from src/decNumber/example5.c
rename to vendor/decNumber/example5.c
diff --git a/src/decNumber/example6.c b/vendor/decNumber/example6.c
similarity index 100%
rename from src/decNumber/example6.c
rename to vendor/decNumber/example6.c
diff --git a/src/decNumber/example7.c b/vendor/decNumber/example7.c
similarity index 100%
rename from src/decNumber/example7.c
rename to vendor/decNumber/example7.c
diff --git a/src/decNumber/example8.c b/vendor/decNumber/example8.c
similarity index 100%
rename from src/decNumber/example8.c
rename to vendor/decNumber/example8.c
diff --git a/src/decNumber/readme.txt b/vendor/decNumber/readme.txt
similarity index 100%
rename from src/decNumber/readme.txt
rename to vendor/decNumber/readme.txt
diff --git a/modules/oniguruma b/vendor/oniguruma
similarity index 100%
rename from modules/oniguruma
rename to vendor/oniguruma