diff --git a/lib/domains/be/indbg.txt b/lib/domains/be/indbg.txt
new file mode 100644
index 0000000000..65dd8638c8
--- /dev/null
+++ b/lib/domains/be/indbg.txt
@@ -0,0 +1 @@
+Institut Notre-Dame de Beauraing
diff --git a/lib/domains/br/edu/unicid.txt b/lib/domains/br/edu/unicid.txt
new file mode 100644
index 0000000000..b6de42dd03
--- /dev/null
+++ b/lib/domains/br/edu/unicid.txt
@@ -0,0 +1 @@
+Universidade Cidade de São Paulo
\ No newline at end of file
diff --git a/lib/domains/br/gov/df/tc.txt b/lib/domains/br/gov/df/tc.txt
new file mode 100644
index 0000000000..8c26a706a9
--- /dev/null
+++ b/lib/domains/br/gov/df/tc.txt
@@ -0,0 +1 @@
+Escola de Contas do Tribunal de Contas do Distrito Federal
diff --git a/lib/domains/br/unibh.txt b/lib/domains/br/unibh.txt
new file mode 100644
index 0000000000..9615b6b372
--- /dev/null
+++ b/lib/domains/br/unibh.txt
@@ -0,0 +1 @@
+Centro Universitário de Belo Horizonte
diff --git a/lib/domains/br/utp.txt b/lib/domains/br/utp.txt
new file mode 100644
index 0000000000..f28b63f49b
--- /dev/null
+++ b/lib/domains/br/utp.txt
@@ -0,0 +1 @@
+Universidade Tuiuti do Paraná
diff --git a/lib/domains/by/fksis.txt b/lib/domains/by/fksis.txt
new file mode 100644
index 0000000000..1f3e91c087
--- /dev/null
+++ b/lib/domains/by/fksis.txt
@@ -0,0 +1 @@
+Faculty of Computer Systems and Networks (Belarusian State University of Informatics and Radioelectronics)
diff --git a/lib/domains/ca/collegeshawinigan.txt b/lib/domains/ca/collegeshawinigan.txt
new file mode 100644
index 0000000000..f9b726ce48
--- /dev/null
+++ b/lib/domains/ca/collegeshawinigan.txt
@@ -0,0 +1 @@
+Collège Shawinigan
diff --git a/lib/domains/ca/wrdsb.txt b/lib/domains/ca/wrdsb.txt
new file mode 100644
index 0000000000..c21b4cbcea
--- /dev/null
+++ b/lib/domains/ca/wrdsb.txt
@@ -0,0 +1 @@
+Waterloo Region District School Board
diff --git a/lib/domains/ch/divtec.txt b/lib/domains/ch/divtec.txt
new file mode 100644
index 0000000000..08393ddc2a
--- /dev/null
+++ b/lib/domains/ch/divtec.txt
@@ -0,0 +1 @@
+Ecole des Métiers Techniques de Porrentruy
diff --git a/lib/domains/cn/edu/zbti.txt b/lib/domains/cn/edu/zbti.txt
new file mode 100644
index 0000000000..8f4d25758b
--- /dev/null
+++ b/lib/domains/cn/edu/zbti.txt
@@ -0,0 +1 @@
+Zhejiang Business Technology Institute
\ No newline at end of file
diff --git a/lib/domains/cn/edu/zju.txt b/lib/domains/cn/edu/zju.txt
index e5bf9bde73..ffadd6abe9 100644
--- a/lib/domains/cn/edu/zju.txt
+++ b/lib/domains/cn/edu/zju.txt
@@ -1 +1,2 @@
-Zhejiang University
\ No newline at end of file
+Zhejiang University, Hangzhou, China
+浙江大学，中国杭州
diff --git a/lib/domains/com/makeschool.txt b/lib/domains/com/makeschool.txt
new file mode 100644
index 0000000000..b3b02abddd
--- /dev/null
+++ b/lib/domains/com/makeschool.txt
@@ -0,0 +1 @@
+Make School
diff --git a/lib/domains/com/makeschool/students.txt b/lib/domains/com/makeschool/students.txt
new file mode 100644
index 0000000000..660b13a1db
--- /dev/null
+++ b/lib/domains/com/makeschool/students.txt
@@ -0,0 +1 @@
+Make School Students 
diff --git a/lib/domains/com/ssipmt.txt b/lib/domains/com/ssipmt.txt
new file mode 100644
index 0000000000..8332213526
--- /dev/null
+++ b/lib/domains/com/ssipmt.txt
@@ -0,0 +1 @@
+Shri Shankaracharya Institute of Professional Management and Technology
diff --git a/lib/domains/com/supcareer.txt b/lib/domains/com/supcareer.txt
new file mode 100644
index 0000000000..3f42ccdfc9
--- /dev/null
+++ b/lib/domains/com/supcareer.txt
@@ -0,0 +1,2 @@
+Sup Career
+École de commerce du groupe INSEEC à Paris, France
diff --git a/lib/domains/com/wayneschools.txt b/lib/domains/com/wayneschools.txt
new file mode 100644
index 0000000000..0938be27a4
--- /dev/null
+++ b/lib/domains/com/wayneschools.txt
@@ -0,0 +1 @@
+Wayne Township Public Schools
diff --git a/lib/domains/cz/prumkadc.txt b/lib/domains/cz/prumkadc.txt
new file mode 100644
index 0000000000..8ec09e3d25
--- /dev/null
+++ b/lib/domains/cz/prumkadc.txt
@@ -0,0 +1 @@
+Vyšší odborná škola a Střední průmyslová škola strojní, stavební a dopravní, Děčín, příspěvková organizace
diff --git a/lib/domains/de/bbs-buchholz.txt b/lib/domains/de/bbs-buchholz.txt
new file mode 100644
index 0000000000..7213d011fc
--- /dev/null
+++ b/lib/domains/de/bbs-buchholz.txt
@@ -0,0 +1,4 @@
+BBS Buchholz
+Berufsbildende Schulen Buchholz in der Nordheide
+www.bbs-buchholz.de
+www.bbs-buchholz.de/internet/bildungsangebote/fachrichtungen/fachrichtungen.php#Informationsverarbeitung
diff --git a/lib/domains/de/hochschule-stralsund.txt b/lib/domains/de/hochschule-stralsund.txt
new file mode 100644
index 0000000000..03bb744290
--- /dev/null
+++ b/lib/domains/de/hochschule-stralsund.txt
@@ -0,0 +1 @@
+Fachhochschule Stralsund
\ No newline at end of file
diff --git a/lib/domains/de/mm-bbs.txt b/lib/domains/de/mm-bbs.txt
new file mode 100644
index 0000000000..a35e029b3b
--- /dev/null
+++ b/lib/domains/de/mm-bbs.txt
@@ -0,0 +1 @@
+multi media BBS Hannover
diff --git a/lib/domains/de/ts-aalen.txt b/lib/domains/de/ts-aalen.txt
new file mode 100644
index 0000000000..a8b467bea6
--- /dev/null
+++ b/lib/domains/de/ts-aalen.txt
@@ -0,0 +1 @@
+Technische Schule Aalen
diff --git a/lib/domains/edu/smccd.txt b/lib/domains/edu/smccd.txt
new file mode 100644
index 0000000000..840aa4cac9
--- /dev/null
+++ b/lib/domains/edu/smccd.txt
@@ -0,0 +1 @@
+San Mateo County Community College District
diff --git a/lib/domains/edu/uniben.txt b/lib/domains/edu/uniben.txt
new file mode 100644
index 0000000000..6f7588e411
--- /dev/null
+++ b/lib/domains/edu/uniben.txt
@@ -0,0 +1 @@
+University of Benin
diff --git a/lib/domains/es/esne.txt b/lib/domains/es/esne.txt
new file mode 100644
index 0000000000..228e246579
--- /dev/null
+++ b/lib/domains/es/esne.txt
@@ -0,0 +1 @@
+Esne ( Escuela Universitaria de Diseño, Innovacion y Tecnologia), based in Madrid, Spain
diff --git a/lib/domains/eu/ecam-strasbourg.txt b/lib/domains/eu/ecam-strasbourg.txt
new file mode 100644
index 0000000000..e59df345ea
--- /dev/null
+++ b/lib/domains/eu/ecam-strasbourg.txt
@@ -0,0 +1 @@
+Ecam Strasbourg
diff --git a/lib/domains/fi/mayk.txt b/lib/domains/fi/mayk.txt
new file mode 100644
index 0000000000..d269016b33
--- /dev/null
+++ b/lib/domains/fi/mayk.txt
@@ -0,0 +1 @@
+Maunula Secondary School and Helsinki Math School (Maunulan yhteiskoulu ja Helsingin matematiikkalukio)
diff --git a/lib/domains/fi/munkka.txt b/lib/domains/fi/munkka.txt
new file mode 100644
index 0000000000..9e290b9677
--- /dev/null
+++ b/lib/domains/fi/munkka.txt
@@ -0,0 +1 @@
+Munkka Secondary School (Munkkiniemen Yhteiskoulu)
diff --git a/lib/domains/fr/coding-academy.txt b/lib/domains/fr/coding-academy.txt
new file mode 100644
index 0000000000..05aca584c9
--- /dev/null
+++ b/lib/domains/fr/coding-academy.txt
@@ -0,0 +1 @@
+Coding Academy
diff --git a/lib/domains/gm/edu/utg.txt b/lib/domains/gm/edu/utg.txt
new file mode 100644
index 0000000000..b09bcf5360
--- /dev/null
+++ b/lib/domains/gm/edu/utg.txt
@@ -0,0 +1 @@
+University of The Gambia
diff --git a/lib/domains/hu/semmelweis-univ.txt b/lib/domains/hu/semmelweis-univ.txt
new file mode 100644
index 0000000000..325c963827
--- /dev/null
+++ b/lib/domains/hu/semmelweis-univ.txt
@@ -0,0 +1 @@
+Semmelweis University
diff --git a/lib/domains/in/org/pravaraengg.txt b/lib/domains/in/org/pravaraengg.txt
new file mode 100644
index 0000000000..7902cd16ca
--- /dev/null
+++ b/lib/domains/in/org/pravaraengg.txt
@@ -0,0 +1 @@
+Pravara Rural Engineering College
diff --git a/lib/domains/info/diit.txt b/lib/domains/info/diit.txt
new file mode 100644
index 0000000000..3c01fc4933
--- /dev/null
+++ b/lib/domains/info/diit.txt
@@ -0,0 +1 @@
+Daffodil Institute of Information & Technology
diff --git a/lib/domains/it/fr/accademiabellearti.txt b/lib/domains/it/fr/accademiabellearti.txt
new file mode 100644
index 0000000000..9a74d74d84
--- /dev/null
+++ b/lib/domains/it/fr/accademiabellearti.txt
@@ -0,0 +1 @@
+Frosinone Academy of Fine Arts
diff --git a/lib/domains/net/pdsb.txt b/lib/domains/net/pdsb.txt
new file mode 100644
index 0000000000..b056ec8974
--- /dev/null
+++ b/lib/domains/net/pdsb.txt
@@ -0,0 +1,2 @@
+Peel District School Board
+.group
\ No newline at end of file
diff --git a/lib/domains/net/promsocatc.txt b/lib/domains/net/promsocatc.txt
new file mode 100644
index 0000000000..ef9f1ad57b
--- /dev/null
+++ b/lib/domains/net/promsocatc.txt
@@ -0,0 +1 @@
+Collège Technique "Aumôniers du Travail"
diff --git a/lib/domains/net/srvusd.txt b/lib/domains/net/srvusd.txt
new file mode 100644
index 0000000000..64525088fd
--- /dev/null
+++ b/lib/domains/net/srvusd.txt
@@ -0,0 +1,2 @@
+San Ramon Valley Unified School District
+.group
diff --git a/lib/domains/ng/edu/uniport.txt b/lib/domains/ng/edu/uniport.txt
new file mode 100644
index 0000000000..5dcf08b3cf
--- /dev/null
+++ b/lib/domains/ng/edu/uniport.txt
@@ -0,0 +1 @@
+Uniport Of Port Harcourt
diff --git a/lib/domains/nl/vozaanstad.txt b/lib/domains/nl/vozaanstad.txt
new file mode 100644
index 0000000000..b8557677aa
--- /dev/null
+++ b/lib/domains/nl/vozaanstad.txt
@@ -0,0 +1 @@
+OVO Zaanstad
diff --git a/lib/domains/no/hvl.txt b/lib/domains/no/hvl.txt
new file mode 100644
index 0000000000..8b911f3396
--- /dev/null
+++ b/lib/domains/no/hvl.txt
@@ -0,0 +1 @@
+Western Norway University of Applied Sciences
diff --git a/lib/domains/no/usn.txt b/lib/domains/no/usn.txt
new file mode 100644
index 0000000000..fa3befce13
--- /dev/null
+++ b/lib/domains/no/usn.txt
@@ -0,0 +1 @@
+Høgskolen i Sørøst-Norge / University College of Southeast Norway
diff --git a/lib/domains/one/nmu.txt b/lib/domains/one/nmu.txt
new file mode 100644
index 0000000000..e2e1bcea07
--- /dev/null
+++ b/lib/domains/one/nmu.txt
@@ -0,0 +1,2 @@
+National Mining University
+NMU
diff --git a/lib/domains/org/atljewishacademy.txt b/lib/domains/org/atljewishacademy.txt
new file mode 100644
index 0000000000..a30ac595e9
--- /dev/null
+++ b/lib/domains/org/atljewishacademy.txt
@@ -0,0 +1 @@
+Atlanta Jewish Academy
diff --git a/lib/domains/org/barnsley-academy.txt b/lib/domains/org/barnsley-academy.txt
new file mode 100644
index 0000000000..fd91b80211
--- /dev/null
+++ b/lib/domains/org/barnsley-academy.txt
@@ -0,0 +1 @@
+Barnsley Academy
diff --git a/lib/domains/org/fergflor.txt b/lib/domains/org/fergflor.txt
new file mode 100644
index 0000000000..bebac93565
--- /dev/null
+++ b/lib/domains/org/fergflor.txt
@@ -0,0 +1,2 @@
+Ferguson-Florissant School District
+Ferguson-Florissant R-II
diff --git a/lib/domains/org/jeppiaarinstitute.txt b/lib/domains/org/jeppiaarinstitute.txt
new file mode 100644
index 0000000000..8c0b476543
--- /dev/null
+++ b/lib/domains/org/jeppiaarinstitute.txt
@@ -0,0 +1 @@
+Jeppiaar Institute of Technology
diff --git a/lib/domains/org/landmarkschool.txt b/lib/domains/org/landmarkschool.txt
new file mode 100644
index 0000000000..5d76d99212
--- /dev/null
+++ b/lib/domains/org/landmarkschool.txt
@@ -0,0 +1 @@
+Landmark School
diff --git a/lib/domains/org/pdsb.txt b/lib/domains/org/pdsb.txt
new file mode 100644
index 0000000000..b056ec8974
--- /dev/null
+++ b/lib/domains/org/pdsb.txt
@@ -0,0 +1,2 @@
+Peel District School Board
+.group
\ No newline at end of file
diff --git a/lib/domains/pl/gdynia/amw.txt b/lib/domains/pl/gdynia/amw.txt
new file mode 100644
index 0000000000..8928dbf91c
--- /dev/null
+++ b/lib/domains/pl/gdynia/amw.txt
@@ -0,0 +1 @@
+Polish Naval Academy
diff --git a/lib/domains/ru/chsu.txt b/lib/domains/ru/chsu.txt
new file mode 100644
index 0000000000..f4420c1c6e
--- /dev/null
+++ b/lib/domains/ru/chsu.txt
@@ -0,0 +1 @@
+Cherepovets State University
diff --git a/lib/domains/ru/mcag.txt b/lib/domains/ru/mcag.txt
new file mode 100644
index 0000000000..476b030381
--- /dev/null
+++ b/lib/domains/ru/mcag.txt
@@ -0,0 +1 @@
+Moscow College of Architecture and Urban Planning
\ No newline at end of file
diff --git a/lib/domains/ru/mkgtu.txt b/lib/domains/ru/mkgtu.txt
new file mode 100644
index 0000000000..84400ecae8
--- /dev/null
+++ b/lib/domains/ru/mkgtu.txt
@@ -0,0 +1 @@
+Maikop State Technological University
diff --git a/lib/domains/ru/mospolytech.txt b/lib/domains/ru/mospolytech.txt
new file mode 100644
index 0000000000..6f83338453
--- /dev/null
+++ b/lib/domains/ru/mospolytech.txt
@@ -0,0 +1 @@
+Moscow Polytechnic University
diff --git a/lib/domains/ru/studklg.txt b/lib/domains/ru/studklg.txt
new file mode 100644
index 0000000000..3d9a4926e3
--- /dev/null
+++ b/lib/domains/ru/studklg.txt
@@ -0,0 +1,2 @@
+Tsiolkovsky Kaluga State University
+Students email domain of Tsiolkovsky Kaluga State University
diff --git a/lib/domains/ru/tksu.txt b/lib/domains/ru/tksu.txt
new file mode 100644
index 0000000000..92b7bf2af8
--- /dev/null
+++ b/lib/domains/ru/tksu.txt
@@ -0,0 +1,2 @@
+Tsiolkovsky Kaluga State University
+Tsiolkovsky Kaluga State University
diff --git a/lib/domains/ru/tomintech.txt b/lib/domains/ru/tomintech.txt
new file mode 100644
index 0000000000..d51ad4e4c8
--- /dev/null
+++ b/lib/domains/ru/tomintech.txt
@@ -0,0 +1,3 @@
+Tomsk Industrial Technical School
+TomInTech
+Томский Индустриальный Техникум
diff --git a/lib/domains/ru/tyuiu.txt b/lib/domains/ru/tyuiu.txt
new file mode 100644
index 0000000000..38914a727f
--- /dev/null
+++ b/lib/domains/ru/tyuiu.txt
@@ -0,0 +1 @@
+Tyumen industrial University
diff --git a/lib/domains/ch/juventus.txt b/lib/domains/schule/juventus.txt
similarity index 100%
rename from lib/domains/ch/juventus.txt
rename to lib/domains/schule/juventus.txt
diff --git a/lib/domains/se/snitz.txt b/lib/domains/se/snitz.txt
new file mode 100644
index 0000000000..d394fa8c87
--- /dev/null
+++ b/lib/domains/se/snitz.txt
@@ -0,0 +1 @@
+Snitz Gymnasium (Teacher)
diff --git a/lib/domains/sk/gjh.txt b/lib/domains/sk/gjh.txt
new file mode 100644
index 0000000000..95265ea00e
--- /dev/null
+++ b/lib/domains/sk/gjh.txt
@@ -0,0 +1 @@
+Gymnázium Jura Hronca, Bratislava
diff --git a/lib/domains/tn/Polytech-Intl.txt b/lib/domains/tn/Polytech-Intl.txt
new file mode 100644
index 0000000000..cbbc24fa77
--- /dev/null
+++ b/lib/domains/tn/Polytech-Intl.txt
@@ -0,0 +1 @@
+Ecole Polytechnique Internationale Privée de Tunis 
diff --git a/lib/domains/tw/edu/tcu/gms.txt b/lib/domains/tw/edu/tcu/gms.txt
new file mode 100644
index 0000000000..1e4403822b
--- /dev/null
+++ b/lib/domains/tw/edu/tcu/gms.txt
@@ -0,0 +1 @@
+Tzu Chi University
diff --git a/lib/domains/uk/org/s6f.txt b/lib/domains/uk/org/s6f.txt
new file mode 100644
index 0000000000..bd422104de
--- /dev/null
+++ b/lib/domains/uk/org/s6f.txt
@@ -0,0 +1 @@
+Scarborough Sixth Form College
\ No newline at end of file
diff --git a/lib/domains/uk/org/s6f/student.txt b/lib/domains/uk/org/s6f/student.txt
new file mode 100644
index 0000000000..bd422104de
--- /dev/null
+++ b/lib/domains/uk/org/s6f/student.txt
@@ -0,0 +1 @@
+Scarborough Sixth Form College
\ No newline at end of file
diff --git a/lib/domains/uk/org/sandhurstschool.txt b/lib/domains/uk/org/sandhurstschool.txt
new file mode 100644
index 0000000000..a6ff6a07eb
--- /dev/null
+++ b/lib/domains/uk/org/sandhurstschool.txt
@@ -0,0 +1 @@
+Sandhurst School
diff --git a/lib/domains/us/ca.k12/khsd.txt b/lib/domains/us/ca.k12/khsd.txt
deleted file mode 100644
index c664850ac3..0000000000
--- a/lib/domains/us/ca.k12/khsd.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kern High School District
\ No newline at end of file
diff --git a/lib/domains/us/ca/k12/khsd.txt b/lib/domains/us/ca/k12/khsd.txt
new file mode 100644
index 0000000000..21eee5c119
--- /dev/null
+++ b/lib/domains/us/ca/k12/khsd.txt
@@ -0,0 +1 @@
+Kern High School District
diff --git a/lib/domains/us/ca.k12/vcpusd.txt b/lib/domains/us/ca/k12/vcpusd.txt
similarity index 100%
rename from lib/domains/us/ca.k12/vcpusd.txt
rename to lib/domains/us/ca/k12/vcpusd.txt
diff --git a/lib/domains/us/nj/k12/paramus.txt b/lib/domains/us/nj/k12/paramus.txt
new file mode 100644
index 0000000000..a8a5548de4
--- /dev/null
+++ b/lib/domains/us/nj/k12/paramus.txt
@@ -0,0 +1 @@
+Paramus Public School District
\ No newline at end of file