diff --git a/ql/src/experimental/CWE-640/EmailBad.go b/ql/src/Security/CWE-640/EmailBad.go
similarity index 100%
rename from ql/src/experimental/CWE-640/EmailBad.go
rename to ql/src/Security/CWE-640/EmailBad.go
diff --git a/ql/src/experimental/CWE-640/EmailGood.go b/ql/src/Security/CWE-640/EmailGood.go
similarity index 100%
rename from ql/src/experimental/CWE-640/EmailGood.go
rename to ql/src/Security/CWE-640/EmailGood.go
diff --git a/ql/src/experimental/CWE-640/EmailInjection.qhelp b/ql/src/Security/CWE-640/EmailInjection.qhelp
similarity index 100%
rename from ql/src/experimental/CWE-640/EmailInjection.qhelp
rename to ql/src/Security/CWE-640/EmailInjection.qhelp
diff --git a/ql/src/experimental/CWE-640/EmailInjection.ql b/ql/src/Security/CWE-640/EmailInjection.ql
similarity index 100%
rename from ql/src/experimental/CWE-640/EmailInjection.ql
rename to ql/src/Security/CWE-640/EmailInjection.ql
diff --git a/ql/src/experimental/CWE-640/EmailInjection.qll b/ql/src/Security/CWE-640/EmailInjection.qll
similarity index 100%
rename from ql/src/experimental/CWE-640/EmailInjection.qll
rename to ql/src/Security/CWE-640/EmailInjection.qll
diff --git a/ql/src/experimental/CWE-640/EmailInjectionCustomizations.qll b/ql/src/Security/CWE-640/EmailInjectionCustomizations.qll
similarity index 100%
rename from ql/src/experimental/CWE-640/EmailInjectionCustomizations.qll
rename to ql/src/Security/CWE-640/EmailInjectionCustomizations.qll
diff --git a/ql/test/experimental/CWE-640/EmailInjection.qlref b/ql/test/experimental/CWE-640/EmailInjection.qlref
deleted file mode 100644
index a6d8abad1c9..00000000000
--- a/ql/test/experimental/CWE-640/EmailInjection.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/CWE-640/EmailInjection.ql
\ No newline at end of file
diff --git a/ql/test/experimental/CWE-640/EmailInjection.expected b/ql/test/query-tests/Security/CWE-640/EmailInjection.expected
similarity index 100%
rename from ql/test/experimental/CWE-640/EmailInjection.expected
rename to ql/test/query-tests/Security/CWE-640/EmailInjection.expected
diff --git a/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref b/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref
new file mode 100644
index 00000000000..98862a2de38
--- /dev/null
+++ b/ql/test/query-tests/Security/CWE-640/EmailInjection.qlref
@@ -0,0 +1 @@
+Security/CWE-640/EmailInjection.ql
\ No newline at end of file
diff --git a/ql/test/experimental/CWE-640/email.go b/ql/test/query-tests/Security/CWE-640/email.go
similarity index 100%
rename from ql/test/experimental/CWE-640/email.go
rename to ql/test/query-tests/Security/CWE-640/email.go
diff --git a/ql/test/experimental/CWE-640/go.mod b/ql/test/query-tests/Security/CWE-640/go.mod
similarity index 100%
rename from ql/test/experimental/CWE-640/go.mod
rename to ql/test/query-tests/Security/CWE-640/go.mod
diff --git a/ql/test/experimental/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/LICENSE b/ql/test/query-tests/Security/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/LICENSE
similarity index 100%
rename from ql/test/experimental/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/LICENSE
rename to ql/test/query-tests/Security/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/LICENSE
diff --git a/ql/test/experimental/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/mail/stub.go b/ql/test/query-tests/Security/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/mail/stub.go
similarity index 100%
rename from ql/test/experimental/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/mail/stub.go
rename to ql/test/query-tests/Security/CWE-640/vendor/github.com/sendgrid/sendgrid-go/helpers/mail/stub.go
diff --git a/ql/test/experimental/CWE-640/vendor/modules.txt b/ql/test/query-tests/Security/CWE-640/vendor/modules.txt
similarity index 100%
rename from ql/test/experimental/CWE-640/vendor/modules.txt
rename to ql/test/query-tests/Security/CWE-640/vendor/modules.txt