diff --git a/actix-files/README.md b/actix-files/README.md
index 669efc0ab..8ac80860e 100644
--- a/actix-files/README.md
+++ b/actix-files/README.md
@@ -13,6 +13,6 @@
 
 ## Documentation & Resources
 
-- [API Documentation](https://docs.rs/actix-files/)
-- [Example Project](https://github.com/actix/examples/tree/master/basics/static_index)
+- [API Documentation](https://docs.rs/actix-files)
+- [Example Project](https://github.com/actix/examples/tree/master/basics/static-files)
 - Minimum Supported Rust Version (MSRV): 1.54
diff --git a/actix-web/MIGRATION-4.0.md b/actix-web/MIGRATION-4.0.md
index b013f12b2..e33aee4a3 100644
--- a/actix-web/MIGRATION-4.0.md
+++ b/actix-web/MIGRATION-4.0.md
@@ -104,7 +104,7 @@ The inner field for `web::Path` was made private because It was causing too many
 
 ## Rustls Crate Upgrade
 
-Required version of `rustls` dependency was bumped to the latest version 0.20. As a result, the new server config builder has changed. [See the updated example project →.](https://github.com/actix/examples/tree/HEAD/security/rustls/)
+Required version of `rustls` dependency was bumped to the latest version 0.20. As a result, the new server config builder has changed. [See the updated example project →.](https://github.com/actix/examples/tree/master/https-tls/rustls/)
 
 ## Removed `awc` Client Re-export
 
diff --git a/actix-web/README.md b/actix-web/README.md
index 188c0df28..e66224524 100644
--- a/actix-web/README.md
+++ b/actix-web/README.md
@@ -71,26 +71,24 @@ async fn main() -> std::io::Result<()> {
 }
 ```
 
-### More examples
+### More Examples
 
-- [Basic Setup](https://github.com/actix/examples/tree/master/basics/basics/)
-- [Application State](https://github.com/actix/examples/tree/master/basics/state/)
-- [JSON Handling](https://github.com/actix/examples/tree/master/json/json/)
-- [Multipart Streams](https://github.com/actix/examples/tree/master/forms/multipart/)
-- [Diesel Integration](https://github.com/actix/examples/tree/master/databases/diesel/)
-- [MongoDB Integration](https://github.com/actix/examples/tree/master/databases/mongodb/)
-- [Postgres Integration](https://github.com/actix/examples/tree/master/databases/postgres/)
-- [Rbatis Integration](https://github.com/actix/examples/tree/master/databases/rbatis/)
-- [Redis Integration](https://github.com/actix/examples/tree/master/databases/redis/)
-- [SQLite Integration](https://github.com/actix/examples/tree/master/databases/sqlite/)
-- [Simple WebSocket](https://github.com/actix/examples/tree/master/websockets/)
-- [WebSocket Chat](https://github.com/actix/examples/tree/master/websockets/chat/)
-- [Tera Templates](https://github.com/actix/examples/tree/master/templating/tera/)
-- [Askama Templates](https://github.com/actix/examples/tree/master/templating/askama/)
-- [HTTPS using Rustls](https://github.com/actix/examples/tree/master/https-tls/rustls/)
-- [HTTPS using OpenSSL](https://github.com/actix/examples/tree/master/https-tls/openssl/)
+- [Hello World](https://github.com/actix/examples/tree/master/basics/hello-world)
+- [Basic Setup](https://github.com/actix/examples/tree/master/basics/basics)
+- [Application State](https://github.com/actix/examples/tree/master/basics/state)
+- [JSON Handling](https://github.com/actix/examples/tree/master/json/json)
+- [Multipart Streams](https://github.com/actix/examples/tree/master/forms/multipart)
+- [Diesel Integration](https://github.com/actix/examples/tree/master/databases/diesel)
+- [SQLite Integration](https://github.com/actix/examples/tree/master/databases/sqlite)
+- [Postgres Integration](https://github.com/actix/examples/tree/master/databases/postgres)
+- [Tera Templates](https://github.com/actix/examples/tree/master/templating/tera)
+- [Askama Templates](https://github.com/actix/examples/tree/master/templating/askama)
+- [HTTPS using Rustls](https://github.com/actix/examples/tree/master/https-tls/rustls)
+- [HTTPS using OpenSSL](https://github.com/actix/examples/tree/master/https-tls/openssl)
+- [Simple WebSocket](https://github.com/actix/examples/tree/master/websockets)
+- [WebSocket Chat](https://github.com/actix/examples/tree/master/websockets/chat)
 
-You may consider checking out [this directory](https://github.com/actix/examples/tree/master/) for more examples.
+You may consider checking out [this directory](https://github.com/actix/examples/tree/master) for more examples.
 
 ## Benchmarks
 
@@ -105,5 +103,4 @@ This project is licensed under either of the following licenses, at your option:
 
 ## Code of Conduct
 
-Contribution to the actix-web repo is organized under the terms of the Contributor Covenant.
-The Actix team promises to intervene to uphold that code of conduct.
+Contribution to the actix-web repo is organized under the terms of the Contributor Covenant. The Actix team promises to intervene to uphold that code of conduct.
diff --git a/actix-web/examples/on-connect.rs b/actix-web/examples/on-connect.rs
index d76e9ce56..24c6f8418 100644
--- a/actix-web/examples/on-connect.rs
+++ b/actix-web/examples/on-connect.rs
@@ -2,7 +2,7 @@
 //! properties and pass them to a handler through request-local data.
 //!
 //! For an example of extracting a client TLS certificate, see:
-//! <https://github.com/actix/examples/tree/HEAD/security/rustls-client-cert>
+//! <https://github.com/actix/examples/tree/master/https-tls/rustls-client-cert>
 
 use std::{any::Any, io, net::SocketAddr};
 
diff --git a/awc/README.md b/awc/README.md
index 4e97b1789..417647e62 100644
--- a/awc/README.md
+++ b/awc/README.md
@@ -11,7 +11,7 @@
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/awc)
-- [Example Project](https://github.com/actix/examples/tree/HEAD/security/awc_https)
+- [Example Project](https://github.com/actix/examples/tree/master/https-tls/awc-https)
 - Minimum Supported Rust Version (MSRV): 1.54
 
 ## Example