diff --git a/.gitignore b/.gitignore
index 15ce2fd0..2fb07465 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ pom.xml.asc
 /.lein-*
 /.nrepl-port
 /doc
+
+.DS_Store
diff --git a/resources/domains/at/htlkrems.txt b/resources/domains/at/htlkrems.txt
new file mode 100644
index 00000000..7951b6ac
--- /dev/null
+++ b/resources/domains/at/htlkrems.txt
@@ -0,0 +1 @@
+HTL Krems
diff --git a/resources/domains/br/com/impacta.txt b/resources/domains/br/com/impacta.txt
new file mode 100644
index 00000000..27e2e56b
--- /dev/null
+++ b/resources/domains/br/com/impacta.txt
@@ -0,0 +1 @@
+Faculdade Impacta Tecnologia
\ No newline at end of file
diff --git a/resources/domains/br/edu/iesb.txt b/resources/domains/br/edu/iesb.txt
new file mode 100644
index 00000000..cc5a7bfb
--- /dev/null
+++ b/resources/domains/br/edu/iesb.txt
@@ -0,0 +1 @@
+Centro Universitario IESB
\ No newline at end of file
diff --git a/resources/domains/br/edu/utfpr.txt b/resources/domains/br/edu/utfpr.txt
new file mode 100644
index 00000000..cbcd4b17
--- /dev/null
+++ b/resources/domains/br/edu/utfpr.txt
@@ -0,0 +1 @@
+Universidade Tecnológica Federal do Paraná
\ No newline at end of file
diff --git a/resources/domains/br/univates.txt b/resources/domains/br/univates.txt
new file mode 100644
index 00000000..607c45c0
--- /dev/null
+++ b/resources/domains/br/univates.txt
@@ -0,0 +1 @@
+Centro Universitário Univates
diff --git a/resources/domains/ca/cegepdrummond.txt b/resources/domains/ca/cegepdrummond.txt
new file mode 100644
index 00000000..659c94aa
--- /dev/null
+++ b/resources/domains/ca/cegepdrummond.txt
@@ -0,0 +1 @@
+Cégep de Drummondville
diff --git a/resources/domains/ch/fmi.txt b/resources/domains/ch/fmi.txt
new file mode 100644
index 00000000..b1e7f237
--- /dev/null
+++ b/resources/domains/ch/fmi.txt
@@ -0,0 +1 @@
+Friedrich Miescher Institute for Biomedical Research
diff --git a/resources/domains/cn/edu/nuc.txt b/resources/domains/cn/edu/nuc.txt
new file mode 100644
index 00000000..4df2b710
--- /dev/null
+++ b/resources/domains/cn/edu/nuc.txt
@@ -0,0 +1 @@
+North University of China
diff --git a/resources/domains/com/alustudent.txt b/resources/domains/com/alustudent.txt
new file mode 100644
index 00000000..5e6f0b3a
--- /dev/null
+++ b/resources/domains/com/alustudent.txt
@@ -0,0 +1 @@
+African Leadership University
diff --git a/resources/domains/com/isi-mtl.txt b/resources/domains/com/isi-mtl.txt
new file mode 100644
index 00000000..3dae94e2
--- /dev/null
+++ b/resources/domains/com/isi-mtl.txt
@@ -0,0 +1 @@
+Institut superieur d'informatique
\ No newline at end of file
diff --git a/resources/domains/com/thegameassembly.txt b/resources/domains/com/thegameassembly.txt
new file mode 100644
index 00000000..cdb6de2b
--- /dev/null
+++ b/resources/domains/com/thegameassembly.txt
@@ -0,0 +1 @@
+The Game Assembly
diff --git a/resources/domains/com/vanarts.txt b/resources/domains/com/vanarts.txt
new file mode 100644
index 00000000..d038da5b
--- /dev/null
+++ b/resources/domains/com/vanarts.txt
@@ -0,0 +1 @@
+Vancouver Institute of Media Arts
diff --git a/resources/domains/com/vlerick/edu.txt b/resources/domains/com/vlerick/edu.txt
new file mode 100644
index 00000000..06ff543f
--- /dev/null
+++ b/resources/domains/com/vlerick/edu.txt
@@ -0,0 +1 @@
+Vlerick Business School
diff --git a/resources/domains/cz/mg-akademie.txt b/resources/domains/cz/mg-akademie.txt
new file mode 100644
index 00000000..ba3b9e92
--- /dev/null
+++ b/resources/domains/cz/mg-akademie.txt
@@ -0,0 +1 @@
+SOŠ Manažerská Akademie
\ No newline at end of file
diff --git a/resources/domains/de/fh-brandenburg.txt b/resources/domains/de/fh-brandenburg.txt
index 6b8bdf97..d6d62516 100644
--- a/resources/domains/de/fh-brandenburg.txt
+++ b/resources/domains/de/fh-brandenburg.txt
@@ -1 +1 @@
-Fachhochschule Brandenburg
+Technische Hochschule Brandenburg
diff --git a/resources/domains/de/hawk-hhg.txt b/resources/domains/de/hawk-hhg.txt
new file mode 100644
index 00000000..68f7adc0
--- /dev/null
+++ b/resources/domains/de/hawk-hhg.txt
@@ -0,0 +1 @@
+Hochschule für angewandte Wissenschaft und Kunst - Hildesheim/Holzminden/Göttingen
diff --git a/resources/domains/de/mm-bbs.txt b/resources/domains/de/mm-bbs.txt
new file mode 100644
index 00000000..0f177223
--- /dev/null
+++ b/resources/domains/de/mm-bbs.txt
@@ -0,0 +1 @@
+Multi-Media Berufsbildende Schulen - Hannover
diff --git a/resources/domains/de/th-brandenburg.txt b/resources/domains/de/th-brandenburg.txt
new file mode 100644
index 00000000..d6d62516
--- /dev/null
+++ b/resources/domains/de/th-brandenburg.txt
@@ -0,0 +1 @@
+Technische Hochschule Brandenburg
diff --git a/resources/domains/dz/univ-constantine2.txt b/resources/domains/dz/univ-constantine2.txt
new file mode 100644
index 00000000..453d0966
--- /dev/null
+++ b/resources/domains/dz/univ-constantine2.txt
@@ -0,0 +1 @@
+Université Constantine 2 Abdelhamid Mehri
diff --git a/resources/domains/edu/vccs.txt b/resources/domains/edu/vccs.txt
new file mode 100644
index 00000000..b3b12ba3
--- /dev/null
+++ b/resources/domains/edu/vccs.txt
@@ -0,0 +1 @@
+Virginia's Community Colleges
diff --git a/resources/domains/edu/wpi.txt b/resources/domains/edu/wpi.txt
new file mode 100644
index 00000000..26ed32a0
--- /dev/null
+++ b/resources/domains/edu/wpi.txt
@@ -0,0 +1 @@
+Worcester Polytechnic Institute
diff --git a/resources/domains/fi/mamk.txt b/resources/domains/fi/mamk.txt
new file mode 100644
index 00000000..f88cebb1
--- /dev/null
+++ b/resources/domains/fi/mamk.txt
@@ -0,0 +1 @@
+Mikkeli University of Applied Sciences
diff --git a/resources/domains/fr/aege.txt b/resources/domains/fr/aege.txt
new file mode 100644
index 00000000..72960c0d
--- /dev/null
+++ b/resources/domains/fr/aege.txt
@@ -0,0 +1 @@
+École de Guerre Économique
diff --git a/resources/domains/fr/esigetel.txt b/resources/domains/fr/esigetel.txt
new file mode 100644
index 00000000..3d0439c0
--- /dev/null
+++ b/resources/domains/fr/esigetel.txt
@@ -0,0 +1 @@
+Ecole d’ingénieur généraliste en systèmes numériques & objets communicants
diff --git a/resources/domains/fr/etu-webschoolfactory.txt b/resources/domains/fr/etu-webschoolfactory.txt
new file mode 100644
index 00000000..1522e140
--- /dev/null
+++ b/resources/domains/fr/etu-webschoolfactory.txt
@@ -0,0 +1 @@
+Web School Factory
diff --git a/resources/domains/fr/iae-toulouse.txt b/resources/domains/fr/iae-toulouse.txt
new file mode 100644
index 00000000..849dc3c0
--- /dev/null
+++ b/resources/domains/fr/iae-toulouse.txt
@@ -0,0 +1 @@
+Institut d'Administration des Entreprises de Toulouse
diff --git a/resources/domains/fr/u-pem/etud.txt b/resources/domains/fr/u-pem/etud.txt
new file mode 100644
index 00000000..db21a611
--- /dev/null
+++ b/resources/domains/fr/u-pem/etud.txt
@@ -0,0 +1 @@
+Université Paris-Est Marne-la-Vallée
\ No newline at end of file
diff --git a/resources/domains/gr/diekgalatsiou.txt b/resources/domains/gr/diekgalatsiou.txt
new file mode 100644
index 00000000..1c7120bf
--- /dev/null
+++ b/resources/domains/gr/diekgalatsiou.txt
@@ -0,0 +1 @@
+diekgalatsiou
diff --git a/resources/domains/hr/gradst.txt b/resources/domains/hr/gradst.txt
new file mode 100644
index 00000000..a19e4c15
--- /dev/null
+++ b/resources/domains/hr/gradst.txt
@@ -0,0 +1 @@
+University of Split Faculty of Civil Engineering, Architecture and Geodesy
diff --git a/resources/domains/hu/bme.txt b/resources/domains/hu/bme.txt
index 0d4f1180..46098613 100644
--- a/resources/domains/hu/bme.txt
+++ b/resources/domains/hu/bme.txt
@@ -1 +1 @@
-Technical University of Budapest
+Budapest University of Technology and Economics
diff --git a/resources/domains/in/ac/jmi.txt b/resources/domains/in/ac/jmi.txt
new file mode 100644
index 00000000..6556b081
--- /dev/null
+++ b/resources/domains/in/ac/jmi.txt
@@ -0,0 +1 @@
+Jamia Milia Islamia University
diff --git a/resources/domains/in/ac/sicsr.txt b/resources/domains/in/ac/sicsr.txt
new file mode 100644
index 00000000..d8c092e8
--- /dev/null
+++ b/resources/domains/in/ac/sicsr.txt
@@ -0,0 +1 @@
+Symbiosis Institute of Computer Studies and Research
diff --git a/resources/domains/in/ac/symbiosis.txt b/resources/domains/in/ac/symbiosis.txt
new file mode 100644
index 00000000..dbbe2ce9
--- /dev/null
+++ b/resources/domains/in/ac/symbiosis.txt
@@ -0,0 +1 @@
+Symbiosis International University
diff --git a/resources/domains/in/edu/nitk.txt b/resources/domains/in/edu/nitk.txt
new file mode 100644
index 00000000..72178f03
--- /dev/null
+++ b/resources/domains/in/edu/nitk.txt
@@ -0,0 +1 @@
+National Institute of Technology Karnataka
diff --git a/resources/domains/info/diit.txt b/resources/domains/info/diit.txt
new file mode 100644
index 00000000..24814de6
--- /dev/null
+++ b/resources/domains/info/diit.txt
@@ -0,0 +1 @@
+Daffodil Institue of IT
diff --git a/resources/domains/kr/chosun.txt b/resources/domains/kr/chosun.txt
new file mode 100644
index 00000000..bd87301c
--- /dev/null
+++ b/resources/domains/kr/chosun.txt
@@ -0,0 +1 @@
+Chosun University
diff --git a/resources/domains/lk/nibm.txt b/resources/domains/lk/nibm.txt
new file mode 100644
index 00000000..3aa5679f
--- /dev/null
+++ b/resources/domains/lk/nibm.txt
@@ -0,0 +1 @@
+National Institute of Business Management
diff --git a/resources/domains/lt/kvk.txt b/resources/domains/lt/kvk.txt
new file mode 100644
index 00000000..4c228aae
--- /dev/null
+++ b/resources/domains/lt/kvk.txt
@@ -0,0 +1 @@
+Klaipėda State College
diff --git a/resources/domains/md/asm.txt b/resources/domains/md/asm.txt
new file mode 100644
index 00000000..a2f50faf
--- /dev/null
+++ b/resources/domains/md/asm.txt
@@ -0,0 +1 @@
+Academy of Sciences of Moldova
diff --git a/resources/domains/ng/edu/cu.txt b/resources/domains/ng/edu/cu.txt
new file mode 100644
index 00000000..10fcb8e2
--- /dev/null
+++ b/resources/domains/ng/edu/cu.txt
@@ -0,0 +1 @@
+Covenant University
\ No newline at end of file
diff --git a/resources/domains/ng/edu/fcahptib.txt b/resources/domains/ng/edu/fcahptib.txt
new file mode 100644
index 00000000..587ff572
--- /dev/null
+++ b/resources/domains/ng/edu/fcahptib.txt
@@ -0,0 +1 @@
+Federal College of Animal Health & Production Technology Ibadan
\ No newline at end of file
diff --git a/resources/domains/ng/edu/ui.txt b/resources/domains/ng/edu/ui.txt
new file mode 100644
index 00000000..75b62802
--- /dev/null
+++ b/resources/domains/ng/edu/ui.txt
@@ -0,0 +1 @@
+University of Ibadan
diff --git a/resources/domains/ng/edu/uniosun.txt b/resources/domains/ng/edu/uniosun.txt
new file mode 100644
index 00000000..895b60c7
--- /dev/null
+++ b/resources/domains/ng/edu/uniosun.txt
@@ -0,0 +1 @@
+Osun State University
diff --git a/resources/domains/nl/cibap.txt b/resources/domains/nl/cibap.txt
new file mode 100644
index 00000000..bbd87cfa
--- /dev/null
+++ b/resources/domains/nl/cibap.txt
@@ -0,0 +1 @@
+Cibap vakschool voor verbeelding
diff --git a/resources/domains/nl/rocfriesepoort/edu.txt b/resources/domains/nl/rocfriesepoort/edu.txt
new file mode 100644
index 00000000..140277b7
--- /dev/null
+++ b/resources/domains/nl/rocfriesepoort/edu.txt
@@ -0,0 +1 @@
+ROC Friese Poort
\ No newline at end of file
diff --git a/resources/domains/no/nord.txt b/resources/domains/no/nord.txt
new file mode 100644
index 00000000..2a60ea15
--- /dev/null
+++ b/resources/domains/no/nord.txt
@@ -0,0 +1 @@
+Nord University
diff --git a/resources/domains/org/allenisd/student.txt b/resources/domains/org/allenisd/student.txt
new file mode 100644
index 00000000..544541b5
--- /dev/null
+++ b/resources/domains/org/allenisd/student.txt
@@ -0,0 +1 @@
+Allen Independent School District
diff --git a/resources/domains/org/gniindia.txt b/resources/domains/org/gniindia.txt
new file mode 100644
index 00000000..f004fdad
--- /dev/null
+++ b/resources/domains/org/gniindia.txt
@@ -0,0 +1 @@
+Guru Nanak Institutions
diff --git a/resources/domains/org/hhmi.txt b/resources/domains/org/hhmi.txt
new file mode 100644
index 00000000..c1a8a885
--- /dev/null
+++ b/resources/domains/org/hhmi.txt
@@ -0,0 +1 @@
+Howard Hughes Medical Institute
diff --git a/resources/domains/org/ibsindia.txt b/resources/domains/org/ibsindia.txt
new file mode 100644
index 00000000..ca4f35c3
--- /dev/null
+++ b/resources/domains/org/ibsindia.txt
@@ -0,0 +1 @@
+ICFAI Business School, India
diff --git a/resources/domains/org/ieslosremedios.txt b/resources/domains/org/ieslosremedios.txt
new file mode 100644
index 00000000..20df4061
--- /dev/null
+++ b/resources/domains/org/ieslosremedios.txt
@@ -0,0 +1 @@
+IES Nuestra Señora de los Remedios
diff --git a/resources/domains/org/iesmontsia.txt b/resources/domains/org/iesmontsia.txt
new file mode 100644
index 00000000..78fbfe78
--- /dev/null
+++ b/resources/domains/org/iesmontsia.txt
@@ -0,0 +1 @@
+iesmontsia
diff --git a/resources/domains/org/nbkrist.txt b/resources/domains/org/nbkrist.txt
new file mode 100644
index 00000000..132f6316
--- /dev/null
+++ b/resources/domains/org/nbkrist.txt
@@ -0,0 +1 @@
+N.B.K.R. Institute Of Science & Technology
diff --git a/resources/domains/org/poornima.txt b/resources/domains/org/poornima.txt
new file mode 100644
index 00000000..c2440974
--- /dev/null
+++ b/resources/domains/org/poornima.txt
@@ -0,0 +1 @@
+Poornima College Of Engineering
diff --git a/resources/domains/pl/edu/ug.txt b/resources/domains/pl/edu/ug.txt
new file mode 100644
index 00000000..e2b3f059
--- /dev/null
+++ b/resources/domains/pl/edu/ug.txt
@@ -0,0 +1 @@
+University of Gdansk
diff --git a/resources/domains/pl/koszalin.txt b/resources/domains/pl/koszalin.txt
deleted file mode 100644
index 506fda6e..00000000
--- a/resources/domains/pl/koszalin.txt
+++ /dev/null
@@ -1 +0,0 @@
-Technical University of Koszalin
diff --git a/resources/domains/pl/lodz.txt b/resources/domains/pl/lodz.txt
deleted file mode 100644
index e0f7cb44..00000000
--- a/resources/domains/pl/lodz.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Lodz
diff --git a/resources/domains/pl/qdnet.txt b/resources/domains/pl/qdnet.txt
deleted file mode 100644
index 41a48dad..00000000
--- a/resources/domains/pl/qdnet.txt
+++ /dev/null
@@ -1 +0,0 @@
-Christian Theological Academy in Warszaw
diff --git a/resources/domains/pl/tarnow.txt b/resources/domains/pl/tarnow.txt
deleted file mode 100644
index 2391f583..00000000
--- a/resources/domains/pl/tarnow.txt
+++ /dev/null
@@ -1 +0,0 @@
-Higher School o Business in Tarnow
diff --git a/resources/domains/ru/gpi.txt b/resources/domains/ru/gpi.txt
new file mode 100644
index 00000000..7f7f9f08
--- /dev/null
+++ b/resources/domains/ru/gpi.txt
@@ -0,0 +1 @@
+Prokhorov General Physics Institute
diff --git a/resources/domains/ru/miet/edu.txt b/resources/domains/ru/miet/edu.txt
new file mode 100644
index 00000000..acb8aa9f
--- /dev/null
+++ b/resources/domains/ru/miet/edu.txt
@@ -0,0 +1 @@
+National Research University of Electronic Technology (MIET)
diff --git a/resources/domains/se/danderyd/dagy.txt b/resources/domains/se/danderyd/dagy.txt
new file mode 100644
index 00000000..21f4e4a5
--- /dev/null
+++ b/resources/domains/se/danderyd/dagy.txt
@@ -0,0 +1 @@
+Danderyds gymnasium
diff --git a/resources/domains/tn/enis.txt b/resources/domains/tn/enis.txt
new file mode 100644
index 00000000..537f1a88
--- /dev/null
+++ b/resources/domains/tn/enis.txt
@@ -0,0 +1 @@
+Ecole Nationale d'Ingénieurs de Sfax
diff --git a/resources/domains/tn/uma/ensi.txt b/resources/domains/tn/uma/ensi.txt
new file mode 100644
index 00000000..5446fcee
--- /dev/null
+++ b/resources/domains/tn/uma/ensi.txt
@@ -0,0 +1 @@
+National School of Computer Science
diff --git a/resources/domains/ua/km/khnu.txt b/resources/domains/ua/km/khnu.txt
new file mode 100644
index 00000000..ed17d80c
--- /dev/null
+++ b/resources/domains/ua/km/khnu.txt
@@ -0,0 +1 @@
+Khmelnitsky National University
diff --git a/resources/domains/uk/ac/aber.txt b/resources/domains/uk/ac/aber.txt
index dbd6e216..e0aa4349 100644
--- a/resources/domains/uk/ac/aber.txt
+++ b/resources/domains/uk/ac/aber.txt
@@ -1 +1 @@
-University of Wales, Aberystwyth
+Aberystwyth University
diff --git a/resources/domains/uk/ac/belfastmet/student.txt b/resources/domains/uk/ac/belfastmet.txt
similarity index 100%
rename from resources/domains/uk/ac/belfastmet/student.txt
rename to resources/domains/uk/ac/belfastmet.txt
diff --git a/resources/domains/uk/ac/plymouth.txt b/resources/domains/uk/ac/plymouth.txt
index 78eb2413..b0cc069d 100644
--- a/resources/domains/uk/ac/plymouth.txt
+++ b/resources/domains/uk/ac/plymouth.txt
@@ -1 +1 @@
-University of Plymouth
+Plymouth University
diff --git a/resources/domains/za/edu/pctraining/students.txt b/resources/domains/za/edu/pctraining/students.txt
new file mode 100644
index 00000000..98a82b2a
--- /dev/null
+++ b/resources/domains/za/edu/pctraining/students.txt
@@ -0,0 +1 @@
+Richfield Graduate Institute of Technology