diff --git a/CHANGELOG-2.3.md b/CHANGELOG/CHANGELOG-2.3.md
similarity index 100%
rename from CHANGELOG-2.3.md
rename to CHANGELOG/CHANGELOG-2.3.md
diff --git a/CHANGELOG-3.0.md b/CHANGELOG/CHANGELOG-3.0.md
similarity index 100%
rename from CHANGELOG-3.0.md
rename to CHANGELOG/CHANGELOG-3.0.md
diff --git a/CHANGELOG-3.1.md b/CHANGELOG/CHANGELOG-3.1.md
similarity index 99%
rename from CHANGELOG-3.1.md
rename to CHANGELOG/CHANGELOG-3.1.md
index 18765392a..b6706b712 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG/CHANGELOG-3.1.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.0](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.0.md).
+Previous change logs can be found at [CHANGELOG-3.0](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.0.md).
 
 
 The minimum recommended etcd versions to run in **production** are 3.1.11+, 3.2.26+, and 3.3.11+.
diff --git a/CHANGELOG-3.2.md b/CHANGELOG/CHANGELOG-3.2.md
similarity index 99%
rename from CHANGELOG-3.2.md
rename to CHANGELOG/CHANGELOG-3.2.md
index b6b2d2a39..e4283f36a 100644
--- a/CHANGELOG-3.2.md
+++ b/CHANGELOG/CHANGELOG-3.2.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.1](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.1.md).
+Previous change logs can be found at [CHANGELOG-3.1](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.1.md).
 
 
 The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+.
diff --git a/CHANGELOG-3.3.md b/CHANGELOG/CHANGELOG-3.3.md
similarity index 99%
rename from CHANGELOG-3.3.md
rename to CHANGELOG/CHANGELOG-3.3.md
index 65246e5dd..75d56cefb 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG/CHANGELOG-3.3.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.2](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.2.md).
+Previous change logs can be found at [CHANGELOG-3.2](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.2.md).
 
 
 The minimum recommended etcd versions to run in **production** are 3.3.18+, 3.4.2+, and 3.5.1+. Refer to the [versioning policy](https://etcd.io/docs/v3.3/op-guide/versioning/) for more details.
diff --git a/CHANGELOG-3.4.md b/CHANGELOG/CHANGELOG-3.4.md
similarity index 99%
rename from CHANGELOG-3.4.md
rename to CHANGELOG/CHANGELOG-3.4.md
index 50aecd966..3cb690544 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG/CHANGELOG-3.4.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.3.md).
+Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.3.md).
 
 
 The minimum recommended etcd versions to run in **production** are 3.3.18+, 3.4.2+, and 3.5.1+. Refer to the [versioning policy](https://etcd.io/docs/v3.4/op-guide/versioning/) for more details.
diff --git a/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md
similarity index 99%
rename from CHANGELOG-3.5.md
rename to CHANGELOG/CHANGELOG-3.5.md
index 6699fe170..d7acc70b3 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG/CHANGELOG-3.5.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.4.md).
+Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.4.md).
 
 
 The minimum recommended etcd versions to run in **production** are 3.3.18+, 3.4.2+, and 3.5.1+. Refer to the [versioning policy](https://etcd.io/docs/v3.5/op-guide/versioning/) for more details.
diff --git a/CHANGELOG-3.6.md b/CHANGELOG/CHANGELOG-3.6.md
similarity index 97%
rename from CHANGELOG-3.6.md
rename to CHANGELOG/CHANGELOG-3.6.md
index 8d0591cfd..75c6fc8f0 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG/CHANGELOG-3.6.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.5](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.5.md).
+Previous change logs can be found at [CHANGELOG-3.5](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md).
 
 <hr>
 
diff --git a/CHANGELOG-4.0.md b/CHANGELOG/CHANGELOG-4.0.md
similarity index 97%
rename from CHANGELOG-4.0.md
rename to CHANGELOG/CHANGELOG-4.0.md
index 6b15f7237..c63d724bd 100644
--- a/CHANGELOG-4.0.md
+++ b/CHANGELOG/CHANGELOG-4.0.md
@@ -1,6 +1,6 @@
 
 
-Previous change logs can be found at [CHANGELOG-3.x](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.x.md).
+Previous change logs can be found at [CHANGELOG-3.x](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.x.md).
 
 
 The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+.