diff --git a/data/17zuoye b/data/17zuoye
new file mode 100644
index 00000000..d46aa3c8
--- /dev/null
+++ b/data/17zuoye
@@ -0,0 +1,3 @@
+17zuoye.cn
+17zuoye.com
+17zuoye.net
diff --git a/data/applysquare b/data/applysquare
new file mode 100644
index 00000000..6226164d
--- /dev/null
+++ b/data/applysquare
@@ -0,0 +1,2 @@
+applysquare.com
+applysquare.net
diff --git a/data/category-education-cn b/data/category-education-cn
new file mode 100644
index 00000000..23345742
--- /dev/null
+++ b/data/category-education-cn
@@ -0,0 +1,28 @@
+include:17zuoye
+include:applysquare
+include:hujiang
+include:koolearn
+include:shanbay
+include:xueersi
+include:yuanfudao
+include:zhihuishu
+# 云校
+91yunxiao.com
+
+# 爱云校/好分数
+aiyunxiao.com
+haofenshu.com
+iyunxiao.com
+yunxiao.com
+
+# 课播云校
+keboyunxiao.com
+
+# 课堂派
+ketangpai.com
+
+# 批改网
+pigai.org
+
+# 未来云校
+weilaiyunxiao.com
diff --git a/data/geolocation-cn b/data/geolocation-cn
index 475f305c..81598d52 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -3,11 +3,6 @@
 # 123云盘
 123pan.com
 
-# 一起作业
-17zuoye.cn
-17zuoye.net
-17zuoye.com
-
 # Advertisment & Analytics
 include:jiguang
 include:umeng
@@ -190,20 +185,15 @@ include:wolai
 include:yinxiang
 include:zdns
 
-# Science & Technology & Knowledge & Scholar & Press & E-learning
+# Science & Technology & Knowledge & Scholar & Press & E-learning & Education
+include:category-education-cn
 include:category-mooc-cn
 include:category-scholar-cn
 include:category-wiki-cn
 include:cugbonline
 include:guokr
-include:hujiang
 include:ihuman
-include:koolearn
-include:shanbay
 include:wanfang
-include:xueersi
-include:yuanfudao
-include:zhihuishu
 
 # Social Media
 include:category-social-media-cn
@@ -441,7 +431,6 @@ suzuki-china.com # 铃木中国官网
 900.la
 917.com
 91danji.com
-91yunxiao.com
 95508.com
 9553.com
 962.net
@@ -467,7 +456,6 @@ airchangan.com
 airguilin.com
 aisee.tv # 粤ICP备10217959号-12
 aiskycn.com
-aiyunxiao.com
 aizhan.com
 aldwx.com # 京ICP备17030349号-1
 alittle-tea.com
@@ -822,7 +810,6 @@ iteye.com
 itjuzi.com
 itmop.com
 iyiou.com
-iyunxiao.com
 izuche.com
 jandan.net
 jb51.com
@@ -874,7 +861,6 @@ kankanews.com
 kantianqi.net
 kanzhun.com
 kaopu001.com
-keboyunxiao.com
 kejet.net
 kf5.com
 kimiss.com
@@ -1228,7 +1214,6 @@ webterren.com
 weicaifu.com
 weidian.com
 weilaicaijing.com
-weilaiyunxiao.com
 weiphone.net
 weixing.com
 weiyangx.com
@@ -1351,7 +1336,6 @@ yundun.com
 yunkanpan.com # 京ICP备15036006号-3
 yunqishi.net
 yunshipei.com
-yunxiao.com
 yunzhijia.com
 yupoo.com
 yuzua.com