diff --git a/cpp/ql/lib/ext/generated/brotli/brotli.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/brotli/brotli.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/brotli/brotli.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/brotli/brotli.model.yml
diff --git a/cpp/ql/lib/ext/generated/curl/curl.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/curl/curl.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/curl/curl.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/curl/curl.model.yml
diff --git a/cpp/ql/lib/ext/generated/glibc/glibc.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/glibc/glibc.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/glibc/glibc.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/glibc/glibc.model.yml
diff --git a/cpp/ql/lib/ext/generated/libidn2/libidn2.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/libidn2/libidn2.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/libidn2/libidn2.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/libidn2/libidn2.model.yml
diff --git a/cpp/ql/lib/ext/generated/libssh2/libssh2.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/libssh2/libssh2.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/libssh2/libssh2.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/libssh2/libssh2.model.yml
diff --git a/cpp/ql/lib/ext/generated/libuv/libuv.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/libuv/libuv.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/libuv/libuv.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/libuv/libuv.model.yml
diff --git a/cpp/ql/lib/ext/generated/nghttp2/nghttp2.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/nghttp2/nghttp2.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/nghttp2/nghttp2.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/nghttp2/nghttp2.model.yml
diff --git a/cpp/ql/lib/ext/generated/openssl/openssl.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/openssl/openssl.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/openssl/openssl.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/openssl/openssl.model.yml
diff --git a/cpp/ql/lib/ext/generated/sqlite/sqlite.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/sqlite/sqlite.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/sqlite/sqlite.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/sqlite/sqlite.model.yml
diff --git a/cpp/ql/lib/ext/generated/zlib/zlib.model.yml b/cpp/ql/lib/ext/generated/modelgenerator/zlib/zlib.model.yml
similarity index 100%
rename from cpp/ql/lib/ext/generated/zlib/zlib.model.yml
rename to cpp/ql/lib/ext/generated/modelgenerator/zlib/zlib.model.yml