remove microsoft-ads github-ads

use microsoft@ads github@ads instead

data/category-ads

@@ -22,7 +22,7 @@ include:kuaishou @ads
 include:kugou @ads
 include:le @ads
 include:meta @ads
-include:microsoft-ads
+include:microsoft @ads
 include:mihoyo @ads
 include:netease-ads
 include:ookla-speedtest-ads

data/github

@@ -1,4 +1,3 @@
-include:github-ads
 include:github-copilot
 include:npmjs
 
@@ -33,3 +32,7 @@ blob.core.windows.net
 full:github-api.arkoselabs.com
 full:github-cloud.s3.amazonaws.com
 regexp:^github-production-release-asset-[0-9a-zA-Z]{6}\.s3\.amazonaws\.com$
+
+# Ads/tracking
+collector.github.com @ads
+copilot-telemetry.githubusercontent.com @ads

data/github-ads

@@ -1,2 +0,0 @@
-collector.github.com @ads
-copilot-telemetry.githubusercontent.com @ads

data/microsoft

@@ -1,7 +1,6 @@
 include:azure
 include:bing
 include:github
-include:microsoft-ads
 include:microsoft-dev
 include:microsoft-pki
 include:msn
@@ -306,6 +305,12 @@ yammer.com
 skype-edf.akadns.net
 skypedata.akadns.net
 
+# Ads/tracking
+clarity.ms @ads
+microsoftads.com @ads
+msads.net @ads
+nelreports.net @ads
+
 # Domains and services below are available in China mainland
 # Use in config file like this: "geosite:microsoft@cn"
 dl.delivery.mp.microsoft.com @cn

data/microsoft-ads

@@ -1,8 +0,0 @@
-include:github-ads
-
-browser.events.data.msn.cn @ads
-browser.events.data.msn.com @ads
-clarity.ms @ads
-microsoftads.com @ads
-msads.net @ads
-nelreports.net @ads

data/msn

@@ -17,3 +17,7 @@ msnewskids.org
 msnkids.com
 microsoftstart.com
 start.com
+
+# Ads/tracking
+browser.events.data.msn.cn @ads @cn
+browser.events.data.msn.com @ads