diff --git a/ql/src/semmle/go/frameworks/CleverGo.qll b/ql/src/experimental/frameworks/CleverGo.qll
similarity index 100%
rename from ql/src/semmle/go/frameworks/CleverGo.qll
rename to ql/src/experimental/frameworks/CleverGo.qll
diff --git a/ql/src/go.qll b/ql/src/go.qll
index 062c74535d8..574268b2627 100644
--- a/ql/src/go.qll
+++ b/ql/src/go.qll
@@ -34,7 +34,6 @@ import semmle.go.dataflow.TaintTracking2
 import semmle.go.frameworks.Beego
 import semmle.go.frameworks.BeegoOrm
 import semmle.go.frameworks.Chi
-import semmle.go.frameworks.CleverGo
 import semmle.go.frameworks.Couchbase
 import semmle.go.frameworks.Echo
 import semmle.go.frameworks.ElazarlGoproxy
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/Model-HeaderWrite.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Test.expected b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Test.ql b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.ql
similarity index 94%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.ql
index 15c55584eca..3c8e6d53df2 100644
--- a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/Test.ql
+++ b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/Test.ql
@@ -1,4 +1,5 @@
 import go
+import experimental.frameworks.CleverGo
 import TestUtilities.InlineExpectationsTest
 
 class HttpHeaderWriteTest extends InlineExpectationsTest {
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/go.mod b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/go.mod
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/go.mod
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/go.mod
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/LICENSE b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/LICENSE
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/LICENSE
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/LICENSE
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/stub.go b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/stub.go
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/vendor/clevergo.tech/clevergo/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/vendor/modules.txt b/ql/test/experimental/frameworks/CleverGo/HeaderWrite/vendor/modules.txt
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HeaderWrite/vendor/modules.txt
rename to ql/test/experimental/frameworks/CleverGo/HeaderWrite/vendor/modules.txt
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/Model-HttpRedirect.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Test.expected b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Test.ql b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.ql
similarity index 93%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.ql
index 28420bc9dcb..efc79c9d7e8 100644
--- a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/Test.ql
+++ b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/Test.ql
@@ -1,4 +1,5 @@
 import go
+import experimental.frameworks.CleverGo
 import TestUtilities.InlineExpectationsTest
 
 class HttpRedirectTest extends InlineExpectationsTest {
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/go.mod b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/go.mod
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/go.mod
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/go.mod
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/LICENSE b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/LICENSE
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/LICENSE
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/LICENSE
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/stub.go b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/stub.go
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/vendor/clevergo.tech/clevergo/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/vendor/modules.txt b/ql/test/experimental/frameworks/CleverGo/HttpRedirect/vendor/modules.txt
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpRedirect/vendor/modules.txt
rename to ql/test/experimental/frameworks/CleverGo/HttpRedirect/vendor/modules.txt
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Model-HttpResponseBody.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Test.expected b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Test.ql b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.ql
similarity index 94%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.ql
index 910b2965cfe..34a21ef49f6 100644
--- a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/Test.ql
+++ b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/Test.ql
@@ -1,4 +1,5 @@
 import go
+import experimental.frameworks.CleverGo
 import TestUtilities.InlineExpectationsTest
 
 class HttpResponseBodyTest extends InlineExpectationsTest {
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/go.mod b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/go.mod
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/go.mod
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/go.mod
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/LICENSE b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/LICENSE
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/LICENSE
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/LICENSE
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/stub.go b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/stub.go
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/vendor/clevergo.tech/clevergo/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/vendor/modules.txt b/ql/test/experimental/frameworks/CleverGo/HttpResponseBody/vendor/modules.txt
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/HttpResponseBody/vendor/modules.txt
rename to ql/test/experimental/frameworks/CleverGo/HttpResponseBody/vendor/modules.txt
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go b/ql/test/experimental/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/Model-TaintTracking.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Test.expected b/ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Test.ql b/ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.ql
similarity index 96%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.ql
index e99e38367a0..c828bf5380d 100644
--- a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/Test.ql
+++ b/ql/test/experimental/frameworks/CleverGo/TaintTracking/Test.ql
@@ -1,4 +1,5 @@
 import go
+import experimental.frameworks.CleverGo
 import TestUtilities.InlineExpectationsTest
 
 class Configuration extends TaintTracking::Configuration {
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/go.mod b/ql/test/experimental/frameworks/CleverGo/TaintTracking/go.mod
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/go.mod
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/go.mod
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/LICENSE b/ql/test/experimental/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/LICENSE
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/LICENSE
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/LICENSE
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/stub.go b/ql/test/experimental/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/stub.go
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/vendor/clevergo.tech/clevergo/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/vendor/modules.txt b/ql/test/experimental/frameworks/CleverGo/TaintTracking/vendor/modules.txt
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/TaintTracking/vendor/modules.txt
rename to ql/test/experimental/frameworks/CleverGo/TaintTracking/vendor/modules.txt
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/Model-UntrustedSources.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Test.expected b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Test.expected
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Test.ql b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.ql
similarity index 94%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Test.ql
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.ql
index 6f82143766b..cb5b4f82cc2 100644
--- a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/Test.ql
+++ b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/Test.ql
@@ -1,4 +1,5 @@
 import go
+import experimental.frameworks.CleverGo
 import TestUtilities.InlineExpectationsTest
 
 class UntrustedFlowSourceTest extends InlineExpectationsTest {
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/go.mod b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/go.mod
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/go.mod
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/go.mod
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/LICENSE b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/LICENSE
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/LICENSE
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/LICENSE
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/stub.go b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/stub.go
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/vendor/clevergo.tech/clevergo/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/vendor/modules.txt b/ql/test/experimental/frameworks/CleverGo/UntrustedSources/vendor/modules.txt
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/CleverGo/UntrustedSources/vendor/modules.txt
rename to ql/test/experimental/frameworks/CleverGo/UntrustedSources/vendor/modules.txt