diff --git a/lib/domains/bg/mg-babatonka.txt b/lib/domains/bg/mg-babatonka.txt
new file mode 100644
index 0000000000..187bc8ba9a
--- /dev/null
+++ b/lib/domains/bg/mg-babatonka.txt
@@ -0,0 +1,2 @@
+Математическа гимназия "Баба Тонка"
+Baba Tonka High School of Mathematics
diff --git a/lib/domains/br/edu/fumec.txt b/lib/domains/br/edu/fumec.txt
new file mode 100644
index 0000000000..c34266e119
--- /dev/null
+++ b/lib/domains/br/edu/fumec.txt
@@ -0,0 +1 @@
+Universidade FUMEC
diff --git a/lib/domains/br/unisanta/alunos.txt b/lib/domains/br/unisanta/alunos.txt
new file mode 100644
index 0000000000..61447a72fd
--- /dev/null
+++ b/lib/domains/br/unisanta/alunos.txt
@@ -0,0 +1 @@
+Universidade Santa Cecilia
\ No newline at end of file
diff --git a/lib/domains/ca/cshawi.txt b/lib/domains/ca/cshawi.txt
new file mode 100644
index 0000000000..c1e2744bbf
--- /dev/null
+++ b/lib/domains/ca/cshawi.txt
@@ -0,0 +1 @@
+CEGEP Shawinigan
diff --git a/lib/domains/ch/educanet2/bzbuchs.txt b/lib/domains/ch/bzbuchs.txt
similarity index 100%
rename from lib/domains/ch/educanet2/bzbuchs.txt
rename to lib/domains/ch/bzbuchs.txt
diff --git a/lib/domains/ch/educanet2/bbzbiel.txt b/lib/domains/ch/educanet2/bbzbiel.txt
new file mode 100644
index 0000000000..d2c6d4022a
--- /dev/null
+++ b/lib/domains/ch/educanet2/bbzbiel.txt
@@ -0,0 +1 @@
+BBZ - Berufsbildungszentrum Biel-Bienne
\ No newline at end of file
diff --git a/lib/domains/ch/kbzsg.txt b/lib/domains/ch/kbzsg.txt
new file mode 100644
index 0000000000..3e06213157
--- /dev/null
+++ b/lib/domains/ch/kbzsg.txt
@@ -0,0 +1,3 @@
+KBZ
+KBZSG
+St.Gallen 9000
diff --git a/lib/domains/ch/kks/stud.txt b/lib/domains/ch/kks/stud.txt
new file mode 100644
index 0000000000..22e2b8ef6d
--- /dev/null
+++ b/lib/domains/ch/kks/stud.txt
@@ -0,0 +1 @@
+Kantonsschule Kollegium Schwyz
\ No newline at end of file
diff --git a/lib/domains/co/cyberacademy.txt b/lib/domains/co/cyberacademy.txt
new file mode 100644
index 0000000000..be4c215d44
--- /dev/null
+++ b/lib/domains/co/cyberacademy.txt
@@ -0,0 +1 @@
+Cyber Academy
diff --git a/lib/domains/co/edu/upc.txt b/lib/domains/co/edu/upc.txt
new file mode 100644
index 0000000000..3f51d841e8
--- /dev/null
+++ b/lib/domains/co/edu/upc.txt
@@ -0,0 +1 @@
+Universidad Piloto de Colombia Students email
diff --git a/lib/domains/com/cev.txt b/lib/domains/com/cev.txt
new file mode 100644
index 0000000000..cbb0d6ba40
--- /dev/null
+++ b/lib/domains/com/cev.txt
@@ -0,0 +1 @@
+CEV
diff --git a/lib/domains/com/eu/sabi.txt b/lib/domains/com/eu/sabi.txt
deleted file mode 100644
index f29c0d60c3..0000000000
--- a/lib/domains/com/eu/sabi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Scandinavian Art and Business Institute
diff --git a/lib/domains/com/haringtonschool.txt b/lib/domains/com/haringtonschool.txt
new file mode 100644
index 0000000000..abc43efa28
--- /dev/null
+++ b/lib/domains/com/haringtonschool.txt
@@ -0,0 +1 @@
+Harrington School
\ No newline at end of file
diff --git a/lib/domains/com/onmicrosoft/mylifeunisaac.txt b/lib/domains/com/onmicrosoft/mylifeunisaac.txt
new file mode 100644
index 0000000000..bbef07d6b2
--- /dev/null
+++ b/lib/domains/com/onmicrosoft/mylifeunisaac.txt
@@ -0,0 +1 @@
+University of South Africa
diff --git a/lib/domains/cz/g8mb.txt b/lib/domains/cz/g8mb.txt
new file mode 100644
index 0000000000..7932508188
--- /dev/null
+++ b/lib/domains/cz/g8mb.txt
@@ -0,0 +1 @@
+GYMNÁZIUM, MLADÁ BOLESLAV, PALACKÉHO 191/1
diff --git a/lib/domains/de/bbs-stadthagen.txt b/lib/domains/de/bbs-stadthagen.txt
new file mode 100644
index 0000000000..b3adfd4801
--- /dev/null
+++ b/lib/domains/de/bbs-stadthagen.txt
@@ -0,0 +1,2 @@
+Berufsbildende Schule Stadthagen
+vocational schools Stadthagen
diff --git a/lib/domains/de/bbssth.txt b/lib/domains/de/bbssth.txt
new file mode 100644
index 0000000000..b3adfd4801
--- /dev/null
+++ b/lib/domains/de/bbssth.txt
@@ -0,0 +1,2 @@
+Berufsbildende Schule Stadthagen
+vocational schools Stadthagen
diff --git a/lib/domains/de/bbssth/students.txt b/lib/domains/de/bbssth/students.txt
new file mode 100644
index 0000000000..b3adfd4801
--- /dev/null
+++ b/lib/domains/de/bbssth/students.txt
@@ -0,0 +1,2 @@
+Berufsbildende Schule Stadthagen
+vocational schools Stadthagen
diff --git a/lib/domains/de/monte-koeln.txt b/lib/domains/de/monte-koeln.txt
new file mode 100755
index 0000000000..24bce7074a
--- /dev/null
+++ b/lib/domains/de/monte-koeln.txt
@@ -0,0 +1 @@
+Montessori Gymnasium Köln
\ No newline at end of file
diff --git a/lib/domains/de/oegym.txt b/lib/domains/de/oegym.txt
new file mode 100644
index 0000000000..df2150536d
--- /dev/null
+++ b/lib/domains/de/oegym.txt
@@ -0,0 +1 @@
+Ökumenisches Gymnasium zu Bremen
diff --git a/lib/domains/it/unipi/studenti.txt b/lib/domains/it/unipi/studenti.txt
new file mode 100644
index 0000000000..8c2e84ab95
--- /dev/null
+++ b/lib/domains/it/unipi/studenti.txt
@@ -0,0 +1,2 @@
+Università di Pisa
+University of Pisa
\ No newline at end of file
diff --git a/lib/domains/jp/ac/tsukuba.txt b/lib/domains/jp/ac/tsukuba.txt
new file mode 100644
index 0000000000..5e0b1fc3dc
--- /dev/null
+++ b/lib/domains/jp/ac/tsukuba.txt
@@ -0,0 +1 @@
+University of Tsukuba
diff --git a/lib/domains/kr/hs/e-mirim.txt b/lib/domains/kr/hs/e-mirim.txt
new file mode 100644
index 0000000000..20d3c7b352
--- /dev/null
+++ b/lib/domains/kr/hs/e-mirim.txt
@@ -0,0 +1 @@
+Mirim Meister Highschool
diff --git a/lib/domains/net/samsmu.txt b/lib/domains/net/samsmu.txt
deleted file mode 100644
index 71c7c90c23..0000000000
--- a/lib/domains/net/samsmu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Samara State Medical University
diff --git a/lib/domains/ng/edu/aaua.txt b/lib/domains/ng/edu/aaua.txt
new file mode 100644
index 0000000000..026b2280ed
--- /dev/null
+++ b/lib/domains/ng/edu/aaua.txt
@@ -0,0 +1 @@
+Adekunle Ajasin University, Akungba-Akoko
\ No newline at end of file
diff --git a/lib/domains/ng/edu/basug.txt b/lib/domains/ng/edu/basug.txt
new file mode 100644
index 0000000000..4fbd6c4269
--- /dev/null
+++ b/lib/domains/ng/edu/basug.txt
@@ -0,0 +1 @@
+Bauchi State University Gadau
diff --git a/lib/domains/ng/edu/fideipoly.txt b/lib/domains/ng/edu/fideipoly.txt
new file mode 100644
index 0000000000..62c59b5f08
--- /dev/null
+++ b/lib/domains/ng/edu/fideipoly.txt
@@ -0,0 +1 @@
+Fidei Polytechnic Gboko, Benue state, Nigeria
diff --git a/lib/domains/nz/school/lynfield.txt b/lib/domains/nz/school/lynfield.txt
new file mode 100755
index 0000000000..fc027a9501
--- /dev/null
+++ b/lib/domains/nz/school/lynfield.txt
@@ -0,0 +1 @@
+Lynfield College
diff --git a/lib/domains/org/ccchs.txt b/lib/domains/org/ccchs.txt
new file mode 100644
index 0000000000..069798946d
--- /dev/null
+++ b/lib/domains/org/ccchs.txt
@@ -0,0 +1,3 @@
+Clearwater Central Catholic High School
+Clearwater Central Catholic
+CCC
\ No newline at end of file
diff --git a/lib/domains/org/hopedaleschools.txt b/lib/domains/org/hopedaleschools.txt
new file mode 100755
index 0000000000..ae90817a71
--- /dev/null
+++ b/lib/domains/org/hopedaleschools.txt
@@ -0,0 +1 @@
+Hopedale Jr. Sr. High School
\ No newline at end of file
diff --git a/lib/domains/org/horizoncolumbus.txt b/lib/domains/org/horizoncolumbus.txt
new file mode 100644
index 0000000000..b5fc66bd27
--- /dev/null
+++ b/lib/domains/org/horizoncolumbus.txt
@@ -0,0 +1 @@
+Horizon Science Academy Columbus High School
diff --git a/lib/domains/org/ieselescorial.txt b/lib/domains/org/ieselescorial.txt
new file mode 100644
index 0000000000..d68e3336ec
--- /dev/null
+++ b/lib/domains/org/ieselescorial.txt
@@ -0,0 +1,2 @@
+IES El Escorial
+El Escorial High School
\ No newline at end of file
diff --git a/lib/domains/org/mlschools.txt b/lib/domains/org/mlschools.txt
new file mode 100644
index 0000000000..a343775e40
--- /dev/null
+++ b/lib/domains/org/mlschools.txt
@@ -0,0 +1 @@
+Mountain Lakes High School
diff --git a/lib/domains/org/pwcs-edu.txt b/lib/domains/org/pwcs-edu.txt
new file mode 100755
index 0000000000..4ea84c3742
--- /dev/null
+++ b/lib/domains/org/pwcs-edu.txt
@@ -0,0 +1,2 @@
+Patriot High School - Prince William County, VA USA
+https://patrioths.pwcs.edu/
\ No newline at end of file
diff --git a/lib/domains/org/svvsd.txt b/lib/domains/org/svvsd.txt
new file mode 100644
index 0000000000..b602adc113
--- /dev/null
+++ b/lib/domains/org/svvsd.txt
@@ -0,0 +1 @@
+Niwot High School
diff --git a/lib/domains/org/u-46.txt b/lib/domains/org/u-46.txt
new file mode 100644
index 0000000000..882eb79969
--- /dev/null
+++ b/lib/domains/org/u-46.txt
@@ -0,0 +1,2 @@
+School District U-46
+School District U-46
\ No newline at end of file
diff --git a/lib/domains/org/waukeeschools.txt b/lib/domains/org/waukeeschools.txt
new file mode 100644
index 0000000000..d22bf3d077
--- /dev/null
+++ b/lib/domains/org/waukeeschools.txt
@@ -0,0 +1 @@
+Waukee Community School District
\ No newline at end of file
diff --git a/lib/domains/ru/oksei.txt b/lib/domains/ru/oksei.txt
new file mode 100644
index 0000000000..c59cac5db6
--- /dev/null
+++ b/lib/domains/ru/oksei.txt
@@ -0,0 +1,2 @@
+ГАПОУ "Оренбургский колледж экономики и информатики"
+Orenburg College of Economics and Informatics
diff --git a/lib/domains/ru/spsu.txt b/lib/domains/ru/spsu.txt
new file mode 100644
index 0000000000..29d53a0a97
--- /dev/null
+++ b/lib/domains/ru/spsu.txt
@@ -0,0 +1,2 @@
+ПГУ им. Т.Г. Шевченко
+SPSU
\ No newline at end of file
diff --git a/lib/domains/se/plushogskolan.txt b/lib/domains/se/plushogskolan.txt
new file mode 100644
index 0000000000..438591dcde
--- /dev/null
+++ b/lib/domains/se/plushogskolan.txt
@@ -0,0 +1 @@
+Plushögskolan Higher Vocational Education school
diff --git a/lib/domains/se/wendelahebbegymnasiet.txt b/lib/domains/se/wendelahebbegymnasiet.txt
new file mode 100644
index 0000000000..f07a6571b4
--- /dev/null
+++ b/lib/domains/se/wendelahebbegymnasiet.txt
@@ -0,0 +1 @@
+Wendela Hebbegymnasiet
\ No newline at end of file
diff --git a/lib/domains/ua/edu/onmedu.txt b/lib/domains/ua/edu/onmedu.txt
new file mode 100644
index 0000000000..fba15ce609
--- /dev/null
+++ b/lib/domains/ua/edu/onmedu.txt
@@ -0,0 +1 @@
+Odessa National Medical University
diff --git a/lib/domains/uk/ac/kedst.txt b/lib/domains/uk/ac/kedst.txt
new file mode 100644
index 0000000000..9fc8d5c82a
--- /dev/null
+++ b/lib/domains/uk/ac/kedst.txt
@@ -0,0 +1 @@
+King Edward VI College
diff --git a/lib/domains/uk/ac/nescol.txt b/lib/domains/uk/ac/nescol.txt
new file mode 100644
index 0000000000..c6839cdbfa
--- /dev/null
+++ b/lib/domains/uk/ac/nescol.txt
@@ -0,0 +1 @@
+North East Scotland College
diff --git a/lib/domains/uk/co/saintsa.txt b/lib/domains/uk/co/saintsa.txt
new file mode 100644
index 0000000000..11e66c3ed4
--- /dev/null
+++ b/lib/domains/uk/co/saintsa.txt
@@ -0,0 +1 @@
+Saint Augustine's Catholic High School
\ No newline at end of file
diff --git a/lib/domains/us/nj/k12/gtps.txt b/lib/domains/us/nj/k12/gtps.txt
new file mode 100644
index 0000000000..efd433b0dc
--- /dev/null
+++ b/lib/domains/us/nj/k12/gtps.txt
@@ -0,0 +1 @@
+Galloway Township Public Schools
\ No newline at end of file