diff --git a/java/ql/src/experimental/semmle/code/java/frameworks/FreeMarker.qll b/java/ql/lib/semmle/code/java/frameworks/FreeMarker.qll
similarity index 100%
rename from java/ql/src/experimental/semmle/code/java/frameworks/FreeMarker.qll
rename to java/ql/lib/semmle/code/java/frameworks/FreeMarker.qll
diff --git a/java/ql/src/experimental/semmle/code/java/frameworks/JinJava.qll b/java/ql/lib/semmle/code/java/frameworks/JinJava.qll
similarity index 100%
rename from java/ql/src/experimental/semmle/code/java/frameworks/JinJava.qll
rename to java/ql/lib/semmle/code/java/frameworks/JinJava.qll
diff --git a/java/ql/src/experimental/semmle/code/java/frameworks/Pebble.qll b/java/ql/lib/semmle/code/java/frameworks/Pebble.qll
similarity index 100%
rename from java/ql/src/experimental/semmle/code/java/frameworks/Pebble.qll
rename to java/ql/lib/semmle/code/java/frameworks/Pebble.qll
diff --git a/java/ql/src/experimental/semmle/code/java/frameworks/Thymeleaf.qll b/java/ql/lib/semmle/code/java/frameworks/Thymeleaf.qll
similarity index 100%
rename from java/ql/src/experimental/semmle/code/java/frameworks/Thymeleaf.qll
rename to java/ql/lib/semmle/code/java/frameworks/Thymeleaf.qll
diff --git a/java/ql/src/experimental/semmle/code/java/frameworks/Velocity.qll b/java/ql/lib/semmle/code/java/frameworks/Velocity.qll
similarity index 100%
rename from java/ql/src/experimental/semmle/code/java/frameworks/Velocity.qll
rename to java/ql/lib/semmle/code/java/frameworks/Velocity.qll
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/SSTIBad.java b/java/ql/src/Security/CWE/CWE-094/SSTIBad.java
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/SSTIBad.java
rename to java/ql/src/Security/CWE/CWE-094/SSTIBad.java
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/SSTIGood.java b/java/ql/src/Security/CWE/CWE-094/SSTIGood.java
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/SSTIGood.java
rename to java/ql/src/Security/CWE/CWE-094/SSTIGood.java
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.qhelp b/java/ql/src/Security/CWE/CWE-094/TemplateInjection.qhelp
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.qhelp
rename to java/ql/src/Security/CWE/CWE-094/TemplateInjection.qhelp
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.ql b/java/ql/src/Security/CWE/CWE-094/TemplateInjection.ql
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.ql
rename to java/ql/src/Security/CWE/CWE-094/TemplateInjection.ql
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.qll b/java/ql/src/Security/CWE/CWE-094/TemplateInjection.qll
similarity index 95%
rename from java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.qll
rename to java/ql/src/Security/CWE/CWE-094/TemplateInjection.qll
index 2f3113123aa..5accdf7985c 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-094/TemplateInjection.qll
+++ b/java/ql/src/Security/CWE/CWE-094/TemplateInjection.qll
@@ -3,11 +3,11 @@
 import java
 import semmle.code.java.dataflow.TaintTracking
 import semmle.code.java.dataflow.FlowSources
-import experimental.semmle.code.java.frameworks.FreeMarker
-import experimental.semmle.code.java.frameworks.Velocity
-import experimental.semmle.code.java.frameworks.JinJava
-import experimental.semmle.code.java.frameworks.Pebble
-import experimental.semmle.code.java.frameworks.Thymeleaf
+import semmle.code.java.frameworks.FreeMarker
+import semmle.code.java.frameworks.Velocity
+import semmle.code.java.frameworks.JinJava
+import semmle.code.java.frameworks.Pebble
+import semmle.code.java.frameworks.Thymeleaf
 
 /** A taint tracking configuration to reason about Server Side Template Injection (SSTI) vulnerabilities */
 class TemplateInjectionFlowConfig extends TaintTracking::Configuration {
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/TemplateInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/TemplateInjection.qlref
deleted file mode 100644
index 2febc9b780f..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-094/TemplateInjection.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-094/TemplateInjection.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/FreemarkerSSTI.java b/java/ql/test/query-tests/security/CWE-094/FreemarkerSSTI.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/FreemarkerSSTI.java
rename to java/ql/test/query-tests/security/CWE-094/FreemarkerSSTI.java
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/JinJavaSSTI.java b/java/ql/test/query-tests/security/CWE-094/JinJavaSSTI.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/JinJavaSSTI.java
rename to java/ql/test/query-tests/security/CWE-094/JinJavaSSTI.java
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/PebbleSSTI.java b/java/ql/test/query-tests/security/CWE-094/PebbleSSTI.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/PebbleSSTI.java
rename to java/ql/test/query-tests/security/CWE-094/PebbleSSTI.java
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/TemplateInjection.expected b/java/ql/test/query-tests/security/CWE-094/TemplateInjection.expected
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/TemplateInjection.expected
rename to java/ql/test/query-tests/security/CWE-094/TemplateInjection.expected
diff --git a/java/ql/test/query-tests/security/CWE-094/TemplateInjection.qlref b/java/ql/test/query-tests/security/CWE-094/TemplateInjection.qlref
new file mode 100644
index 00000000000..fabf9f17b8a
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-094/TemplateInjection.qlref
@@ -0,0 +1 @@
+Security/CWE/CWE-094/TemplateInjection.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/ThymeleafSSTI.java b/java/ql/test/query-tests/security/CWE-094/ThymeleafSSTI.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/ThymeleafSSTI.java
rename to java/ql/test/query-tests/security/CWE-094/ThymeleafSSTI.java
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/VelocitySSTI.java b/java/ql/test/query-tests/security/CWE-094/VelocitySSTI.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/VelocitySSTI.java
rename to java/ql/test/query-tests/security/CWE-094/VelocitySSTI.java
diff --git a/java/ql/test/query-tests/security/CWE-094/options b/java/ql/test/query-tests/security/CWE-094/options
index 1b4bd12d17f..f9b11cbec56 100644
--- a/java/ql/test/query-tests/security/CWE-094/options
+++ b/java/ql/test/query-tests/security/CWE-094/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api:${testdir}/../../../experimental/stubs/apache-freemarker-2.3.31:${testdir}/../../../experimental/stubs/jinjava-2.6.0:${testdir}/../../../experimental/stubs/pebble-3.1.5:${testdir}/../../../experimental/stubs/thymeleaf-3.0.14:${testdir}/../../../experimental/stubs/apache-velocity-2.3