diff --git a/README.md b/README.md
index 0328f46..6cbe2e8 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,20 @@
 
 ## Security lists
 
+### Scanners
+
 - `https://security.wdes.eu/scanners/stretchoid.txt` (List of all known stretchoid IPs)
 - `https://security.wdes.eu/scanners/binaryedge.txt` (List of all known binaryedge IPs)
 - `https://security.wdes.eu/scanners/censys.txt` (List of all IPs declared by censys scanner on their [FAQ](https://support.censys.io/hc/en-us/articles/360043177092-Opt-Out-of-Data-Collection)
 - `https://security.wdes.eu/scanners/internet-measurement.com.txt` (List of all IPs declared by internet-measurement.com on [their website](https://internet-measurement.com/#ips))
+
+### Collections (by vendor)
+
 - `https://security.wdes.eu/collections/wdes/bad-networks.txt` (List of some hand picked bad networks)
-- `https://security.wdes.eu/collections/bad-ips.txt` (List of some hand picked bad IPs that caused harm/attacks/scans to mail servers)
+- `https://security.wdes.eu/collections/wdes/bad-ips.txt` (List of some hand picked bad IPs that caused harm/attacks/scans to mail servers)
+
+- `https://security.wdes.eu/collections/microsoft/email-servers.txt` (List of the Microsoft IPs for it's mail servers)
+- `https://security.wdes.eu/collections/amazon/cloudfront-ips.txt` (List of AWS CloudFront IPs)
 
 ## Other similar projects
 
diff --git a/data/scanners/cloudfront-ips.txt b/data/collections/amazon/cloudfront-ips.txt
similarity index 100%
rename from data/scanners/cloudfront-ips.txt
rename to data/collections/amazon/cloudfront-ips.txt
diff --git a/data/scanners/microsoft-email-servers.txt b/data/collections/microsoft/email-servers.txt
similarity index 100%
rename from data/scanners/microsoft-email-servers.txt
rename to data/collections/microsoft/email-servers.txt