diff --git a/lib/domains/abused.txt b/lib/domains/abused.txt
index d835f1074a..5e8d016be2 100644
--- a/lib/domains/abused.txt
+++ b/lib/domains/abused.txt
@@ -73,7 +73,7 @@ student.concordia.ab.ca
 unb.ca
 uregina.ca
 workschool.ca
-yrdsb.ca
+gapps.yrdsb.ca
 unilu.ac.cd
 cf
 fh-htachur.ch
@@ -193,16 +193,8 @@ est.ups.edu.ec
 estudiantes.cordillera.edu.ec
 estudiantes.edu.ec
 indoamerica.edu.ec
-itb.edu.ec
-puce.edu.ec
-pucese.edu.ec
-uartes.edu.ec
-ucacue.edu.ec
 uce.edu.ec
-ucuenca.edu.ec
 unach.edu.ec
-uniandes.edu.ec
-uta.edu.ec
 utmachala.edu.ec
 aai.edu
 aaup.edu
@@ -215,7 +207,6 @@ alu.comillas.edu
 alumno.utesa.edu
 apus.edu
 atc.edu
-au.edu
 aub.edu
 aya.yale.edu
 azwestern.edu
@@ -300,8 +291,7 @@ lonestar.edu
 losrios.edu
 mail.broward.edu
 mail.davistech.edu
-mail.fresnostate.edu
-mail.irsc.edu
+fresnostate.edu
 mail.ltcc.edu
 mail.philau.edu
 mail.pima.edu
@@ -332,7 +322,6 @@ my.browncollege.edu
 my.canyons.edu
 my.ccri.edu
 my.chamberlain.edu
-my.chattanoogastate.edu
 my.chemeketa.edu
 my.cleveland.edu
 my.columbiasc.edu
@@ -576,7 +565,6 @@ mail.uca.es
 mail.ucv.es
 stu.colegiotorremalmuerta.es
 uma.es
-upm.es
 usal.es
 amu.edu.et
 haramaya.edu.et
@@ -1060,7 +1048,6 @@ student.riphah.edu.pk
 students.fui.edu.pk
 students.uettaxila.edu.pk
 uaf.edu.pk
-ucp.edu.pk
 uet.edu.pk
 uoh.edu.pk
 web.gcu.edu.pk
@@ -1378,4 +1365,47 @@ uem.edu.in
 uacj.mx
 stu.ocsb.ca
 um5.ac.ma
-fmu.edu.br
\ No newline at end of file
+fmu.edu.br
+wellesley.edu
+york.edu
+std.antalya.edu.tr
+student.hywoman.ac.kr
+yapenhasbekasi.sch.id
+cibertec.edu.pe
+singimail.rs
+edu.hanbat.ac.kr
+harding.edu
+ufpa.br
+kmutt.ac.th
+univ-dbkm.dz
+nuevoleon.tecnm.mx
+whistlingwoods.net
+alumnos.viu.es
+aiu.edu.eg
+idu.edu.tr
+mc-class.gr
+manipalacademyonline.edu.in
+wou.edu.my
+gsuite.bu.edu
+bu.edu
+tcdsb.ca
+uba.ar
+northweststate.edu
+exatec.tec.mx
+gator.uhd.edu
+uhd.edu
+my.csun.edu
+net.iul.edu.lb
+alunos.sc.senac.br
+kgu.ac.kr
+students.adu.ac.ae
+altinbas.edu.tr
+daejin.ac.kr
+studenti.uniba.it
+untumbes.edu.pe
+dharanboodhooschool.edu.mv
+fju.edu.tw
+cobatab.edu.mx
+jsspsdubai.com
+anyang.ac.kr
+itsc.edu.do
\ No newline at end of file
diff --git a/lib/domains/academy/mischok/tn.txt b/lib/domains/academy/mischok/tn.txt
new file mode 100644
index 0000000000..6740a0cc63
--- /dev/null
+++ b/lib/domains/academy/mischok/tn.txt
@@ -0,0 +1 @@
+Mischok Academy
\ No newline at end of file
diff --git a/lib/domains/ae/ac/cu.txt b/lib/domains/ae/ac/cu.txt
new file mode 100644
index 0000000000..1dad48f8d9
--- /dev/null
+++ b/lib/domains/ae/ac/cu.txt
@@ -0,0 +1,2 @@
+جامعة المدينة عجمان
+City University Ajman
\ No newline at end of file
diff --git a/lib/domains/ar/edu/eaf.txt b/lib/domains/ar/edu/eaf.txt
new file mode 100644
index 0000000000..f8652b0719
--- /dev/null
+++ b/lib/domains/ar/edu/eaf.txt
@@ -0,0 +1 @@
+Escuela Argentina de Fotografía
\ No newline at end of file
diff --git a/lib/domains/ar/edu/ifts18.txt b/lib/domains/ar/edu/ifts18.txt
new file mode 100644
index 0000000000..7dd5de9aa4
--- /dev/null
+++ b/lib/domains/ar/edu/ifts18.txt
@@ -0,0 +1 @@
+Instituto de Formación Técnica Superior N° 18
\ No newline at end of file
diff --git a/lib/domains/ar/edu/incade.txt b/lib/domains/ar/edu/incade.txt
new file mode 100644
index 0000000000..f933770b8e
--- /dev/null
+++ b/lib/domains/ar/edu/incade.txt
@@ -0,0 +1 @@
+Instituto de capacitación y desarrollo empresarial
diff --git a/lib/domains/ar/uba.txt b/lib/domains/ar/uba.txt
deleted file mode 100644
index 372981d8a4..0000000000
--- a/lib/domains/ar/uba.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad de Buenos Aires
\ No newline at end of file
diff --git a/lib/domains/au/edu/ee.txt b/lib/domains/au/edu/ee.txt
new file mode 100644
index 0000000000..8b075245d6
--- /dev/null
+++ b/lib/domains/au/edu/ee.txt
@@ -0,0 +1 @@
+ELITE EDUCATION 
diff --git a/lib/domains/au/edu/qld/icb.txt b/lib/domains/au/edu/qld/icb.txt
new file mode 100644
index 0000000000..98271801a6
--- /dev/null
+++ b/lib/domains/au/edu/qld/icb.txt
@@ -0,0 +1 @@
+Islamic College Of Brisbane
\ No newline at end of file
diff --git a/lib/domains/au/edu/vic/iona.txt b/lib/domains/au/edu/vic/iona.txt
new file mode 100644
index 0000000000..ffcd0cd7bc
--- /dev/null
+++ b/lib/domains/au/edu/vic/iona.txt
@@ -0,0 +1 @@
+Iona College Geelong
\ No newline at end of file
diff --git a/lib/domains/au/edu/vic/mthira.txt b/lib/domains/au/edu/vic/mthira.txt
new file mode 100644
index 0000000000..431d86b4d3
--- /dev/null
+++ b/lib/domains/au/edu/vic/mthira.txt
@@ -0,0 +1 @@
+Mount Hira College
\ No newline at end of file
diff --git a/lib/domains/au/edu/vic/stmichaels.txt b/lib/domains/au/edu/vic/stmichaels.txt
new file mode 100644
index 0000000000..f05258530f
--- /dev/null
+++ b/lib/domains/au/edu/vic/stmichaels.txt
@@ -0,0 +1 @@
+St Michael's Grammar School
diff --git a/lib/domains/bd/ac/baiust.txt b/lib/domains/bd/ac/baiust.txt
new file mode 100644
index 0000000000..520f0e852d
--- /dev/null
+++ b/lib/domains/bd/ac/baiust.txt
@@ -0,0 +1 @@
+Bangladesh Army International University of Science and Technology
\ No newline at end of file
diff --git a/lib/domains/bd/ac/cstu.txt b/lib/domains/bd/ac/cstu.txt
new file mode 100644
index 0000000000..19044adf70
--- /dev/null
+++ b/lib/domains/bd/ac/cstu.txt
@@ -0,0 +1,2 @@
+চাঁদপুর বিজ্ঞান ও প্রযুক্তি বিশ্ববিদ্যালয়
+Chandpur Science and Technology University
\ No newline at end of file
diff --git a/lib/domains/bd/ac/manarat.txt b/lib/domains/bd/ac/manarat.txt
new file mode 100644
index 0000000000..ec0fd663e2
--- /dev/null
+++ b/lib/domains/bd/ac/manarat.txt
@@ -0,0 +1 @@
+Manarat International University
\ No newline at end of file
diff --git a/lib/domains/bd/ac/prstu/cse.txt b/lib/domains/bd/ac/prstu/cse.txt
new file mode 100644
index 0000000000..15285b315e
--- /dev/null
+++ b/lib/domains/bd/ac/prstu/cse.txt
@@ -0,0 +1 @@
+Pirojpur Science and Technology University
\ No newline at end of file
diff --git a/lib/domains/bd/edu/chongowngirlshighschool.txt b/lib/domains/bd/edu/chongowngirlshighschool.txt
new file mode 100644
index 0000000000..66120e81c5
--- /dev/null
+++ b/lib/domains/bd/edu/chongowngirlshighschool.txt
@@ -0,0 +1 @@
+chongowngirlshighschool
\ No newline at end of file
diff --git a/lib/domains/bd/edu/dpsc.txt b/lib/domains/bd/edu/dpsc.txt
new file mode 100644
index 0000000000..2b44ea4c32
--- /dev/null
+++ b/lib/domains/bd/edu/dpsc.txt
@@ -0,0 +1,2 @@
+দাউদ পাবলিক স্কুল এন্ড কলেজ
+Daud Public School and College,Jashore Cantonment
\ No newline at end of file
diff --git a/lib/domains/be/gtil.txt b/lib/domains/be/gtil.txt
new file mode 100644
index 0000000000..09a2e1b1cd
--- /dev/null
+++ b/lib/domains/be/gtil.txt
@@ -0,0 +1,2 @@
+Gemeentelijk Technisch Instituut Londerzeel
+GTIL
diff --git a/lib/domains/br/bomjesus/mail.txt b/lib/domains/br/bomjesus/mail.txt
new file mode 100644
index 0000000000..2f92c25cff
--- /dev/null
+++ b/lib/domains/br/bomjesus/mail.txt
@@ -0,0 +1 @@
+Bom Jesus Carlos Démia
\ No newline at end of file
diff --git a/lib/domains/br/edu/catolica-to/a.txt b/lib/domains/br/edu/catolica-to/a.txt
new file mode 100644
index 0000000000..08e3a7e355
--- /dev/null
+++ b/lib/domains/br/edu/catolica-to/a.txt
@@ -0,0 +1 @@
+Centro Universitário Católica do Tocantins: UniCatólica
diff --git a/lib/domains/br/edu/umfg.txt b/lib/domains/br/edu/umfg.txt
new file mode 100644
index 0000000000..5e49af99fd
--- /dev/null
+++ b/lib/domains/br/edu/umfg.txt
@@ -0,0 +1 @@
+Faculdade UMFG
diff --git a/lib/domains/br/edu/unigoyazes.txt b/lib/domains/br/edu/unigoyazes.txt
new file mode 100644
index 0000000000..4e2ab86cbd
--- /dev/null
+++ b/lib/domains/br/edu/unigoyazes.txt
@@ -0,0 +1,2 @@
+Centro Universitário Goyazes
+UniGoyazes
diff --git a/lib/domains/br/org/impatech.txt b/lib/domains/br/org/impatech.txt
new file mode 100644
index 0000000000..89d9cd5e95
--- /dev/null
+++ b/lib/domains/br/org/impatech.txt
@@ -0,0 +1 @@
+IMPA Tech
diff --git a/lib/domains/br/ufpa.txt b/lib/domains/br/ufpa.txt
deleted file mode 100644
index e415ea133c..0000000000
--- a/lib/domains/br/ufpa.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidade Federal do Pará
diff --git a/lib/domains/br/unicamp.txt b/lib/domains/br/unicamp.txt
index a8afde54d7..93e1ea2d5c 100644
--- a/lib/domains/br/unicamp.txt
+++ b/lib/domains/br/unicamp.txt
@@ -1 +1,3 @@
 Unicamp
+Universidade Estadual de Campinas
+Campinas State University
diff --git a/lib/domains/bzh/assomption.txt b/lib/domains/bzh/assomption.txt
new file mode 100644
index 0000000000..4273dc29dc
--- /dev/null
+++ b/lib/domains/bzh/assomption.txt
@@ -0,0 +1,2 @@
+Collège, Lycée, Prépa Assomption
+Lycée Assomption
diff --git a/lib/domains/ca/citicollege.txt b/lib/domains/ca/citicollege.txt
new file mode 100644
index 0000000000..6265624197
--- /dev/null
+++ b/lib/domains/ca/citicollege.txt
@@ -0,0 +1,2 @@
+CITI COLLEGE
+CITI COLLEGE
\ No newline at end of file
diff --git a/lib/domains/ca/qc/college-montreal/educ.txt b/lib/domains/ca/qc/college-montreal/educ.txt
new file mode 100644
index 0000000000..9d3084eff4
--- /dev/null
+++ b/lib/domains/ca/qc/college-montreal/educ.txt
@@ -0,0 +1 @@
+Collège de Montréal
\ No newline at end of file
diff --git a/lib/domains/ca/tcdsb.txt b/lib/domains/ca/tcdsb.txt
deleted file mode 100644
index 8e00791110..0000000000
--- a/lib/domains/ca/tcdsb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Toronto Catholic District School Board
diff --git a/lib/domains/ch/santiskurs.txt b/lib/domains/ch/santiskurs.txt
new file mode 100644
index 0000000000..57a6f9539b
--- /dev/null
+++ b/lib/domains/ch/santiskurs.txt
@@ -0,0 +1 @@
+SANTIS Training AG
diff --git a/lib/domains/ch/santismail.txt b/lib/domains/ch/santismail.txt
new file mode 100644
index 0000000000..57a6f9539b
--- /dev/null
+++ b/lib/domains/ch/santismail.txt
@@ -0,0 +1 @@
+SANTIS Training AG
diff --git a/lib/domains/cn/thisdl.txt b/lib/domains/cn/thisdl.txt
new file mode 100644
index 0000000000..da9b58b471
--- /dev/null
+++ b/lib/domains/cn/thisdl.txt
@@ -0,0 +1 @@
+北京稻香湖学校
diff --git a/lib/domains/co/edu/udes.txt b/lib/domains/co/edu/udes.txt
new file mode 100644
index 0000000000..c051a5a591
--- /dev/null
+++ b/lib/domains/co/edu/udes.txt
@@ -0,0 +1 @@
+universidad de Santander
\ No newline at end of file
diff --git a/lib/domains/com/42malaga.txt b/lib/domains/com/42malaga.txt
new file mode 100644
index 0000000000..bc85cf6741
--- /dev/null
+++ b/lib/domains/com/42malaga.txt
@@ -0,0 +1 @@
+42 Málaga
diff --git a/lib/domains/com/gitjaipur.txt b/lib/domains/com/gitjaipur.txt
new file mode 100644
index 0000000000..0372e56bb2
--- /dev/null
+++ b/lib/domains/com/gitjaipur.txt
@@ -0,0 +1 @@
+Global Institute of Technology, Jaipur
\ No newline at end of file
diff --git a/lib/domains/com/onmicrosoft/acledaaib.txt b/lib/domains/com/onmicrosoft/acledaaib.txt
new file mode 100644
index 0000000000..4ccdd9e3ab
--- /dev/null
+++ b/lib/domains/com/onmicrosoft/acledaaib.txt
@@ -0,0 +1 @@
+Acleda University of Business
\ No newline at end of file
diff --git a/lib/domains/com/onmicrosoft/hhbkde.txt b/lib/domains/com/onmicrosoft/hhbkde.txt
new file mode 100644
index 0000000000..6b3e72e129
--- /dev/null
+++ b/lib/domains/com/onmicrosoft/hhbkde.txt
@@ -0,0 +1 @@
+Heinrich-Hertz-Berufskolleg Düsseldorf
\ No newline at end of file
diff --git a/lib/domains/com/onmicrosoft/valeovil.txt b/lib/domains/com/onmicrosoft/valeovil.txt
new file mode 100644
index 0000000000..2cd406e3ba
--- /dev/null
+++ b/lib/domains/com/onmicrosoft/valeovil.txt
@@ -0,0 +1 @@
+Agrupamento de Escolas de Vale de Ovil, Baião
diff --git a/lib/domains/com/onmicrosoft/zespolszkolmechanicznyche.txt b/lib/domains/com/onmicrosoft/zespolszkolmechanicznyche.txt
new file mode 100644
index 0000000000..ee35f655ca
--- /dev/null
+++ b/lib/domains/com/onmicrosoft/zespolszkolmechanicznyche.txt
@@ -0,0 +1 @@
+Zespol Szkol Mechanicznych Nr 3
diff --git a/lib/domains/cy/ac/euc/students.txt b/lib/domains/cy/ac/euc.txt
similarity index 100%
rename from lib/domains/cy/ac/euc/students.txt
rename to lib/domains/cy/ac/euc.txt
diff --git a/lib/domains/cz/vitkovickastrendni.txt b/lib/domains/cz/vitkovickastrendni.txt
new file mode 100644
index 0000000000..4ba0fdba1d
--- /dev/null
+++ b/lib/domains/cz/vitkovickastrendni.txt
@@ -0,0 +1 @@
+VÍTKOVICKÁ STŘEDNÍ PRŮMYSLOVÁ ŠKOLA
\ No newline at end of file
diff --git a/lib/domains/de/eichendorff-gymnasium.txt b/lib/domains/de/eichendorff-gymnasium.txt
new file mode 100644
index 0000000000..5d30539054
--- /dev/null
+++ b/lib/domains/de/eichendorff-gymnasium.txt
@@ -0,0 +1 @@
+Eichendorff Gymnasium Ettlingen
diff --git a/lib/domains/de/hg-gladbeck.txt b/lib/domains/de/hg-gladbeck.txt
new file mode 100644
index 0000000000..efc145e908
--- /dev/null
+++ b/lib/domains/de/hg-gladbeck.txt
@@ -0,0 +1 @@
+Heisenberg Gymnasium
\ No newline at end of file
diff --git a/lib/domains/de/iservigs-embsen.txt b/lib/domains/de/iservigs-embsen.txt
new file mode 100644
index 0000000000..6910f90626
--- /dev/null
+++ b/lib/domains/de/iservigs-embsen.txt
@@ -0,0 +1 @@
+IGS Embsen
\ No newline at end of file
diff --git a/lib/domains/de/log-web.txt b/lib/domains/de/log-web.txt
new file mode 100644
index 0000000000..d2bc5c1d31
--- /dev/null
+++ b/lib/domains/de/log-web.txt
@@ -0,0 +1 @@
+Lichtenberg-Oberstufen-Gymnasium Bruchköbel
diff --git a/lib/domains/de/mcleon.txt b/lib/domains/de/mcleon.txt
new file mode 100644
index 0000000000..bdfac3c126
--- /dev/null
+++ b/lib/domains/de/mcleon.txt
@@ -0,0 +1 @@
+McLeon International Institute of Technology and Business
\ No newline at end of file
diff --git a/lib/domains/de/mlg-bad.txt b/lib/domains/de/mlg-bad.txt
new file mode 100644
index 0000000000..551d6f89ef
--- /dev/null
+++ b/lib/domains/de/mlg-bad.txt
@@ -0,0 +1 @@
+Markgraf-Ludwig-Gymnasium Baden-Baden
\ No newline at end of file
diff --git a/lib/domains/de/pertha.txt b/lib/domains/de/pertha.txt
new file mode 100644
index 0000000000..b649d4fba0
--- /dev/null
+++ b/lib/domains/de/pertha.txt
@@ -0,0 +1,2 @@
+Pertha Universität
+Pertha University
diff --git a/lib/domains/dk/vejle/skole.txt b/lib/domains/dk/vejle/skole.txt
new file mode 100644
index 0000000000..d375384bc6
--- /dev/null
+++ b/lib/domains/dk/vejle/skole.txt
@@ -0,0 +1 @@
+Thyregod skole
\ No newline at end of file
diff --git a/lib/domains/do/edu/itsc.txt b/lib/domains/do/edu/itsc.txt
deleted file mode 100644
index dfd028d9e1..0000000000
--- a/lib/domains/do/edu/itsc.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Instituto Técnico Superior Comunitario
-Community Higher Technical Institute
\ No newline at end of file
diff --git a/lib/domains/dz/enset-skikda.txt b/lib/domains/dz/enset-skikda.txt
new file mode 100644
index 0000000000..413fa5ac90
--- /dev/null
+++ b/lib/domains/dz/enset-skikda.txt
@@ -0,0 +1 @@
+ENSET SKIKDA
\ No newline at end of file
diff --git a/lib/domains/dz/univ-dbkm.txt b/lib/domains/dz/univ-dbkm.txt
index 5061c71eca..81b979f245 100644
--- a/lib/domains/dz/univ-dbkm.txt
+++ b/lib/domains/dz/univ-dbkm.txt
@@ -1 +1 @@
-Université de khemis miliana
+Djilali Bounaama University of Khemis Miliana
\ No newline at end of file
diff --git a/lib/domains/dz/univ-djelfa/mail.txt b/lib/domains/dz/univ-djelfa/mail.txt
new file mode 100644
index 0000000000..141b848b9b
--- /dev/null
+++ b/lib/domains/dz/univ-djelfa/mail.txt
@@ -0,0 +1,2 @@
+Ziane Achour University of Djelfa
+Ziane Achour University of Djelfa
\ No newline at end of file
diff --git a/lib/domains/ec/edu/istcarloscisneros.txt b/lib/domains/ec/edu/istcarloscisneros.txt
new file mode 100644
index 0000000000..69dfd7e21a
--- /dev/null
+++ b/lib/domains/ec/edu/istcarloscisneros.txt
@@ -0,0 +1 @@
+Instituto Superior Tecnológico Carlos Cisneros
\ No newline at end of file
diff --git a/lib/domains/ec/edu/ucacue.txt b/lib/domains/ec/edu/ucacue.txt
new file mode 100644
index 0000000000..7d9ce7d6f7
--- /dev/null
+++ b/lib/domains/ec/edu/ucacue.txt
@@ -0,0 +1 @@
+UNIVERSIDAD CATOLICA DE CUENCA
\ No newline at end of file
diff --git a/lib/domains/ec/edu/uta.txt b/lib/domains/ec/edu/uta.txt
new file mode 100644
index 0000000000..fc34b70bdb
--- /dev/null
+++ b/lib/domains/ec/edu/uta.txt
@@ -0,0 +1 @@
+Universidad Técnica de Ambato
\ No newline at end of file
diff --git a/lib/domains/edu/Roberts.txt b/lib/domains/edu/Roberts.txt
new file mode 100644
index 0000000000..bc49a743f3
--- /dev/null
+++ b/lib/domains/edu/Roberts.txt
@@ -0,0 +1 @@
+Roberts Wesleyan University
diff --git a/lib/domains/edu/WalshCollege.txt b/lib/domains/edu/WalshCollege.txt
new file mode 100644
index 0000000000..a7a57bf413
--- /dev/null
+++ b/lib/domains/edu/WalshCollege.txt
@@ -0,0 +1,3 @@
+Walsh College,
+3838 Livernois Rd., Troy, MI 48083
+1-800-WALSH-01
\ No newline at end of file
diff --git a/lib/domains/edu/aie.txt b/lib/domains/edu/aie.txt
new file mode 100644
index 0000000000..8f8571dd63
--- /dev/null
+++ b/lib/domains/edu/aie.txt
@@ -0,0 +1 @@
+Academy of Interactive Entertainment
\ No newline at end of file
diff --git a/lib/domains/edu/bu.txt b/lib/domains/edu/bu.txt
deleted file mode 100644
index c002159e95..0000000000
--- a/lib/domains/edu/bu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Boston University
diff --git a/lib/domains/edu/buffalostate.txt b/lib/domains/edu/buffalostate.txt
new file mode 100644
index 0000000000..9b30e5575d
--- /dev/null
+++ b/lib/domains/edu/buffalostate.txt
@@ -0,0 +1 @@
+Buffalo State University
\ No newline at end of file
diff --git a/lib/domains/edu/cecil.txt b/lib/domains/edu/cecil.txt
new file mode 100644
index 0000000000..8066b12dfe
--- /dev/null
+++ b/lib/domains/edu/cecil.txt
@@ -0,0 +1,2 @@
+Cecil College
+Cecil College
\ No newline at end of file
diff --git a/lib/domains/edu/centralmethodist.txt b/lib/domains/edu/centralmethodist.txt
new file mode 100644
index 0000000000..087736b201
--- /dev/null
+++ b/lib/domains/edu/centralmethodist.txt
@@ -0,0 +1 @@
+central methodist university
diff --git a/lib/domains/edu/chattanoogastate.txt b/lib/domains/edu/chattanoogastate.txt
new file mode 100644
index 0000000000..3d9260f591
--- /dev/null
+++ b/lib/domains/edu/chattanoogastate.txt
@@ -0,0 +1 @@
+Chattanooga State Community College
\ No newline at end of file
diff --git a/lib/domains/edu/clovis.txt b/lib/domains/edu/clovis.txt
new file mode 100644
index 0000000000..4c033b1bba
--- /dev/null
+++ b/lib/domains/edu/clovis.txt
@@ -0,0 +1 @@
+Clovis Community College
\ No newline at end of file
diff --git a/lib/domains/edu/fdtc/student.txt b/lib/domains/edu/fdtc/student.txt
new file mode 100644
index 0000000000..d6ab99f861
--- /dev/null
+++ b/lib/domains/edu/fdtc/student.txt
@@ -0,0 +1 @@
+Florence Darlington Technical College
\ No newline at end of file
diff --git a/lib/domains/edu/fresnostate.txt b/lib/domains/edu/fresnostate.txt
deleted file mode 100644
index 27f207c12a..0000000000
--- a/lib/domains/edu/fresnostate.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-California State University, Fresno
-
-URL for university official website:
-https://www.fresnostate.edu/index.html
-
-URL for long-term IT related course:
-https://csm.fresnostate.edu/csci/index.html
-
-URL for mail.fresnostate.edu as official email domain for enrolled students:
-https://academics.fresnostate.edu/canvas/index.html
diff --git a/lib/domains/edu/fvi.txt b/lib/domains/edu/fvi.txt
new file mode 100644
index 0000000000..ee4259eb02
--- /dev/null
+++ b/lib/domains/edu/fvi.txt
@@ -0,0 +1 @@
+FVI School of Nursing and Technology
\ No newline at end of file
diff --git a/lib/domains/edu/geisinger.txt b/lib/domains/edu/geisinger.txt
new file mode 100644
index 0000000000..51d3df23b5
--- /dev/null
+++ b/lib/domains/edu/geisinger.txt
@@ -0,0 +1,2 @@
+Geisinger College of Health Sciences
+Scranton, PA, United States of America
diff --git a/lib/domains/edu/hec.txt b/lib/domains/edu/hec.txt
new file mode 100644
index 0000000000..cae0cf87a6
--- /dev/null
+++ b/lib/domains/edu/hec.txt
@@ -0,0 +1,2 @@
+HEC Paris
+HEC
\ No newline at end of file
diff --git a/lib/domains/edu/ied.txt b/lib/domains/edu/ied.txt
new file mode 100644
index 0000000000..db1a6a3ca0
--- /dev/null
+++ b/lib/domains/edu/ied.txt
@@ -0,0 +1 @@
+IED - Istituto Europeo di Design
\ No newline at end of file
diff --git a/lib/domains/edu/lumcon.txt b/lib/domains/edu/lumcon.txt
new file mode 100644
index 0000000000..c9f71972f3
--- /dev/null
+++ b/lib/domains/edu/lumcon.txt
@@ -0,0 +1 @@
+Louisiana Universities Marine Consortium
\ No newline at end of file
diff --git a/lib/domains/edu/mandl/online.txt b/lib/domains/edu/mandl/online.txt
new file mode 100644
index 0000000000..943bd29748
--- /dev/null
+++ b/lib/domains/edu/mandl/online.txt
@@ -0,0 +1 @@
+Mandl School
\ No newline at end of file
diff --git a/lib/domains/edu/monmouthcollege.txt b/lib/domains/edu/monmouthcollege.txt
new file mode 100644
index 0000000000..1634e6218e
--- /dev/null
+++ b/lib/domains/edu/monmouthcollege.txt
@@ -0,0 +1 @@
+Monmouth College
\ No newline at end of file
diff --git a/lib/domains/edu/mwcc.txt b/lib/domains/edu/mwcc.txt
new file mode 100644
index 0000000000..a835c937a9
--- /dev/null
+++ b/lib/domains/edu/mwcc.txt
@@ -0,0 +1 @@
+Mount Wachusett Community College
\ No newline at end of file
diff --git a/lib/domains/edu/nhcc.txt b/lib/domains/edu/nhcc.txt
new file mode 100644
index 0000000000..5a2f98c7a9
--- /dev/null
+++ b/lib/domains/edu/nhcc.txt
@@ -0,0 +1,2 @@
+North Hennepin Community College
+North Hennepin Community College
diff --git a/lib/domains/edu/northweststate/students.txt b/lib/domains/edu/northweststate/students.txt
deleted file mode 100644
index 243adfc000..0000000000
--- a/lib/domains/edu/northweststate/students.txt
+++ /dev/null
@@ -1 +0,0 @@
-Northwest State Community College
\ No newline at end of file
diff --git a/lib/domains/edu/ossm.txt b/lib/domains/edu/ossm.txt
new file mode 100644
index 0000000000..861c127a85
--- /dev/null
+++ b/lib/domains/edu/ossm.txt
@@ -0,0 +1 @@
+Oklahoma School of Science and Mathematics
\ No newline at end of file
diff --git a/lib/domains/edu/osumc.txt b/lib/domains/edu/osumc.txt
new file mode 100644
index 0000000000..8a9c1d84b6
--- /dev/null
+++ b/lib/domains/edu/osumc.txt
@@ -0,0 +1 @@
+Ohio state university - college of medicine
diff --git a/lib/domains/edu/pencol.txt b/lib/domains/edu/pencol.txt
new file mode 100644
index 0000000000..e3c6fb8b7d
--- /dev/null
+++ b/lib/domains/edu/pencol.txt
@@ -0,0 +1 @@
+Peninsula College
\ No newline at end of file
diff --git a/lib/domains/edu/pointpark.txt b/lib/domains/edu/pointpark.txt
new file mode 100644
index 0000000000..39faa1573c
--- /dev/null
+++ b/lib/domains/edu/pointpark.txt
@@ -0,0 +1 @@
+Point Park University
\ No newline at end of file
diff --git a/lib/domains/edu/redwoods/mycr.txt b/lib/domains/edu/redwoods/mycr.txt
new file mode 100644
index 0000000000..12f2cbaaeb
--- /dev/null
+++ b/lib/domains/edu/redwoods/mycr.txt
@@ -0,0 +1 @@
+mycr.redwoods.edu
diff --git a/lib/domains/edu/rvu.txt b/lib/domains/edu/rvu.txt
new file mode 100644
index 0000000000..96f1cf7f12
--- /dev/null
+++ b/lib/domains/edu/rvu.txt
@@ -0,0 +1 @@
+Rocky Vista University
\ No newline at end of file
diff --git a/lib/domains/edu/uaptc.txt b/lib/domains/edu/uaptc.txt
new file mode 100644
index 0000000000..2dab255547
--- /dev/null
+++ b/lib/domains/edu/uaptc.txt
@@ -0,0 +1 @@
+University of Arkansas – Pulaski Technical College
\ No newline at end of file
diff --git a/lib/domains/edu/uhd/gator.txt b/lib/domains/edu/uhd/gator.txt
deleted file mode 100644
index b86383a5aa..0000000000
--- a/lib/domains/edu/uhd/gator.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Houston-Downtown
\ No newline at end of file
diff --git a/lib/domains/edu/unam/ingenieria.txt b/lib/domains/edu/unam/ingenieria.txt
new file mode 100644
index 0000000000..31a9269094
--- /dev/null
+++ b/lib/domains/edu/unam/ingenieria.txt
@@ -0,0 +1 @@
+Universidad Nacional Autónoma de México
\ No newline at end of file
diff --git a/lib/domains/edu/wellesley.txt b/lib/domains/edu/wellesley.txt
deleted file mode 100644
index 46813d9e5f..0000000000
--- a/lib/domains/edu/wellesley.txt
+++ /dev/null
@@ -1 +0,0 @@
-Wellesley College
\ No newline at end of file
diff --git a/lib/domains/edu/wheaton.txt b/lib/domains/edu/wheaton.txt
new file mode 100644
index 0000000000..95d2cbfc3f
--- /dev/null
+++ b/lib/domains/edu/wheaton.txt
@@ -0,0 +1 @@
+Wheaton College, IL
\ No newline at end of file
diff --git a/lib/domains/eg/edu/aiu.txt b/lib/domains/eg/edu/aiu.txt
deleted file mode 100644
index bd76b6dd53..0000000000
--- a/lib/domains/eg/edu/aiu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Alamein International University
-جامعة العلمين الدولية
diff --git a/lib/domains/es/cnic.txt b/lib/domains/es/cnic.txt
new file mode 100644
index 0000000000..83d4601093
--- /dev/null
+++ b/lib/domains/es/cnic.txt
@@ -0,0 +1,2 @@
+Spanish National Center For Cardiovascular Research 
+CNIC
diff --git a/lib/domains/es/formacionchios.txt b/lib/domains/es/formacionchios.txt
new file mode 100644
index 0000000000..57775bfe09
--- /dev/null
+++ b/lib/domains/es/formacionchios.txt
@@ -0,0 +1 @@
+Chios Formacion
\ No newline at end of file
diff --git a/lib/domains/es/iac.txt b/lib/domains/es/iac.txt
new file mode 100644
index 0000000000..56c7746b47
--- /dev/null
+++ b/lib/domains/es/iac.txt
@@ -0,0 +1 @@
+Instituto de Astrofísica de Canarias
\ No newline at end of file
diff --git a/lib/domains/es/upm.txt b/lib/domains/es/upm.txt
new file mode 100644
index 0000000000..4b655155aa
--- /dev/null
+++ b/lib/domains/es/upm.txt
@@ -0,0 +1,2 @@
+Universidad Politécnica de Madrid
+Technical University of Madrid
diff --git a/lib/domains/es/viu/alumnos.txt b/lib/domains/es/viu/alumnos.txt
deleted file mode 100644
index 6f77da54bc..0000000000
--- a/lib/domains/es/viu/alumnos.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-VIU Universidad Internacional de Valencia
-Valencian International University
\ No newline at end of file
diff --git a/lib/domains/eu/bbs-alfeld.txt b/lib/domains/eu/bbs-alfeld.txt
new file mode 100644
index 0000000000..1131bda866
--- /dev/null
+++ b/lib/domains/eu/bbs-alfeld.txt
@@ -0,0 +1 @@
+BBS Alfeld
\ No newline at end of file
diff --git a/lib/domains/eus/uhei.txt b/lib/domains/eus/uhei.txt
new file mode 100644
index 0000000000..5717481ef2
--- /dev/null
+++ b/lib/domains/eus/uhei.txt
@@ -0,0 +1 @@
+UHEI UVED
\ No newline at end of file
diff --git a/lib/domains/fr/06/18.txt b/lib/domains/fr/06/18.txt
new file mode 100644
index 0000000000..5ff5347f31
--- /dev/null
+++ b/lib/domains/fr/06/18.txt
@@ -0,0 +1 @@
+École 18.06
diff --git a/lib/domains/fr/adatechschool.txt b/lib/domains/fr/adatechschool.txt
new file mode 100644
index 0000000000..3005c8f2a4
--- /dev/null
+++ b/lib/domains/fr/adatechschool.txt
@@ -0,0 +1 @@
+Ada Tech School
diff --git a/lib/domains/fr/berlyn.txt b/lib/domains/fr/berlyn.txt
new file mode 100644
index 0000000000..37a47c6a7f
--- /dev/null
+++ b/lib/domains/fr/berlyn.txt
@@ -0,0 +1 @@
+Berlyn International Academy
diff --git a/lib/domains/fr/brgm.txt b/lib/domains/fr/brgm.txt
new file mode 100644
index 0000000000..bffb4a7013
--- /dev/null
+++ b/lib/domains/fr/brgm.txt
@@ -0,0 +1,2 @@
+BRGM, Service Géologique National
+French Geological Survey
\ No newline at end of file
diff --git a/lib/domains/fr/epid-vauban.txt b/lib/domains/fr/epid-vauban.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/domains/fr/lasalle63.txt b/lib/domains/fr/lasalle63.txt
new file mode 100644
index 0000000000..8d84ebef06
--- /dev/null
+++ b/lib/domains/fr/lasalle63.txt
@@ -0,0 +1 @@
+Lasalle Clermont
\ No newline at end of file
diff --git a/lib/domains/fr/saintmichelannecy.txt b/lib/domains/fr/saintmichelannecy.txt
new file mode 100644
index 0000000000..354b6b9a9f
--- /dev/null
+++ b/lib/domains/fr/saintmichelannecy.txt
@@ -0,0 +1 @@
+UFA Saint Michel
\ No newline at end of file
diff --git a/lib/domains/gh/edu/accramet.txt b/lib/domains/gh/edu/accramet.txt
new file mode 100644
index 0000000000..827a2e8451
--- /dev/null
+++ b/lib/domains/gh/edu/accramet.txt
@@ -0,0 +1 @@
+Accra Metropolitan University
\ No newline at end of file
diff --git a/lib/domains/gr/mc-class.txt b/lib/domains/gr/mc-class.txt
deleted file mode 100644
index d050a46072..0000000000
--- a/lib/domains/gr/mc-class.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mediterranean College
diff --git a/lib/domains/hu/dng-bp.txt b/lib/domains/hu/dng-bp.txt
new file mode 100644
index 0000000000..c161b897bc
--- /dev/null
+++ b/lib/domains/hu/dng-bp.txt
@@ -0,0 +1 @@
+Német Nemzetiségi Gimnázium és Kollégium
\ No newline at end of file
diff --git a/lib/domains/hu/jedlik.txt b/lib/domains/hu/jedlik.txt
new file mode 100644
index 0000000000..0cbbf2c145
--- /dev/null
+++ b/lib/domains/hu/jedlik.txt
@@ -0,0 +1 @@
+Jedlik Ányos Gimnázium
diff --git a/lib/domains/id/ac/polibatam.txt b/lib/domains/id/ac/polibatam.txt
new file mode 100644
index 0000000000..ae0edb2671
--- /dev/null
+++ b/lib/domains/id/ac/polibatam.txt
@@ -0,0 +1,2 @@
+Politeknik Negeri Batam
+Batam State Polytechnic
\ No newline at end of file
diff --git a/lib/domains/id/ac/uby/mail.txt b/lib/domains/id/ac/uby/mail.txt
new file mode 100644
index 0000000000..0249962fae
--- /dev/null
+++ b/lib/domains/id/ac/uby/mail.txt
@@ -0,0 +1 @@
+Universitas Boyolali
\ No newline at end of file
diff --git a/lib/domains/id/sch/ibnutaimiyah.txt b/lib/domains/id/sch/ibnutaimiyah.txt
new file mode 100644
index 0000000000..229c1a9062
--- /dev/null
+++ b/lib/domains/id/sch/ibnutaimiyah.txt
@@ -0,0 +1,2 @@
+Pondok Pesantren Ibnu Taimiyah
+Pondok Pesantren Ibnu Taimiyah
\ No newline at end of file
diff --git a/lib/domains/id/sch/yapenhasbekasi.txt b/lib/domains/id/sch/yapenhasbekasi.txt
deleted file mode 100644
index 9ad4ccb408..0000000000
--- a/lib/domains/id/sch/yapenhasbekasi.txt
+++ /dev/null
@@ -1 +0,0 @@
-SMK YAPENHAS BEKASI
\ No newline at end of file
diff --git a/lib/domains/ie/ballinrobecs.txt b/lib/domains/ie/ballinrobecs.txt
new file mode 100644
index 0000000000..8e601242aa
--- /dev/null
+++ b/lib/domains/ie/ballinrobecs.txt
@@ -0,0 +1 @@
+Ballinrobe Community School
\ No newline at end of file
diff --git a/lib/domains/in/co/wmoenglishacademy.txt b/lib/domains/in/co/wmoenglishacademy.txt
deleted file mode 100644
index c086c1c12c..0000000000
--- a/lib/domains/in/co/wmoenglishacademy.txt
+++ /dev/null
@@ -1 +0,0 @@
-WMO english academy
\ No newline at end of file
diff --git a/lib/domains/iq/edu/mtu.txt b/lib/domains/iq/edu/mtu.txt
new file mode 100644
index 0000000000..a3efbb79cd
--- /dev/null
+++ b/lib/domains/iq/edu/mtu.txt
@@ -0,0 +1,2 @@
+الكلية التقنية الوسطى
+Middle Technical University
\ No newline at end of file
diff --git a/lib/domains/it/edu/ferrarismolfetta.txt b/lib/domains/it/edu/ferrarismolfetta.txt
new file mode 100644
index 0000000000..8d079f5491
--- /dev/null
+++ b/lib/domains/it/edu/ferrarismolfetta.txt
@@ -0,0 +1 @@
+ITIS Ferraris Molfetta
\ No newline at end of file
diff --git a/lib/domains/it/edu/icscarlofontana.txt b/lib/domains/it/edu/icscarlofontana.txt
new file mode 100644
index 0000000000..f0d194565d
--- /dev/null
+++ b/lib/domains/it/edu/icscarlofontana.txt
@@ -0,0 +1 @@
+ICS - CARLO FONTANA
\ No newline at end of file
diff --git a/lib/domains/it/edu/liceoartisticomannucci.txt b/lib/domains/it/edu/liceoartisticomannucci.txt
new file mode 100644
index 0000000000..321c486db3
--- /dev/null
+++ b/lib/domains/it/edu/liceoartisticomannucci.txt
@@ -0,0 +1 @@
+Liceo artistico "Edgardo Mannucci"
\ No newline at end of file
diff --git a/lib/domains/it/edu/liceogenoino.txt b/lib/domains/it/edu/liceogenoino.txt
new file mode 100644
index 0000000000..c9b8403de3
--- /dev/null
+++ b/lib/domains/it/edu/liceogenoino.txt
@@ -0,0 +1 @@
+Liceo Scientifico A. Genoino
diff --git a/lib/domains/jp/wasedasaga/edu.txt b/lib/domains/jp/wasedasaga/edu.txt
new file mode 100644
index 0000000000..692e73543a
--- /dev/null
+++ b/lib/domains/jp/wasedasaga/edu.txt
@@ -0,0 +1,2 @@
+早稲田佐賀中学校・高等学校
+Waseda Saga Junior and Senior High School
diff --git a/lib/domains/kg/edu/goldman.txt b/lib/domains/kg/edu/goldman.txt
new file mode 100644
index 0000000000..907a8e0ff1
--- /dev/null
+++ b/lib/domains/kg/edu/goldman.txt
@@ -0,0 +1 @@
+Goldman Institute of Economics and Finance
diff --git a/lib/domains/kg/edu/pc.txt b/lib/domains/kg/edu/pc.txt
new file mode 100644
index 0000000000..60a179d215
--- /dev/null
+++ b/lib/domains/kg/edu/pc.txt
@@ -0,0 +1,2 @@
+Политехнический колледж Международного Университета Кыргызстана
+Polytechnic College of the International University of Kyrgyzstan
diff --git a/lib/domains/kr/ac/anyang.txt b/lib/domains/kr/ac/anyang.txt
deleted file mode 100644
index e2c82621b6..0000000000
--- a/lib/domains/kr/ac/anyang.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-안양대학교
-Anyang University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/anyang/gs.txt b/lib/domains/kr/ac/anyang/gs.txt
deleted file mode 100644
index f9e197b132..0000000000
--- a/lib/domains/kr/ac/anyang/gs.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-안양대학교
-Anyang University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/daejin.txt b/lib/domains/kr/ac/daejin.txt
deleted file mode 100644
index 50d3d5c54a..0000000000
--- a/lib/domains/kr/ac/daejin.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-대진대학교
-Daejin University
diff --git a/lib/domains/kr/ac/hanbat.txt b/lib/domains/kr/ac/hanbat.txt
deleted file mode 100644
index 6d277d90b9..0000000000
--- a/lib/domains/kr/ac/hanbat.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hanbat National University
diff --git a/lib/domains/kr/ac/hywoman.txt b/lib/domains/kr/ac/hywoman.txt
deleted file mode 100644
index 59f438384a..0000000000
--- a/lib/domains/kr/ac/hywoman.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-한양여자대학교
-Hanyang Women's University
diff --git a/lib/domains/kr/ac/inhatc.txt b/lib/domains/kr/ac/inhatc.txt
new file mode 100644
index 0000000000..f0d30fda50
--- /dev/null
+++ b/lib/domains/kr/ac/inhatc.txt
@@ -0,0 +1,2 @@
+인하공업전문대학교
+Inha Technical College
\ No newline at end of file
diff --git a/lib/domains/kr/ac/kgu.txt b/lib/domains/kr/ac/kgu.txt
deleted file mode 100644
index a9fe5b0e65..0000000000
--- a/lib/domains/kr/ac/kgu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-경기대학교
-university of kyonggi
\ No newline at end of file
diff --git a/lib/domains/kr/ac/kiu.txt b/lib/domains/kr/ac/kiu.txt
new file mode 100644
index 0000000000..61da8265ac
--- /dev/null
+++ b/lib/domains/kr/ac/kiu.txt
@@ -0,0 +1,2 @@
+경일대학교
+Kyungil University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/songwon/office.txt b/lib/domains/kr/ac/songwon/office.txt
new file mode 100644
index 0000000000..cdc0eb7263
--- /dev/null
+++ b/lib/domains/kr/ac/songwon/office.txt
@@ -0,0 +1,2 @@
+송원대학교
+Songwon University
diff --git a/lib/domains/kr/ac/stu.txt b/lib/domains/kr/ac/stu.txt
index 358e0b26b3..878511613b 100644
--- a/lib/domains/kr/ac/stu.txt
+++ b/lib/domains/kr/ac/stu.txt
@@ -1 +1,2 @@
-Seoul Teological University
+제주대학교
+Jeju National University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/wu.txt b/lib/domains/kr/ac/wu.txt
new file mode 100644
index 0000000000..9c9a9026b2
--- /dev/null
+++ b/lib/domains/kr/ac/wu.txt
@@ -0,0 +1,2 @@
+원광보건대학교
+WONKWANG HEALTH SCIENCE UNIVERSITY
\ No newline at end of file
diff --git a/lib/domains/kr/go/goe/samil-th.txt b/lib/domains/kr/go/goe/samil-th.txt
new file mode 100644
index 0000000000..9b714e86db
--- /dev/null
+++ b/lib/domains/kr/go/goe/samil-th.txt
@@ -0,0 +1,2 @@
+삼일공업고등학교
+Samil Technical High School
\ No newline at end of file
diff --git a/lib/domains/kr/itc.txt b/lib/domains/kr/itc.txt
new file mode 100644
index 0000000000..3a0c8a7495
--- /dev/null
+++ b/lib/domains/kr/itc.txt
@@ -0,0 +1,2 @@
+인하공업전문대학
+Inha Technical College
\ No newline at end of file
diff --git a/lib/domains/kw/edu/aum.txt b/lib/domains/kw/edu/aum.txt
new file mode 100644
index 0000000000..bb8f7beffd
--- /dev/null
+++ b/lib/domains/kw/edu/aum.txt
@@ -0,0 +1,2 @@
+American University of the middle east
+American University of the middle east
\ No newline at end of file
diff --git a/lib/domains/kw/edu/dbs.txt b/lib/domains/kw/edu/dbs.txt
new file mode 100644
index 0000000000..826b329d69
--- /dev/null
+++ b/lib/domains/kw/edu/dbs.txt
@@ -0,0 +1 @@
+Dasman Bilingual School
\ No newline at end of file
diff --git a/lib/domains/kz/edu/rii.txt b/lib/domains/kz/edu/rii.txt
new file mode 100644
index 0000000000..afb9810d31
--- /dev/null
+++ b/lib/domains/kz/edu/rii.txt
@@ -0,0 +1,2 @@
+rii.edu.kz
+
diff --git a/lib/domains/mk/edu/vision.txt b/lib/domains/mk/edu/vision.txt
new file mode 100644
index 0000000000..30585af05d
--- /dev/null
+++ b/lib/domains/mk/edu/vision.txt
@@ -0,0 +1 @@
+International Vision University
\ No newline at end of file
diff --git a/lib/domains/mw/ac/unima.txt b/lib/domains/mw/ac/unima.txt
new file mode 100644
index 0000000000..73b0ded64a
--- /dev/null
+++ b/lib/domains/mw/ac/unima.txt
@@ -0,0 +1 @@
+University Of Malawi
diff --git a/lib/domains/mx/edu/cbtis156.txt b/lib/domains/mx/edu/cbtis156.txt
new file mode 100644
index 0000000000..6aac3f2d16
--- /dev/null
+++ b/lib/domains/mx/edu/cbtis156.txt
@@ -0,0 +1,2 @@
+Centro de Bachillerato Tecnologico Industrial y de Servicios Num. 156
+CBTis #156 LA JOYA
\ No newline at end of file
diff --git a/lib/domains/mx/edu/cobatab.txt b/lib/domains/mx/edu/cobatab.txt
deleted file mode 100644
index e595129268..0000000000
--- a/lib/domains/mx/edu/cobatab.txt
+++ /dev/null
@@ -1 +0,0 @@
-Colegio de Bachilleres de Tabasco
\ No newline at end of file
diff --git a/lib/domains/mx/edu/usebeq.txt b/lib/domains/mx/edu/usebeq.txt
new file mode 100644
index 0000000000..7dd985d371
--- /dev/null
+++ b/lib/domains/mx/edu/usebeq.txt
@@ -0,0 +1 @@
+Secundaria General 32 José Clemente Orozco
\ No newline at end of file
diff --git a/lib/domains/mx/edu/uvm.txt b/lib/domains/mx/edu/uvm.txt
new file mode 100644
index 0000000000..eaa71a57c5
--- /dev/null
+++ b/lib/domains/mx/edu/uvm.txt
@@ -0,0 +1,2 @@
+Universidad del Valle de México
+University of the Valley of Mexico
diff --git a/lib/domains/mx/itesm.txt b/lib/domains/mx/itesm.txt
deleted file mode 100644
index 8bbe14bdea..0000000000
--- a/lib/domains/mx/itesm.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM)
-Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM)
diff --git a/lib/domains/mx/tec.txt b/lib/domains/mx/tec.txt
index cc1ddc0f05..8bbe14bdea 100644
--- a/lib/domains/mx/tec.txt
+++ b/lib/domains/mx/tec.txt
@@ -1,2 +1,2 @@
-Instituto Tecnológico de Estudios Superiores de Monterrey
-Monterrey Institute of Technology and Higher Education
+Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM)
+Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM)
diff --git a/lib/domains/my/edu/iium.txt b/lib/domains/my/edu/iium.txt
new file mode 100644
index 0000000000..b462ed6054
--- /dev/null
+++ b/lib/domains/my/edu/iium.txt
@@ -0,0 +1,2 @@
+International Islamic University Malaysia
+International Islamic University Malaysia
\ No newline at end of file
diff --git a/lib/domains/my/edu/ucsiuniversity.txt b/lib/domains/my/edu/ucsiuniversity.txt
new file mode 100644
index 0000000000..10b0ab98ad
--- /dev/null
+++ b/lib/domains/my/edu/ucsiuniversity.txt
@@ -0,0 +1 @@
+UCSI University
\ No newline at end of file
diff --git a/lib/domains/my/edu/wou.txt b/lib/domains/my/edu/wou.txt
deleted file mode 100644
index 7730a58931..0000000000
--- a/lib/domains/my/edu/wou.txt
+++ /dev/null
@@ -1 +0,0 @@
-Wawasan Open University
diff --git a/lib/domains/net/bjalearn.txt b/lib/domains/net/bjalearn.txt
new file mode 100644
index 0000000000..872bdb1fe0
--- /dev/null
+++ b/lib/domains/net/bjalearn.txt
@@ -0,0 +1 @@
+Bob Jones Academy
diff --git a/lib/domains/net/fundacionloyola.txt b/lib/domains/net/fundacionloyola.txt
new file mode 100644
index 0000000000..580463d838
--- /dev/null
+++ b/lib/domains/net/fundacionloyola.txt
@@ -0,0 +1 @@
+Colegio Concertado San José, Málaga.
\ No newline at end of file
diff --git a/lib/domains/net/ichthuscollege.txt b/lib/domains/net/ichthuscollege.txt
new file mode 100644
index 0000000000..17236f1ac5
--- /dev/null
+++ b/lib/domains/net/ichthuscollege.txt
@@ -0,0 +1 @@
+Ichthus college
\ No newline at end of file
diff --git a/lib/domains/net/jedlik.txt b/lib/domains/net/jedlik.txt
new file mode 100644
index 0000000000..0cbbf2c145
--- /dev/null
+++ b/lib/domains/net/jedlik.txt
@@ -0,0 +1 @@
+Jedlik Ányos Gimnázium
diff --git a/lib/domains/net/ndbellegarde.txt b/lib/domains/net/ndbellegarde.txt
new file mode 100644
index 0000000000..93ee909977
--- /dev/null
+++ b/lib/domains/net/ndbellegarde.txt
@@ -0,0 +1 @@
+Notre-Dame de Bellegarde
\ No newline at end of file
diff --git a/lib/domains/net/whistlingwoods.txt b/lib/domains/net/whistlingwoods.txt
deleted file mode 100644
index f041062647..0000000000
--- a/lib/domains/net/whistlingwoods.txt
+++ /dev/null
@@ -1 +0,0 @@
-Whistling Woods
diff --git a/lib/domains/net/zhxhs.txt b/lib/domains/net/zhxhs.txt
new file mode 100644
index 0000000000..832d643467
--- /dev/null
+++ b/lib/domains/net/zhxhs.txt
@@ -0,0 +1 @@
+广州市执信中学
\ No newline at end of file
diff --git a/lib/domains/ng/edu/aapoly.txt b/lib/domains/ng/edu/aapoly.txt
new file mode 100644
index 0000000000..6a74a06e11
--- /dev/null
+++ b/lib/domains/ng/edu/aapoly.txt
@@ -0,0 +1 @@
+Academies Australasia Polytechnic Pty Limited
diff --git a/lib/domains/ng/edu/unicross.txt b/lib/domains/ng/edu/unicross.txt
new file mode 100644
index 0000000000..642c98ad55
--- /dev/null
+++ b/lib/domains/ng/edu/unicross.txt
@@ -0,0 +1 @@
+University of Cross River State
diff --git a/lib/domains/nl/andreascollege.txt b/lib/domains/nl/andreascollege.txt
new file mode 100644
index 0000000000..92573f04d3
--- /dev/null
+++ b/lib/domains/nl/andreascollege.txt
@@ -0,0 +1 @@
+Stichting Andreas College
\ No newline at end of file
diff --git a/lib/domains/nl/ichthuscollege.txt b/lib/domains/nl/ichthuscollege.txt
new file mode 100644
index 0000000000..17236f1ac5
--- /dev/null
+++ b/lib/domains/nl/ichthuscollege.txt
@@ -0,0 +1 @@
+Ichthus college
\ No newline at end of file
diff --git a/lib/domains/nl/sgtedu.txt b/lib/domains/nl/sgtedu.txt
new file mode 100644
index 0000000000..511f9b1d39
--- /dev/null
+++ b/lib/domains/nl/sgtedu.txt
@@ -0,0 +1 @@
+SG Tongerlo
\ No newline at end of file
diff --git a/lib/domains/np/edu/adhyayan.txt b/lib/domains/np/edu/adhyayan.txt
new file mode 100644
index 0000000000..5167dd2ebd
--- /dev/null
+++ b/lib/domains/np/edu/adhyayan.txt
@@ -0,0 +1 @@
+Adhyayan School
diff --git a/lib/domains/np/edu/kamalamultiplecampus.txt b/lib/domains/np/edu/kamalamultiplecampus.txt
new file mode 100644
index 0000000000..4d26531c14
--- /dev/null
+++ b/lib/domains/np/edu/kamalamultiplecampus.txt
@@ -0,0 +1,2 @@
+kamala multiple campus
+kamala multiple campus
\ No newline at end of file
diff --git a/lib/domains/np/edu/shahidcampus.txt b/lib/domains/np/edu/shahidcampus.txt
new file mode 100644
index 0000000000..f88b9e86ec
--- /dev/null
+++ b/lib/domains/np/edu/shahidcampus.txt
@@ -0,0 +1 @@
+Shahid Multiple Campus
\ No newline at end of file
diff --git a/lib/domains/org/annaisd/students.txt b/lib/domains/org/annaisd/students.txt
new file mode 100644
index 0000000000..ac4c92aadf
--- /dev/null
+++ b/lib/domains/org/annaisd/students.txt
@@ -0,0 +1 @@
+Anna High School
diff --git a/lib/domains/org/axiscolleges.txt b/lib/domains/org/axiscolleges.txt
new file mode 100644
index 0000000000..d801501d1c
--- /dev/null
+++ b/lib/domains/org/axiscolleges.txt
@@ -0,0 +1 @@
+Axis institute of technology and management 
\ No newline at end of file
diff --git a/lib/domains/org/fultonscienceacademy.txt b/lib/domains/org/fultonscienceacademy.txt
new file mode 100644
index 0000000000..f6134568a2
--- /dev/null
+++ b/lib/domains/org/fultonscienceacademy.txt
@@ -0,0 +1,4 @@
+Fulton Science Academy
+fultonscienceacademy.org
+https://www.fultonscienceacademy.org/academics/high-school-curriculum
+on the website at line 3, go to Course catalog page 30 for the CS course
diff --git a/lib/domains/org/hcrhs.txt b/lib/domains/org/hcrhs.txt
new file mode 100644
index 0000000000..81922676a5
--- /dev/null
+++ b/lib/domains/org/hcrhs.txt
@@ -0,0 +1 @@
+Hunterdon Central Regional High School
\ No newline at end of file
diff --git a/lib/domains/org/iesitacaalcorcon.txt b/lib/domains/org/iesitacaalcorcon.txt
new file mode 100644
index 0000000000..605c78a3dc
--- /dev/null
+++ b/lib/domains/org/iesitacaalcorcon.txt
@@ -0,0 +1 @@
+I.E.S Ítaca, Alcorcón, Madrid.
\ No newline at end of file
diff --git a/lib/domains/org/oxnardunion.txt b/lib/domains/org/oxnardunion.txt
new file mode 100644
index 0000000000..0f8ddca595
--- /dev/null
+++ b/lib/domains/org/oxnardunion.txt
@@ -0,0 +1,2 @@
+Oxnard Union High School District
+.group
diff --git a/lib/domains/org/pascack.txt b/lib/domains/org/pascack.txt
new file mode 100644
index 0000000000..75b96a177c
--- /dev/null
+++ b/lib/domains/org/pascack.txt
@@ -0,0 +1,3 @@
+Pascack Hills High School, Montvale NJ
+Pascack Valley High School, Hillsdale NJ
+.group
diff --git a/lib/domains/org/scattergood.txt b/lib/domains/org/scattergood.txt
new file mode 100644
index 0000000000..4568e36cb1
--- /dev/null
+++ b/lib/domains/org/scattergood.txt
@@ -0,0 +1 @@
+Scattergood
\ No newline at end of file
diff --git a/lib/domains/org/smmacademy.txt b/lib/domains/org/smmacademy.txt
new file mode 100644
index 0000000000..7c9064fcb4
--- /dev/null
+++ b/lib/domains/org/smmacademy.txt
@@ -0,0 +1,2 @@
+St Mary Magdelene Academy
+St Mary Magdelene Academy
\ No newline at end of file
diff --git a/lib/domains/org/unikam.txt b/lib/domains/org/unikam.txt
new file mode 100644
index 0000000000..ae9eddbf3f
--- /dev/null
+++ b/lib/domains/org/unikam.txt
@@ -0,0 +1 @@
+Kamina University
\ No newline at end of file
diff --git a/lib/domains/pe/edu/cibertec.txt b/lib/domains/pe/edu/cibertec.txt
deleted file mode 100644
index e0782ee136..0000000000
--- a/lib/domains/pe/edu/cibertec.txt
+++ /dev/null
@@ -1 +0,0 @@
-Cibertec
diff --git a/lib/domains/pe/edu/iestplurin.txt b/lib/domains/pe/edu/iestplurin.txt
new file mode 100644
index 0000000000..a572f61b92
--- /dev/null
+++ b/lib/domains/pe/edu/iestplurin.txt
@@ -0,0 +1 @@
+Instituto de Educacion Superior Tecnologico Publico Lurin
diff --git a/lib/domains/pe/edu/untumbes.txt b/lib/domains/pe/edu/untumbes.txt
deleted file mode 100644
index 4267ef32b6..0000000000
--- a/lib/domains/pe/edu/untumbes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Nacional de Tumbes
diff --git a/lib/domains/pk/edu/beaconite.txt b/lib/domains/pk/edu/beaconite.txt
new file mode 100644
index 0000000000..454316772f
--- /dev/null
+++ b/lib/domains/pk/edu/beaconite.txt
@@ -0,0 +1,2 @@
+Beaconhouse School System
+Beaconhouse School System
diff --git a/lib/domains/pk/edu/tme.txt b/lib/domains/pk/edu/tme.txt
new file mode 100644
index 0000000000..6270312869
--- /dev/null
+++ b/lib/domains/pk/edu/tme.txt
@@ -0,0 +1,2 @@
+Roots millennium school
+Roots millennium school ( The Millennium Education)
\ No newline at end of file
diff --git a/lib/domains/pk/edu/ucp.txt b/lib/domains/pk/edu/ucp.txt
new file mode 100644
index 0000000000..904aa831b1
--- /dev/null
+++ b/lib/domains/pk/edu/ucp.txt
@@ -0,0 +1 @@
+University of Central Punjab
\ No newline at end of file
diff --git a/lib/domains/pl/edu/uj.txt b/lib/domains/pl/edu/uj.txt
index 680dc705df..1f78a3d9b3 100644
--- a/lib/domains/pl/edu/uj.txt
+++ b/lib/domains/pl/edu/uj.txt
@@ -1 +1,2 @@
 Jagiellonian University Cracow
+Jagiellonian University in Krakow
diff --git a/lib/domains/pl/edu/zseeim.txt b/lib/domains/pl/edu/zseeim.txt
new file mode 100644
index 0000000000..54f58a61da
--- /dev/null
+++ b/lib/domains/pl/edu/zseeim.txt
@@ -0,0 +1 @@
+zseeim.edu.pl
diff --git a/lib/domains/pl/iitis.txt b/lib/domains/pl/iitis.txt
new file mode 100644
index 0000000000..451e3749a7
--- /dev/null
+++ b/lib/domains/pl/iitis.txt
@@ -0,0 +1 @@
+Institute of Theoretical and Applied Informatics, Polish Academy of Sciences
\ No newline at end of file
diff --git a/lib/domains/pt/epvl.txt b/lib/domains/pt/epvl.txt
new file mode 100644
index 0000000000..04f83d6499
--- /dev/null
+++ b/lib/domains/pt/epvl.txt
@@ -0,0 +1 @@
+Escola Profissional Vasconcellos Lebre, Mealhada
\ No newline at end of file
diff --git a/lib/domains/pt/valeovil.txt b/lib/domains/pt/valeovil.txt
new file mode 100644
index 0000000000..2b2da742b8
--- /dev/null
+++ b/lib/domains/pt/valeovil.txt
@@ -0,0 +1 @@
+Agrupamento de Escolas de Vale de Ovil
diff --git a/lib/domains/py/edu/campoalto.txt b/lib/domains/py/edu/campoalto.txt
new file mode 100644
index 0000000000..d0a824a662
--- /dev/null
+++ b/lib/domains/py/edu/campoalto.txt
@@ -0,0 +1 @@
+Colegio Campoalto - Paraguay
\ No newline at end of file
diff --git a/lib/domains/ro/britishschool.txt b/lib/domains/ro/britishschool.txt
new file mode 100644
index 0000000000..371cbcfd7e
--- /dev/null
+++ b/lib/domains/ro/britishschool.txt
@@ -0,0 +1,4 @@
+British School of Bucharest
+https://britishschool.ro/
+student@bsbonline.net
+teacher@britishschool.ro
diff --git a/lib/domains/ro/isb.txt b/lib/domains/ro/isb.txt
new file mode 100644
index 0000000000..248ad250b3
--- /dev/null
+++ b/lib/domains/ro/isb.txt
@@ -0,0 +1,2 @@
+International School of Bucharest
+isb.ro
\ No newline at end of file
diff --git a/lib/domains/ro/liceultonitza.txt b/lib/domains/ro/liceultonitza.txt
new file mode 100644
index 0000000000..3e820dcedc
--- /dev/null
+++ b/lib/domains/ro/liceultonitza.txt
@@ -0,0 +1,2 @@
+Liceul de Arte Plastice "Nicolae Tonitza" București
+"Nicolae Tonitza" Fine Arts High School Bucharest
\ No newline at end of file
diff --git a/lib/domains/ro/spiruharet-moinesti.txt b/lib/domains/ro/spiruharet-moinesti.txt
new file mode 100644
index 0000000000..be613aaf87
--- /dev/null
+++ b/lib/domains/ro/spiruharet-moinesti.txt
@@ -0,0 +1,2 @@
+Liceul Teoretic "Spiru Haret"
+"Spiru Haret" Theoretical High School
\ No newline at end of file
diff --git a/lib/domains/rs/edu/mus.txt b/lib/domains/rs/edu/mus.txt
deleted file mode 100644
index d39faa9fa8..0000000000
--- a/lib/domains/rs/edu/mus.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Метрополитан универзитет Србије
-Metropolitan University of Serbia
\ No newline at end of file
diff --git a/lib/domains/rs/singimail.txt b/lib/domains/rs/singimail.txt
deleted file mode 100644
index 9bee5442d7..0000000000
--- a/lib/domains/rs/singimail.txt
+++ /dev/null
@@ -1 +0,0 @@
-Singidunum University
\ No newline at end of file
diff --git a/lib/domains/ru/altstu/mail.txt b/lib/domains/ru/altgtu.txt
similarity index 100%
rename from lib/domains/ru/altstu/mail.txt
rename to lib/domains/ru/altgtu.txt
diff --git a/lib/domains/school/coda.txt b/lib/domains/school/coda.txt
new file mode 100644
index 0000000000..957e70c449
--- /dev/null
+++ b/lib/domains/school/coda.txt
@@ -0,0 +1,2 @@
+Coda
+Coda
\ No newline at end of file
diff --git a/lib/domains/school/csb.txt b/lib/domains/school/csb.txt
new file mode 100644
index 0000000000..8f4541ae93
--- /dev/null
+++ b/lib/domains/school/csb.txt
@@ -0,0 +1 @@
+Cybersecurity Business School
diff --git a/lib/domains/school/csb/student.txt b/lib/domains/school/csb/student.txt
new file mode 100644
index 0000000000..8f4541ae93
--- /dev/null
+++ b/lib/domains/school/csb/student.txt
@@ -0,0 +1 @@
+Cybersecurity Business School
diff --git a/lib/domains/schule/bw.txt b/lib/domains/schule/bw.txt
new file mode 100644
index 0000000000..af557c164a
--- /dev/null
+++ b/lib/domains/schule/bw.txt
@@ -0,0 +1,2 @@
+Schulportal des Landes Baden-Württemberg
+.group
\ No newline at end of file
diff --git a/lib/domains/se/herrljunga/skola.txt b/lib/domains/se/herrljunga/skola.txt
new file mode 100644
index 0000000000..e441067c8f
--- /dev/null
+++ b/lib/domains/se/herrljunga/skola.txt
@@ -0,0 +1 @@
+Kunskapskällan
\ No newline at end of file
diff --git a/lib/domains/sg/edu/middleton.txt b/lib/domains/sg/edu/middleton.txt
new file mode 100644
index 0000000000..05b01b86a5
--- /dev/null
+++ b/lib/domains/sg/edu/middleton.txt
@@ -0,0 +1 @@
+Middleton International School by Eton House
\ No newline at end of file
diff --git a/lib/domains/so/edu/just.txt b/lib/domains/so/edu/just.txt
new file mode 100644
index 0000000000..2943a362fb
--- /dev/null
+++ b/lib/domains/so/edu/just.txt
@@ -0,0 +1 @@
+Jamhuriya University of Science and Technology
diff --git a/lib/domains/stoplist.txt b/lib/domains/stoplist.txt
index f585c37e29..e0610c4120 100644
--- a/lib/domains/stoplist.txt
+++ b/lib/domains/stoplist.txt
@@ -214,7 +214,6 @@ stu.haust.edu.cn
 stu.haut.edu.cn
 stu.hcnu.edu.cn
 stu.hebmu.edu.cn
-stu.hit.edu.cn
 stu.hnie.edu.cn
 stu.hnucm.edu.cn
 stu.hrbust.edu.cn
@@ -252,7 +251,6 @@ stu.xhsysu.edu.cn
 stu.xhu.edu.cn
 stu.xidian.edu.cn
 stu.xjtu.edu.cn
-stu.xpu.edu.cn
 stu.yznu.cn
 stu.zjhu.edu.cn
 stu.zuel.edu.cn
@@ -284,7 +282,6 @@ ujs.edu.cn
 usst.edu.cn
 ustb.edu.cn
 ustc.edu.cn
-vip.henu.edu.cn
 vip.hnist.edu.cn
 vjrq.cn
 wfl.sh.edu.cn
@@ -325,9 +322,11 @@ alumni.albany.edu
 alumni.anu.edu.au
 alumni.bham.ac.uk
 alumni.cmu.edu
+alum.cs.umass.edu
 alumni.conncoll.edu
 alumni.edu.vn
 alumni.gsb.stanford.edu
+alumni.fh-campuswien.ac.at
 alumni.habib.edu.pk
 alumni.imperial.ac.uk
 alumni.iu.edu
@@ -415,7 +414,6 @@ usx.edu.cn
 meduca.edu.pa
 social.helwan.edu.eg
 alumni.uci.edu
-univ-dbkm.dz
 mail.rmutt.ac.th
 lsts.edu.vn
 ucass.edu.cn
@@ -496,12 +494,10 @@ o365.nuu.edu.tw
 o365.ntou.edu.tw
 chntheatre.edu.cn
 email.cufe.edu.cn
-mail.szpu.edu.cn
 alumni.bentley.edu
 altoona.k12.wi.us
 wauwatosa.k12.wi.us
 as.edu.sa
-kgu.ac.kr
 lanesville.k12.in.us
 student.umc.edu.dz
 edu.menofia.edu.eg
@@ -677,4 +673,54 @@ apps.nmims.edu.in
 universityofmanagement.sn
 sbjacksonville.com
 foundationuniversity.com
-students.sdcsc.k12.in.us
\ No newline at end of file
+students.sdcsc.k12.in.us
+xzc.edu.pl
+ea.ufpa.br
+iced.ufpa.br
+stu.sxpi.edu.cn
+mus.edu.rs
+ipp.cl
+bkc.edu.vn
+hungyen.itrithuc.vn
+ntpc.ufpa.br
+ics.ufpa.br
+chiba-c.ed.jp
+estudiante.usat.edu.pe
+mc-class.gr
+mtmcollege.in
+rsat.org.uk
+altinbas.edu.tr
+mu.ac.kr
+stumail.zcs.k12.in.us
+dusit.ac.th
+nyfbox.hu
+suezuni.edu.eg
+o365.rmutp.ac.th
+wmoenglishacademy.co.in
+actonlascruces.com
+csiriicb.in
+essat-gabes-elearning.com
+gmiv.onl
+hallgato.uni-szie.hu
+hiete.hu
+intech-so.fr
+intech-sud.fr
+itcalumnos.cl
+kvsroguwahati.in
+spbgut.com
+southern-bd.info
+supco-montpellier.fr
+vsavm.com
+bdu.edu.et
+alu.hit.edu.cn
+ilford-school.co.uk
+edu.ac.kr
+thc.tu.edu.np
+man10jakartabarat.sch.id
+fpz.hr
+vicaria.edu.ar
+uaconcagua.cl
+kojimachi.ed.jp
+chiba-c.ed.jp
+student.miyazaki-c.ed.jp
+huiu.edu.vn
\ No newline at end of file
diff --git a/lib/domains/sv/edu/cvirtualuees.txt b/lib/domains/sv/edu/cvirtualuees.txt
new file mode 100644
index 0000000000..7bd71ddf62
--- /dev/null
+++ b/lib/domains/sv/edu/cvirtualuees.txt
@@ -0,0 +1 @@
+Universidad Evangelica de El Salvador
\ No newline at end of file
diff --git a/lib/domains/th/ac/kmutt.txt b/lib/domains/th/ac/kmutt.txt
deleted file mode 100644
index ce061ea29b..0000000000
--- a/lib/domains/th/ac/kmutt.txt
+++ /dev/null
@@ -1 +0,0 @@
-King Mongkut's University of Technology Thonburi
diff --git a/lib/domains/th/ac/pnp.txt b/lib/domains/th/ac/pnp.txt
new file mode 100644
index 0000000000..8b8cbfa66c
--- /dev/null
+++ b/lib/domains/th/ac/pnp.txt
@@ -0,0 +1,2 @@
+วิทยาลัยการอาชีพพนมไพร
+Phanomphrai Industrial and Community Education College
\ No newline at end of file
diff --git a/lib/domains/tj/tnu.txt b/lib/domains/tj/tnu.txt
new file mode 100644
index 0000000000..13ff6a3101
--- /dev/null
+++ b/lib/domains/tj/tnu.txt
@@ -0,0 +1,2 @@
+Донишгоҳи миллии Тоҷикистон
+Tajik National University
\ No newline at end of file
diff --git a/lib/domains/tlds.txt b/lib/domains/tlds.txt
index 4320a2447b..fc89e92f67 100644
--- a/lib/domains/tlds.txt
+++ b/lib/domains/tlds.txt
@@ -1,7 +1,6 @@
 ac.be
 ac.gg
 ac.gn
-ac.kr
 ac.il
 ac.in
 ac.jp
@@ -30,7 +29,6 @@ edu.dz
 edu.ee
 edu.er
 edu.hk
-edu.hn
 edu.in
 edu.kz
 edu.lr
@@ -38,7 +36,6 @@ edu.ly
 edu.mg
 edu.ml
 edu.mo
-edu.mv
 edu.mw
 edu.ni
 edu.pa
diff --git a/lib/domains/tn/ucar/enib.txt b/lib/domains/tn/ucar/enib.txt
new file mode 100644
index 0000000000..0ba5144a66
--- /dev/null
+++ b/lib/domains/tn/ucar/enib.txt
@@ -0,0 +1,2 @@
+Ecole Nationale d’Ingénieurs de Bizerte
+The National Engineering School of Bizerte
diff --git a/lib/domains/tr/edu/altinbas.txt b/lib/domains/tr/edu/altinbas.txt
deleted file mode 100644
index cd10bc3f9b..0000000000
--- a/lib/domains/tr/edu/altinbas.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Altınbaş Üniversitesi
-Altinbas University
\ No newline at end of file
diff --git a/lib/domains/tr/edu/antalya.txt b/lib/domains/tr/edu/antalya.txt
deleted file mode 100644
index e156bdd976..0000000000
--- a/lib/domains/tr/edu/antalya.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Uluslararası Antalya Üniversitesi
-Antalya International University
\ No newline at end of file
diff --git a/lib/domains/tr/edu/deu.txt b/lib/domains/tr/edu/deu.txt
new file mode 100644
index 0000000000..3594f47de4
--- /dev/null
+++ b/lib/domains/tr/edu/deu.txt
@@ -0,0 +1,2 @@
+Dokuz Eylül Üniversitesi
+Dokuz Eylul University
\ No newline at end of file
diff --git a/lib/domains/tr/edu/gibtu.txt b/lib/domains/tr/edu/gibtu.txt
new file mode 100644
index 0000000000..c1b24c1ac2
--- /dev/null
+++ b/lib/domains/tr/edu/gibtu.txt
@@ -0,0 +1 @@
+Gaziantep Islam Science and Technology University
\ No newline at end of file
diff --git a/lib/domains/tr/edu/idu.txt b/lib/domains/tr/edu/idu.txt
deleted file mode 100644
index 8a94ff078a..0000000000
--- a/lib/domains/tr/edu/idu.txt
+++ /dev/null
@@ -1 +0,0 @@
-İzmir Demokrasi Üniversitesi
diff --git a/lib/domains/tr/edu/idu/std.txt b/lib/domains/tr/edu/idu/std.txt
deleted file mode 100644
index 158cf48dd5..0000000000
--- a/lib/domains/tr/edu/idu/std.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-İzmir Demokrasi Üniversitesi
-Izmir Democracy University
\ No newline at end of file
diff --git a/lib/domains/tw/edu/fju.txt b/lib/domains/tw/edu/fju.txt
deleted file mode 100644
index a219ae57e1..0000000000
--- a/lib/domains/tw/edu/fju.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fu Jen Catholic University
diff --git a/lib/domains/ua/com/novoshkola.txt b/lib/domains/ua/com/novoshkola.txt
new file mode 100644
index 0000000000..89086cd8ba
--- /dev/null
+++ b/lib/domains/ua/com/novoshkola.txt
@@ -0,0 +1,2 @@
+Новопечерська Школа
+Novopecherska School
diff --git a/lib/domains/ua/edu/nau/kitz.txt b/lib/domains/ua/edu/nau/kitz.txt
new file mode 100644
index 0000000000..c821c2d8c5
--- /dev/null
+++ b/lib/domains/ua/edu/nau/kitz.txt
@@ -0,0 +1 @@
+Фаховий коледж інженерії, управління та землевпорядкування Державного некомерційного підприємства "Державний університет "Київський авіаційний інститут"
\ No newline at end of file
diff --git a/lib/domains/ua/ks/ksma.txt b/lib/domains/ua/ks/ksma.txt
new file mode 100644
index 0000000000..96af0fafc2
--- /dev/null
+++ b/lib/domains/ua/ks/ksma.txt
@@ -0,0 +1,2 @@
+Херсонська Морська Державна Академія
+Kherson State Maritime Academy
\ No newline at end of file
diff --git a/lib/domains/ug/ac/unik.txt b/lib/domains/ug/ac/unik.txt
new file mode 100644
index 0000000000..36c41e29e7
--- /dev/null
+++ b/lib/domains/ug/ac/unik.txt
@@ -0,0 +1 @@
+University of Kisubi
\ No newline at end of file
diff --git a/lib/domains/uk/ac/mkcollege.txt b/lib/domains/uk/ac/mkcollege.txt
new file mode 100644
index 0000000000..1020a002b3
--- /dev/null
+++ b/lib/domains/uk/ac/mkcollege.txt
@@ -0,0 +1 @@
+Milton Keynes College Group
diff --git a/lib/domains/uk/org/fcat/garstang.txt b/lib/domains/uk/org/fcat/garstang.txt
new file mode 100644
index 0000000000..430b511bdd
--- /dev/null
+++ b/lib/domains/uk/org/fcat/garstang.txt
@@ -0,0 +1 @@
+Garstang Community Academy
\ No newline at end of file
diff --git a/lib/domains/uk/sch/cumbria/williamhoward.txt b/lib/domains/uk/sch/cumbria/williamhoward.txt
new file mode 100644
index 0000000000..a62a799d8e
--- /dev/null
+++ b/lib/domains/uk/sch/cumbria/williamhoward.txt
@@ -0,0 +1 @@
+William Howard
\ No newline at end of file
diff --git a/lib/domains/uk/sch/essex/mayflowerhigh/student.txt b/lib/domains/uk/sch/essex/mayflowerhigh/student.txt
new file mode 100644
index 0000000000..21030536bb
--- /dev/null
+++ b/lib/domains/uk/sch/essex/mayflowerhigh/student.txt
@@ -0,0 +1 @@
+Mayflower High School
diff --git a/lib/domains/vn/edu/dmail.txt b/lib/domains/vn/edu/dmail.txt
new file mode 100644
index 0000000000..43d16739c5
--- /dev/null
+++ b/lib/domains/vn/edu/dmail.txt
@@ -0,0 +1,2 @@
+Truong Trung cap nghe Cu Chi
+Cu Chi Vocational School
\ No newline at end of file
diff --git a/lib/domains/vn/edu/naem.txt b/lib/domains/vn/edu/naem.txt
new file mode 100644
index 0000000000..2115d939d4
--- /dev/null
+++ b/lib/domains/vn/edu/naem.txt
@@ -0,0 +1 @@
+HỌC VIỆN QUẢN LÝ GIÁO DỤC
\ No newline at end of file
diff --git a/lib/domains/vn/edu/saidiait.txt b/lib/domains/vn/edu/saidiait.txt
new file mode 100644
index 0000000000..7bedf3283d
--- /dev/null
+++ b/lib/domains/vn/edu/saidiait.txt
@@ -0,0 +1,2 @@
+Trường Đại học Saidia Vietnam
+Saidia University of Vietnam
\ No newline at end of file
diff --git a/lib/domains/za/co/westerford.txt b/lib/domains/za/co/westerford.txt
new file mode 100644
index 0000000000..960578f996
--- /dev/null
+++ b/lib/domains/za/co/westerford.txt
@@ -0,0 +1,2 @@
+Westerford High School
+Westerford High School
\ No newline at end of file