diff --git a/data/amazon b/data/amazon
index b15c438c..a92c495e 100644
--- a/data/amazon
+++ b/data/amazon
@@ -1,18 +1,15 @@
 include:amazon-ads
+include:aws
+include:kindle
+include:primevideo
 include:wholefoodsmarket
 
-# All .aws domains
-aws
-
 # All .amazon domains
 amazon
 
 # All .imdb domains
 imdb
 
-# All .kindle domains
-kindle
-
 # All .アマゾン domains
 xn--cckwcxetd
 
@@ -120,87 +117,8 @@ alexa.com
 # Audible
 audible.com
 
-# AWS
-acmvalidations.com
-acmvalidationsaws.com
-aesworkshops.com
-amazonaws-china.com
-amazonaws.co.uk
-amazonaws.com
-amazonaws.tv
-amazonworkdocs.cn @cn
-amazonworkdocs.com
-amazonworkdocs.com.cn @cn
-amplifyapp.com
-amplifyframework.com
-aws-iot-hackathon.com
-awsautopilot.com
-awsautoscaling.com
-awsbraket.com
-awscommandlineinterface.com
-awsedstart.com
-awseducate.com
-awseducate.net
-awseducate.org
-awsloft-johannesburg.com
-awsloft-stockholm.com
-awssecworkshops.com
-awsstatic.com
-awsthinkbox.com
-awstrust.com
-cdkworkshop.com
-cloudfront.net
-containersonaws.com
-elasticbeanstalk.com
-thinkboxsoftware.com
-
-# AWS DNS
-regexp:.+\.awsdns-[0-9][0-9]\.co\.uk$
-regexp:.+\.awsdns-[0-9][0-9]\.com$
-regexp:.+\.awsdns-[0-9][0-9]\.net$
-regexp:.+\.awsdns-[0-9][0-9]\.org$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.biz$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.cn$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.com$
-regexp:.+\.awsdns-cn-[0-9][0-9]\.net$
-
 # CreateSpace
 createspace.com
 
-# Kindle
-kindle.cn @cn
-kindle.co.jp
-kindle.co.uk
-kindle.com
-kindle.de
-kindle.es
-kindle.fr
-kindle.in
-kindle.it
-kindle.jp
-kindleoasis.cn @cn
-kindleoasis.com
-kindleoasis.com.cn @cn
-kindleoasis.info
-kindleoasis.jp
-kindleoasis.org
-kindleoasis.us
-kindleoasisnews.com
-kindleproject.com
-
-# Prime Video
-aiv-cdn.net
-amazonprimevideo.cn @cn
-amazonprimevideo.com.cn @cn
-amazonprimevideos.com
-amazonvideo.cc
-amazonvideo.com
-prime-video.com
-primevideo.cc
-primevideo.com
-primevideo.info
-primevideo.org
-primevideo.tv
-
 full:images-cn.ssl-images-amazon.com @cn
 full:images-cn-8.ssl-images-amazon.com @cn
diff --git a/data/aws b/data/aws
new file mode 100644
index 00000000..350a05fd
--- /dev/null
+++ b/data/aws
@@ -0,0 +1,46 @@
+# All .aws domains
+aws
+
+# AWS
+acmvalidations.com
+acmvalidationsaws.com
+aesworkshops.com
+amazonaws-china.com
+amazonaws.co.uk
+amazonaws.com
+amazonaws.tv
+amazonworkdocs.cn @cn
+amazonworkdocs.com
+amazonworkdocs.com.cn @cn
+amplifyapp.com
+amplifyframework.com
+aws-iot-hackathon.com
+awsautopilot.com
+awsautoscaling.com
+awsbraket.com
+awscommandlineinterface.com
+awsedstart.com
+awseducate.com
+awseducate.net
+awseducate.org
+awsloft-johannesburg.com
+awsloft-stockholm.com
+awssecworkshops.com
+awsstatic.com
+awsthinkbox.com
+awstrust.com
+cdkworkshop.com
+cloudfront.net
+containersonaws.com
+elasticbeanstalk.com
+thinkboxsoftware.com
+
+# AWS DNS
+regexp:.+\.awsdns-[0-9][0-9]\.co\.uk$
+regexp:.+\.awsdns-[0-9][0-9]\.com$
+regexp:.+\.awsdns-[0-9][0-9]\.net$
+regexp:.+\.awsdns-[0-9][0-9]\.org$
+regexp:.+\.awsdns-cn-[0-9][0-9]\.biz$
+regexp:.+\.awsdns-cn-[0-9][0-9]\.cn$
+regexp:.+\.awsdns-cn-[0-9][0-9]\.com$
+regexp:.+\.awsdns-cn-[0-9][0-9]\.net$
\ No newline at end of file
diff --git a/data/kindle b/data/kindle
new file mode 100644
index 00000000..7338ba3e
--- /dev/null
+++ b/data/kindle
@@ -0,0 +1,23 @@
+# All .kindle domains
+kindle
+
+# Kindle
+kindle.cn @cn
+kindle.co.jp
+kindle.co.uk
+kindle.com
+kindle.de
+kindle.es
+kindle.fr
+kindle.in
+kindle.it
+kindle.jp
+kindleoasis.cn @cn
+kindleoasis.com
+kindleoasis.com.cn @cn
+kindleoasis.info
+kindleoasis.jp
+kindleoasis.org
+kindleoasis.us
+kindleoasisnews.com
+kindleproject.com
\ No newline at end of file
diff --git a/data/primevideo b/data/primevideo
new file mode 100644
index 00000000..35ead840
--- /dev/null
+++ b/data/primevideo
@@ -0,0 +1,13 @@
+# Prime Video
+aiv-cdn.net
+amazonprimevideo.cn @cn
+amazonprimevideo.com.cn @cn
+amazonprimevideos.com
+amazonvideo.cc
+amazonvideo.com
+prime-video.com
+primevideo.cc
+primevideo.com
+primevideo.info
+primevideo.org
+primevideo.tv
\ No newline at end of file