diff --git a/cpp/ql/lib/codeql/change-notes/2021-11-01-isFromSystemMacroDefinition.md b/cpp/ql/lib/change-notes/2021-11-01-isFromSystemMacroDefinition.md
similarity index 100%
rename from cpp/ql/lib/codeql/change-notes/2021-11-01-isFromSystemMacroDefinition.md
rename to cpp/ql/lib/change-notes/2021-11-01-isFromSystemMacroDefinition.md
diff --git a/cpp/ql/lib/codeql/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
similarity index 100%
rename from cpp/ql/lib/codeql/codeql-pack.release.yml
rename to cpp/ql/lib/codeql-pack.release.yml
diff --git a/cpp/ql/src/codeql/change-notes/2021-11-09-use-of-http.md b/cpp/ql/src/change-notes/2021-11-09-use-of-http.md
similarity index 100%
rename from cpp/ql/src/codeql/change-notes/2021-11-09-use-of-http.md
rename to cpp/ql/src/change-notes/2021-11-09-use-of-http.md
diff --git a/cpp/ql/src/codeql/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
similarity index 100%
rename from cpp/ql/src/codeql/codeql-pack.release.yml
rename to cpp/ql/src/codeql-pack.release.yml
diff --git a/cpp/upgrades/codeql/codeql-pack.release.yml b/cpp/upgrades/codeql-pack.release.yml
similarity index 100%
rename from cpp/upgrades/codeql/codeql-pack.release.yml
rename to cpp/upgrades/codeql-pack.release.yml
diff --git a/csharp/ql/lib/codeql/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
similarity index 100%
rename from csharp/ql/lib/codeql/codeql-pack.release.yml
rename to csharp/ql/lib/codeql-pack.release.yml
diff --git a/csharp/ql/src/codeql/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
similarity index 100%
rename from csharp/ql/src/codeql/codeql-pack.release.yml
rename to csharp/ql/src/codeql-pack.release.yml
diff --git a/csharp/upgrades/codeql/codeql-pack.release.yml b/csharp/upgrades/codeql-pack.release.yml
similarity index 100%
rename from csharp/upgrades/codeql/codeql-pack.release.yml
rename to csharp/upgrades/codeql-pack.release.yml
diff --git a/java/ql/lib/codeql/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
similarity index 100%
rename from java/ql/lib/codeql/codeql-pack.release.yml
rename to java/ql/lib/codeql-pack.release.yml
diff --git a/java/ql/src/codeql/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
similarity index 100%
rename from java/ql/src/codeql/codeql-pack.release.yml
rename to java/ql/src/codeql-pack.release.yml
diff --git a/java/upgrades/codeql/codeql-pack.release.yml b/java/upgrades/codeql-pack.release.yml
similarity index 100%
rename from java/upgrades/codeql/codeql-pack.release.yml
rename to java/upgrades/codeql-pack.release.yml
diff --git a/javascript/ql/lib/codeql/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
similarity index 100%
rename from javascript/ql/lib/codeql/codeql-pack.release.yml
rename to javascript/ql/lib/codeql-pack.release.yml
diff --git a/javascript/ql/src/codeql/change-notes/2021-11-02-insufficient-key-size.md b/javascript/ql/src/change-notes/2021-11-02-insufficient-key-size.md
similarity index 100%
rename from javascript/ql/src/codeql/change-notes/2021-11-02-insufficient-key-size.md
rename to javascript/ql/src/change-notes/2021-11-02-insufficient-key-size.md
diff --git a/javascript/ql/src/codeql/change-notes/2021-11-02-session-fixation.md b/javascript/ql/src/change-notes/2021-11-02-session-fixation.md
similarity index 100%
rename from javascript/ql/src/codeql/change-notes/2021-11-02-session-fixation.md
rename to javascript/ql/src/change-notes/2021-11-02-session-fixation.md
diff --git a/javascript/ql/src/codeql/change-notes/2021-11-04-sensitive-get-query.md b/javascript/ql/src/change-notes/2021-11-04-sensitive-get-query.md
similarity index 100%
rename from javascript/ql/src/codeql/change-notes/2021-11-04-sensitive-get-query.md
rename to javascript/ql/src/change-notes/2021-11-04-sensitive-get-query.md
diff --git a/javascript/ql/src/codeql/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
similarity index 100%
rename from javascript/ql/src/codeql/codeql-pack.release.yml
rename to javascript/ql/src/codeql-pack.release.yml
diff --git a/javascript/upgrades/codeql/codeql-pack.release.yml b/javascript/upgrades/codeql-pack.release.yml
similarity index 100%
rename from javascript/upgrades/codeql/codeql-pack.release.yml
rename to javascript/upgrades/codeql-pack.release.yml
diff --git a/misc/suite-helpers/codeql/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
similarity index 100%
rename from misc/suite-helpers/codeql/codeql-pack.release.yml
rename to misc/suite-helpers/codeql-pack.release.yml
diff --git a/python/ql/lib/codeql/change-notes/2021-11-02-flask_admin.md b/python/ql/lib/change-notes/2021-11-02-flask_admin.md
similarity index 100%
rename from python/ql/lib/codeql/change-notes/2021-11-02-flask_admin.md
rename to python/ql/lib/change-notes/2021-11-02-flask_admin.md
diff --git a/python/ql/lib/codeql/change-notes/2021-11-02-toml.md b/python/ql/lib/change-notes/2021-11-02-toml.md
similarity index 100%
rename from python/ql/lib/codeql/change-notes/2021-11-02-toml.md
rename to python/ql/lib/change-notes/2021-11-02-toml.md
diff --git a/python/ql/lib/codeql/change-notes/2021-11-09-model-aiopg.md b/python/ql/lib/change-notes/2021-11-09-model-aiopg.md
similarity index 100%
rename from python/ql/lib/codeql/change-notes/2021-11-09-model-aiopg.md
rename to python/ql/lib/change-notes/2021-11-09-model-aiopg.md
diff --git a/python/ql/lib/codeql/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
similarity index 100%
rename from python/ql/lib/codeql/codeql-pack.release.yml
rename to python/ql/lib/codeql-pack.release.yml
diff --git a/python/ql/src/codeql/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
similarity index 100%
rename from python/ql/src/codeql/codeql-pack.release.yml
rename to python/ql/src/codeql-pack.release.yml
diff --git a/python/upgrades/codeql/codeql-pack.release.yml b/python/upgrades/codeql-pack.release.yml
similarity index 100%
rename from python/upgrades/codeql/codeql-pack.release.yml
rename to python/upgrades/codeql-pack.release.yml
diff --git a/ruby/ql/lib/codeql/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
similarity index 100%
rename from ruby/ql/lib/codeql/codeql-pack.release.yml
rename to ruby/ql/lib/codeql-pack.release.yml
diff --git a/ruby/ql/src/codeql/change-notes/2021-11-08-hardcoded-credentials-downgrade.md b/ruby/ql/src/change-notes/2021-11-08-hardcoded-credentials-downgrade.md
similarity index 100%
rename from ruby/ql/src/codeql/change-notes/2021-11-08-hardcoded-credentials-downgrade.md
rename to ruby/ql/src/change-notes/2021-11-08-hardcoded-credentials-downgrade.md
diff --git a/ruby/ql/src/codeql/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
similarity index 100%
rename from ruby/ql/src/codeql/codeql-pack.release.yml
rename to ruby/ql/src/codeql-pack.release.yml