diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Header.expected b/ql/test/library-tests/semmle/go/concepts/HTTP/Header.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Header.expected
rename to ql/test/library-tests/semmle/go/concepts/HTTP/Header.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Header.ql b/ql/test/library-tests/semmle/go/concepts/HTTP/Header.ql
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Header.ql
rename to ql/test/library-tests/semmle/go/concepts/HTTP/Header.ql
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/RequestBody.expected b/ql/test/library-tests/semmle/go/concepts/HTTP/RequestBody.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/RequestBody.expected
rename to ql/test/library-tests/semmle/go/concepts/HTTP/RequestBody.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/RequestBody.ql b/ql/test/library-tests/semmle/go/concepts/HTTP/RequestBody.ql
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/RequestBody.ql
rename to ql/test/library-tests/semmle/go/concepts/HTTP/RequestBody.ql
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/ResponseBody.expected b/ql/test/library-tests/semmle/go/concepts/HTTP/ResponseBody.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/ResponseBody.expected
rename to ql/test/library-tests/semmle/go/concepts/HTTP/ResponseBody.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/ResponseBody.ql b/ql/test/library-tests/semmle/go/concepts/HTTP/ResponseBody.ql
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/ResponseBody.ql
rename to ql/test/library-tests/semmle/go/concepts/HTTP/ResponseBody.ql
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/UntrustedFlowSources.expected b/ql/test/library-tests/semmle/go/concepts/HTTP/UntrustedFlowSources.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/UntrustedFlowSources.expected
rename to ql/test/library-tests/semmle/go/concepts/HTTP/UntrustedFlowSources.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/UntrustedFlowSources.ql b/ql/test/library-tests/semmle/go/concepts/HTTP/UntrustedFlowSources.ql
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/UntrustedFlowSources.ql
rename to ql/test/library-tests/semmle/go/concepts/HTTP/UntrustedFlowSources.ql
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/main.go b/ql/test/library-tests/semmle/go/concepts/HTTP/main.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/main.go
rename to ql/test/library-tests/semmle/go/concepts/HTTP/main.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/server.go b/ql/test/library-tests/semmle/go/concepts/HTTP/server.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/server.go
rename to ql/test/library-tests/semmle/go/concepts/HTTP/server.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/go.mod b/ql/test/library-tests/semmle/go/frameworks/Gorestful/go.mod
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/go.mod
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/go.mod
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful.expected b/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful.expected
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.expected
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful.go b/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful.go
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful.ql b/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.ql
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful.ql
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful.ql
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful_v2.go b/ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful_v2.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/gorestful_v2.go
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/gorestful_v2.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/github.com/emicklei/go-restful/LICENSE b/ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/github.com/emicklei/go-restful/LICENSE
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/github.com/emicklei/go-restful/LICENSE
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/github.com/emicklei/go-restful/LICENSE
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/github.com/emicklei/go-restful/stub.go b/ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/github.com/emicklei/go-restful/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/github.com/emicklei/go-restful/stub.go
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/github.com/emicklei/go-restful/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/github.com/emicklei/go-restful/v3/stub.go b/ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/github.com/emicklei/go-restful/v3/stub.go
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/github.com/emicklei/go-restful/v3/stub.go
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/github.com/emicklei/go-restful/v3/stub.go
diff --git a/ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/modules.txt b/ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/modules.txt
similarity index 100%
rename from ql/test/library-tests/semmle/go/frameworks/HTTP/Gorestful/vendor/modules.txt
rename to ql/test/library-tests/semmle/go/frameworks/Gorestful/vendor/modules.txt