diff --git a/ql/src/experimental/CWE-327/InsecureRandomness.qhelp b/ql/src/Security/CWE-327/InsecureRandomness.qhelp
similarity index 100%
rename from ql/src/experimental/CWE-327/InsecureRandomness.qhelp
rename to ql/src/Security/CWE-327/InsecureRandomness.qhelp
diff --git a/ql/src/experimental/CWE-327/InsecureRandomness.ql b/ql/src/Security/CWE-327/InsecureRandomness.ql
similarity index 100%
rename from ql/src/experimental/CWE-327/InsecureRandomness.ql
rename to ql/src/Security/CWE-327/InsecureRandomness.ql
diff --git a/ql/src/experimental/CWE-327/InsecureRandomnessCustomizations.qll b/ql/src/semmle/go/security/InsecureRandomnessCustomizations.qll
similarity index 100%
rename from ql/src/experimental/CWE-327/InsecureRandomnessCustomizations.qll
rename to ql/src/semmle/go/security/InsecureRandomnessCustomizations.qll
diff --git a/ql/test/experimental/CWE-327/Crypto.go b/ql/test/query-tests/Security/CWE-327/InsecureRandomness/Crypto.go
similarity index 100%
rename from ql/test/experimental/CWE-327/Crypto.go
rename to ql/test/query-tests/Security/CWE-327/InsecureRandomness/Crypto.go
diff --git a/ql/test/experimental/CWE-327/InsecureRandomness.expected b/ql/test/query-tests/Security/CWE-327/InsecureRandomness/InsecureRandomness.expected
similarity index 100%
rename from ql/test/experimental/CWE-327/InsecureRandomness.expected
rename to ql/test/query-tests/Security/CWE-327/InsecureRandomness/InsecureRandomness.expected
diff --git a/ql/test/experimental/CWE-327/InsecureRandomness.go b/ql/test/query-tests/Security/CWE-327/InsecureRandomness/InsecureRandomness.go
similarity index 100%
rename from ql/test/experimental/CWE-327/InsecureRandomness.go
rename to ql/test/query-tests/Security/CWE-327/InsecureRandomness/InsecureRandomness.go
diff --git a/ql/test/experimental/CWE-327/InsecureRandomness.qlref b/ql/test/query-tests/Security/CWE-327/InsecureRandomness/InsecureRandomness.qlref
similarity index 100%
rename from ql/test/experimental/CWE-327/InsecureRandomness.qlref
rename to ql/test/query-tests/Security/CWE-327/InsecureRandomness/InsecureRandomness.qlref
diff --git a/ql/test/experimental/CWE-327/WeakCryptoAlgorithm.expected b/ql/test/query-tests/Security/CWE-327/InsecureRandomness/WeakCryptoAlgorithm.expected
similarity index 100%
rename from ql/test/experimental/CWE-327/WeakCryptoAlgorithm.expected
rename to ql/test/query-tests/Security/CWE-327/InsecureRandomness/WeakCryptoAlgorithm.expected
diff --git a/ql/test/experimental/CWE-327/WeakCryptoAlgorithm.qlref b/ql/test/query-tests/Security/CWE-327/InsecureRandomness/WeakCryptoAlgorithm.qlref
similarity index 100%
rename from ql/test/experimental/CWE-327/WeakCryptoAlgorithm.qlref
rename to ql/test/query-tests/Security/CWE-327/InsecureRandomness/WeakCryptoAlgorithm.qlref