diff --git a/.gitignore b/.gitignore
index 7d7117184d..a03446d05c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 Gemfile.lock
 *.gem
 .bundle
+.idea
diff --git a/.idea/runConfigurations/Build_Swot.xml b/.idea/runConfigurations/Build_Swot.xml
index 6d18a16105..04fa6e7553 100644
--- a/.idea/runConfigurations/Build_Swot.xml
+++ b/.idea/runConfigurations/Build_Swot.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build Swot" type="JetRunConfigurationType" factoryName="Kotlin">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="swot.SwotPackage" />
+    <option name="MAIN_CLASS_NAME" value="swot.CompilerKt" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="ALTERNATIVE_JRE_PATH" value="" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <module name="swot" />
     <envs />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 275077f825..830674470f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c0dd2394e3..40dd3c412b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@
 * The directories are nested to match domain parts, starting with the [TLD](http://en.wikipedia.org/wiki/Top-level_domain) (Top Level Domain), then [SLDs](http://en.wikipedia.org/wiki/Second-level_domain) (Second Level Domains) beneath them, etc.
 * There's a text file named after the school's domain, nested below the appropriate directory, e.g. `strath.ac.uk` would be listed as `lib/domains/uk/ac/strath.txt`.
 * The contents of that file are simply the school name, e.g. `University of Strathclyde`.
-* The [working example for University of Strathclyde](https://github.com/leereilly/swot/blob/master/lib/domains/uk/ac/strath.txt) :eyes:
+* The [working example for University of Strathclyde](https://github.com/jetbrains/swot/blob/master/lib/domains/uk/ac/strath.txt) :eyes:
 * Here's what the data structure looks like:
 
 ```
@@ -22,7 +22,7 @@
 
 ##### Adding a School
 
-Let's say you want to add the [Stanford University](http://www.stanford.edu/). We'd simply create a file at `lib/domains/edu/stanford.txt` containing the text `Stanford University`. You can safely ignores subdomain like `www`, `cis`, whatever. You can see the actual file [here](https://github.com/leereilly/swot/blob/master/lib/domains/edu/stanford.txt).
+Let's say you want to add the [Stanford University](http://www.stanford.edu/). We'd simply create a file at `lib/domains/edu/stanford.txt` containing the text `Stanford University`. You can safely ignores subdomain like `www`, `cis`, whatever. You can see the actual file [here](https://github.com/jetbrains/swot/blob/master/lib/domains/edu/stanford.txt).
 
 #### Updating a School Name
 
diff --git a/lib/domains/ae/biticrak.txt b/lib/domains/ae/biticrak.txt
new file mode 100644
index 0000000000..a246fcfb3d
--- /dev/null
+++ b/lib/domains/ae/biticrak.txt
@@ -0,0 +1 @@
+Birla Institute of Technology, International Campus
diff --git a/lib/domains/al/edu/fshn.txt b/lib/domains/al/edu/fshn.txt
new file mode 100644
index 0000000000..1c6a0e8a1b
--- /dev/null
+++ b/lib/domains/al/edu/fshn.txt
@@ -0,0 +1 @@
+Faculty of Natural Sciences at University of Tirana
diff --git a/lib/domains/am/ysumail.txt b/lib/domains/am/ysumail.txt
new file mode 100644
index 0000000000..49bd73b736
--- /dev/null
+++ b/lib/domains/am/ysumail.txt
@@ -0,0 +1 @@
+Yerevan State University
diff --git a/lib/domains/at/hakspittal.txt b/lib/domains/at/hakspittal.txt
new file mode 100644
index 0000000000..326dd8883b
--- /dev/null
+++ b/lib/domains/at/hakspittal.txt
@@ -0,0 +1 @@
+HAK Spittal
diff --git a/lib/domains/at/htl-hallein.txt b/lib/domains/at/htl-hallein.txt
new file mode 100644
index 0000000000..dfba8d3a08
--- /dev/null
+++ b/lib/domains/at/htl-hallein.txt
@@ -0,0 +1 @@
+HTBLA Hallein
diff --git a/lib/domains/at/htldornbirn.txt b/lib/domains/at/htldornbirn.txt
new file mode 100644
index 0000000000..1b2b0d5337
--- /dev/null
+++ b/lib/domains/at/htldornbirn.txt
@@ -0,0 +1 @@
+HTL Dornbirn
\ No newline at end of file
diff --git a/lib/domains/at/lichtenfels.txt b/lib/domains/at/lichtenfels.txt
new file mode 100644
index 0000000000..ef560e8f87
--- /dev/null
+++ b/lib/domains/at/lichtenfels.txt
@@ -0,0 +1 @@
+BG/BRG Lichtenfels Graz
diff --git a/lib/domains/at/tsn.txt b/lib/domains/at/tsn.txt
new file mode 100644
index 0000000000..1b22a30a23
--- /dev/null
+++ b/lib/domains/at/tsn.txt
@@ -0,0 +1 @@
+Schulen des Tiroler Schulnetzes https://www.dvt.at/services/tsn-tiroler-schulnetz/
diff --git a/lib/domains/au/edu/tas/education.txt b/lib/domains/au/edu/tas/education.txt
new file mode 100644
index 0000000000..aa07f0f5e2
--- /dev/null
+++ b/lib/domains/au/edu/tas/education.txt
@@ -0,0 +1 @@
+Department of Education Tasmania
diff --git a/lib/domains/au/edu/tased.txt b/lib/domains/au/edu/tased.txt
new file mode 100644
index 0000000000..aa07f0f5e2
--- /dev/null
+++ b/lib/domains/au/edu/tased.txt
@@ -0,0 +1 @@
+Department of Education Tasmania
diff --git a/lib/domains/au/gov/nsw/education.txt b/lib/domains/au/gov/nsw/education.txt
new file mode 100644
index 0000000000..05b19a0491
--- /dev/null
+++ b/lib/domains/au/gov/nsw/education.txt
@@ -0,0 +1 @@
+NSW Education
diff --git a/lib/domains/au/gov/tas/education.txt b/lib/domains/au/gov/tas/education.txt
new file mode 100644
index 0000000000..aa07f0f5e2
--- /dev/null
+++ b/lib/domains/au/gov/tas/education.txt
@@ -0,0 +1 @@
+Department of Education Tasmania
diff --git a/lib/domains/ba/fpmoz.txt b/lib/domains/ba/fpmoz.txt
new file mode 100644
index 0000000000..9a4d69daad
--- /dev/null
+++ b/lib/domains/ba/fpmoz.txt
@@ -0,0 +1 @@
+Faculty of science and education, University of Mostar
diff --git a/lib/domains/be/cf2m.txt b/lib/domains/be/cf2m.txt
new file mode 100644
index 0000000000..5f42a99dcc
--- /dev/null
+++ b/lib/domains/be/cf2m.txt
@@ -0,0 +1 @@
+CF2m - Centre de Fomration TIC Bruxelles
diff --git a/lib/domains/be/cvo-step.txt b/lib/domains/be/cvo-step.txt
new file mode 100644
index 0000000000..38df52d6e1
--- /dev/null
+++ b/lib/domains/be/cvo-step.txt
@@ -0,0 +1 @@
+CVO STEP
\ No newline at end of file
diff --git a/lib/domains/be/esmol.txt b/lib/domains/be/esmol.txt
new file mode 100644
index 0000000000..7204967902
--- /dev/null
+++ b/lib/domains/be/esmol.txt
@@ -0,0 +1 @@
+European School of Mol
diff --git a/lib/domains/be/helha.txt b/lib/domains/be/helha.txt
new file mode 100644
index 0000000000..c7c9732903
--- /dev/null
+++ b/lib/domains/be/helha.txt
@@ -0,0 +1 @@
+Haute École Louvain en Hainaut
diff --git a/lib/domains/be/helmo.txt b/lib/domains/be/helmo.txt
new file mode 100644
index 0000000000..bde3d1f9f8
--- /dev/null
+++ b/lib/domains/be/helmo.txt
@@ -0,0 +1 @@
+Haute Ecole Libre Mosane
diff --git a/lib/domains/be/hers/eco.txt b/lib/domains/be/hers/eco.txt
new file mode 100644
index 0000000000..1edb997dbc
--- /dev/null
+++ b/lib/domains/be/hers/eco.txt
@@ -0,0 +1 @@
+HAUTE ECOLE ROBERT SCHUMAN
diff --git a/lib/domains/be/iepsevere.txt b/lib/domains/be/iepsevere.txt
new file mode 100644
index 0000000000..ac46e17200
--- /dev/null
+++ b/lib/domains/be/iepsevere.txt
@@ -0,0 +1 @@
+IEPS Evere
diff --git a/lib/domains/be/maerlantatheneum.txt b/lib/domains/be/maerlantatheneum.txt
new file mode 100644
index 0000000000..0e283fcc21
--- /dev/null
+++ b/lib/domains/be/maerlantatheneum.txt
@@ -0,0 +1 @@
+Maerlant Atheneum
diff --git a/lib/domains/be/ritacollege.txt b/lib/domains/be/ritacollege.txt
new file mode 100644
index 0000000000..ddcbde4546
--- /dev/null
+++ b/lib/domains/be/ritacollege.txt
@@ -0,0 +1 @@
+Sint-Ritacollege Kontich
diff --git a/lib/domains/be/sji.txt b/lib/domains/be/sji.txt
new file mode 100644
index 0000000000..90c1dd6850
--- /dev/null
+++ b/lib/domains/be/sji.txt
@@ -0,0 +1 @@
+Sint-Jozef Instituut
diff --git a/lib/domains/be/ucll.txt b/lib/domains/be/ucll.txt
new file mode 100644
index 0000000000..043615ca3b
--- /dev/null
+++ b/lib/domains/be/ucll.txt
@@ -0,0 +1 @@
+University College Leuven-Limburg
diff --git a/lib/domains/be/vinci.txt b/lib/domains/be/vinci.txt
new file mode 100644
index 0000000000..162e2b966e
--- /dev/null
+++ b/lib/domains/be/vinci.txt
@@ -0,0 +1 @@
+Haute École Léonard de Vinci
diff --git a/lib/domains/blacklist.txt b/lib/domains/blacklist.txt
index a01e40841c..a4db43ed74 100644
--- a/lib/domains/blacklist.txt
+++ b/lib/domains/blacklist.txt
@@ -5,3 +5,5 @@ cet.edu
 australia.edu
 alumni.nottingham.ac.uk
 alumni.cmu.edu
+int.edu.gr
+maricopa.edu
diff --git a/lib/domains/bo/edu/umsanet.txt b/lib/domains/bo/umsa.txt
similarity index 100%
rename from lib/domains/bo/edu/umsanet.txt
rename to lib/domains/bo/umsa.txt
diff --git a/lib/domains/br/com/cotemig.txt b/lib/domains/br/com/cotemig.txt
new file mode 100644
index 0000000000..17cc2b94e9
--- /dev/null
+++ b/lib/domains/br/com/cotemig.txt
@@ -0,0 +1 @@
+Faculdade COTEMIG
diff --git a/lib/domains/br/famerp.txt b/lib/domains/br/famerp.txt
new file mode 100644
index 0000000000..8e7bd7d120
--- /dev/null
+++ b/lib/domains/br/famerp.txt
@@ -0,0 +1 @@
+Faculdade de Medicina de São José do Rio Preto
diff --git a/lib/domains/br/lncc.txt b/lib/domains/br/lncc.txt
new file mode 100644
index 0000000000..1da34de460
--- /dev/null
+++ b/lib/domains/br/lncc.txt
@@ -0,0 +1 @@
+Laboratório Nacional de Computação Científica
diff --git a/lib/domains/br/org/fieb.txt b/lib/domains/br/org/fieb.txt
new file mode 100644
index 0000000000..651d141dad
--- /dev/null
+++ b/lib/domains/br/org/fieb.txt
@@ -0,0 +1 @@
+Federação das Indústrias do Estado da Bahia - Senai
\ No newline at end of file
diff --git a/lib/domains/br/ucl.txt b/lib/domains/br/ucl.txt
new file mode 100644
index 0000000000..40a96a4260
--- /dev/null
+++ b/lib/domains/br/ucl.txt
@@ -0,0 +1 @@
+Faculdade UCL
diff --git a/lib/domains/br/ucs.txt b/lib/domains/br/ucs.txt
new file mode 100644
index 0000000000..28efdec361
--- /dev/null
+++ b/lib/domains/br/ucs.txt
@@ -0,0 +1 @@
+Universidade de Caxias do Sul
diff --git a/lib/domains/br/una.txt b/lib/domains/br/una.txt
new file mode 100644
index 0000000000..d639a4d339
--- /dev/null
+++ b/lib/domains/br/una.txt
@@ -0,0 +1 @@
+Centro Universit�rio UNA
\ No newline at end of file
diff --git a/lib/domains/br/uniararas.txt b/lib/domains/br/uniararas.txt
new file mode 100644
index 0000000000..3b056bf8af
--- /dev/null
+++ b/lib/domains/br/uniararas.txt
@@ -0,0 +1 @@
+Uniararas - Fundação Hermínio Ometto
diff --git a/lib/domains/br/uniron-ro.txt b/lib/domains/br/uniron-ro.txt
new file mode 100644
index 0000000000..c6f6832f09
--- /dev/null
+++ b/lib/domains/br/uniron-ro.txt
@@ -0,0 +1 @@
+Faculdade Interamericana de Porto Velho
diff --git a/lib/domains/br/unitins.txt b/lib/domains/br/unitins.txt
new file mode 100644
index 0000000000..952b9304b5
--- /dev/null
+++ b/lib/domains/br/unitins.txt
@@ -0,0 +1 @@
+Fundação Universidade do Tocantins
\ No newline at end of file
diff --git a/lib/domains/br/univates.txt b/lib/domains/br/univates.txt
new file mode 100644
index 0000000000..036322d28f
--- /dev/null
+++ b/lib/domains/br/univates.txt
@@ -0,0 +1 @@
+Universidade do Vale do Taquari
diff --git a/lib/domains/by/baa.txt b/lib/domains/by/baa.txt
index 31817a7093..742794eb6b 100644
--- a/lib/domains/by/baa.txt
+++ b/lib/domains/by/baa.txt
@@ -1 +1 @@
-Belarussian State Agricultural Academy
+Belarusian State Agricultural Academy
diff --git a/lib/domains/by/bseu.txt b/lib/domains/by/bseu.txt
index 966a4ba91b..42408a39ee 100644
--- a/lib/domains/by/bseu.txt
+++ b/lib/domains/by/bseu.txt
@@ -1 +1 @@
-Belarussian State Economic University
+Belarusian State Economic University
diff --git a/lib/domains/by/bsmu.txt b/lib/domains/by/bsmu.txt
index 053ef683b0..f421660578 100644
--- a/lib/domains/by/bsmu.txt
+++ b/lib/domains/by/bsmu.txt
@@ -1 +1 @@
-Belarussian State Medical University
+Belarusian State Medical University
diff --git a/lib/domains/by/bsu.txt b/lib/domains/by/bsu.txt
index 9fd99e3a7e..fc2f430c6d 100644
--- a/lib/domains/by/bsu.txt
+++ b/lib/domains/by/bsu.txt
@@ -1 +1 @@
-Belarussian State University
+Belarusian State University
diff --git a/lib/domains/by/bsuir.txt b/lib/domains/by/bsuir.txt
index 096c1f7c05..2984c50abe 100644
--- a/lib/domains/by/bsuir.txt
+++ b/lib/domains/by/bsuir.txt
@@ -1 +1 @@
-Belarussian State University of Informatics and Radioelectronics
+Belarusian State University of Informatics and Radioelectronics
diff --git a/lib/domains/by/buk.txt b/lib/domains/by/buk.txt
index 522abe4d12..619a10c8e7 100644
--- a/lib/domains/by/buk.txt
+++ b/lib/domains/by/buk.txt
@@ -1 +1 @@
-Belarussian State University of Culture and Arts
+Belarusian State University of Culture and Arts
diff --git a/lib/domains/by/edu.txt b/lib/domains/by/edu.txt
index 5477beeda0..51e77b9186 100644
--- a/lib/domains/by/edu.txt
+++ b/lib/domains/by/edu.txt
@@ -1,2 +1,2 @@
-Belarussian State Academy of Music
-Belarussian State Agrarian Technical University
+Belarusian State Academy of Music
+Belarusian State Agrarian Technical University
diff --git a/lib/domains/by/gomel.txt b/lib/domains/by/gomel.txt
index 0c93b34077..0fc6e0a658 100644
--- a/lib/domains/by/gomel.txt
+++ b/lib/domains/by/gomel.txt
@@ -1,4 +1,4 @@
-Belarussian State University of Transport
+Belarusian State University of Transport
 Gomel State Medical University
 Gomel State Technical University Pavel Sukhoi
 Mozyr State Pedagogical Institute
diff --git a/lib/domains/by/pdu.txt b/lib/domains/by/pdu.txt
new file mode 100644
index 0000000000..37d6aeec83
--- /dev/null
+++ b/lib/domains/by/pdu.txt
@@ -0,0 +1 @@
+Polotsk State University
diff --git a/lib/domains/by/unibel.txt b/lib/domains/by/unibel.txt
index 74a52bb597..7cc81e3a79 100644
--- a/lib/domains/by/unibel.txt
+++ b/lib/domains/by/unibel.txt
@@ -1,4 +1,4 @@
-Belarussian State Pedagogical University M. Tanka
-Belarussian State Polytechnical Academy
-Belarussian State Technological University
+Belarusian State Pedagogical University M. Tanka
+Belarusian State Polytechnical Academy
+Belarusian State Technological University
 Gomel State University Francisk Scarnia
diff --git a/lib/domains/ca/ab/mtroyal.txt b/lib/domains/ca/ab/mtroyal.txt
index 061069c4cd..5847456450 100644
--- a/lib/domains/ca/ab/mtroyal.txt
+++ b/lib/domains/ca/ab/mtroyal.txt
@@ -1 +1 @@
-Mount Royal College
+Mount Royal University
diff --git a/lib/domains/ca/cbu.txt b/lib/domains/ca/cbu.txt
new file mode 100644
index 0000000000..f5ee05edc1
--- /dev/null
+++ b/lib/domains/ca/cbu.txt
@@ -0,0 +1 @@
+Cape Breton University
diff --git a/lib/domains/ca/cegepgarneau.txt b/lib/domains/ca/cegepgarneau.txt
new file mode 100644
index 0000000000..c97040f311
--- /dev/null
+++ b/lib/domains/ca/cegepgarneau.txt
@@ -0,0 +1 @@
+Cégep Garneau
\ No newline at end of file
diff --git a/lib/domains/ca/dcmail.txt b/lib/domains/ca/dcmail.txt
new file mode 100644
index 0000000000..f00d114c08
--- /dev/null
+++ b/lib/domains/ca/dcmail.txt
@@ -0,0 +1 @@
+Durham College
diff --git a/lib/domains/ca/itas.txt b/lib/domains/ca/itas.txt
new file mode 100644
index 0000000000..fc05691468
--- /dev/null
+++ b/lib/domains/ca/itas.txt
@@ -0,0 +1 @@
+Vancouver Island University - Information Technology Applied Systems
diff --git a/lib/domains/ca/kpu.txt b/lib/domains/ca/kpu.txt
new file mode 100644
index 0000000000..b2bc46ed97
--- /dev/null
+++ b/lib/domains/ca/kpu.txt
@@ -0,0 +1 @@
+Kwantlen Polytechnic University
diff --git a/lib/domains/ca/ocadu.txt b/lib/domains/ca/ocadu.txt
new file mode 100644
index 0000000000..5015e2b89c
--- /dev/null
+++ b/lib/domains/ca/ocadu.txt
@@ -0,0 +1 @@
+OCAD(Ontario College of Art and Design) University
diff --git a/lib/domains/ca/on/lacitec.txt b/lib/domains/ca/on/lacitec.txt
new file mode 100644
index 0000000000..d9f90053c8
--- /dev/null
+++ b/lib/domains/ca/on/lacitec.txt
@@ -0,0 +1 @@
+La cité collégial
diff --git a/lib/domains/ca/qc/cegeptr.txt b/lib/domains/ca/qc/cegeptr.txt
new file mode 100644
index 0000000000..80fbc9aa0b
--- /dev/null
+++ b/lib/domains/ca/qc/cegeptr.txt
@@ -0,0 +1 @@
+Cégep de Trois-Rivières
diff --git a/lib/domains/ca/qc/claurendeau.txt b/lib/domains/ca/qc/claurendeau.txt
new file mode 100644
index 0000000000..cecc83e133
--- /dev/null
+++ b/lib/domains/ca/qc/claurendeau.txt
@@ -0,0 +1 @@
+Cégep André-Laurendeau
diff --git a/lib/domains/ca/qc/cmaisonneuve.txt b/lib/domains/ca/qc/cmaisonneuve.txt
new file mode 100644
index 0000000000..2b6f03c685
--- /dev/null
+++ b/lib/domains/ca/qc/cmaisonneuve.txt
@@ -0,0 +1 @@
+Collège de Maisonneuve
\ No newline at end of file
diff --git a/lib/domains/ca/qc/dawsoncollege.txt b/lib/domains/ca/qc/dawsoncollege.txt
new file mode 100644
index 0000000000..f41240e4d6
--- /dev/null
+++ b/lib/domains/ca/qc/dawsoncollege.txt
@@ -0,0 +1 @@
+Dawson College CEGEP
diff --git a/lib/domains/ca/saskpolytech.ca b/lib/domains/ca/saskpolytech.txt
similarity index 100%
rename from lib/domains/ca/saskpolytech.ca
rename to lib/domains/ca/saskpolytech.txt
diff --git a/lib/domains/ca/stmu.txt b/lib/domains/ca/stmu.txt
new file mode 100644
index 0000000000..a32918c263
--- /dev/null
+++ b/lib/domains/ca/stmu.txt
@@ -0,0 +1 @@
+St Mary's University
diff --git a/lib/domains/ca/tcdsb.txt b/lib/domains/ca/tcdsb.txt
new file mode 100644
index 0000000000..8e00791110
--- /dev/null
+++ b/lib/domains/ca/tcdsb.txt
@@ -0,0 +1 @@
+Toronto Catholic District School Board
diff --git a/lib/domains/ca/uqar.txt b/lib/domains/ca/uqar.txt
new file mode 100644
index 0000000000..6cc3639fe4
--- /dev/null
+++ b/lib/domains/ca/uqar.txt
@@ -0,0 +1 @@
+Université du Québec à Rimouski
diff --git a/lib/domains/cat/tecnocampus.txt b/lib/domains/cat/tecnocampus.txt
new file mode 100644
index 0000000000..a424aa5116
--- /dev/null
+++ b/lib/domains/cat/tecnocampus.txt
@@ -0,0 +1 @@
+TecnoCampus
diff --git a/lib/domains/cat/uib.txt b/lib/domains/cat/uib.txt
new file mode 100644
index 0000000000..991bbd42b4
--- /dev/null
+++ b/lib/domains/cat/uib.txt
@@ -0,0 +1 @@
+Universitat de les Illes Balears
diff --git a/lib/domains/cat/uvic.txt b/lib/domains/cat/uvic.txt
new file mode 100644
index 0000000000..057db376ef
--- /dev/null
+++ b/lib/domains/cat/uvic.txt
@@ -0,0 +1 @@
+University of Vic - Central University of Catalonia
diff --git a/lib/domains/cc/cwidaho.txt b/lib/domains/cc/cwidaho.txt
new file mode 100644
index 0000000000..3583c52362
--- /dev/null
+++ b/lib/domains/cc/cwidaho.txt
@@ -0,0 +1 @@
+College of Western Idaho
diff --git a/lib/domains/ch/bbbaden.txt b/lib/domains/ch/bbbaden.txt
new file mode 100644
index 0000000000..a16d569789
--- /dev/null
+++ b/lib/domains/ch/bbbaden.txt
@@ -0,0 +1 @@
+Berufsfachschule BBB
diff --git a/lib/domains/ch/eracom.txt b/lib/domains/ch/eracom.txt
new file mode 100644
index 0000000000..5274bd5919
--- /dev/null
+++ b/lib/domains/ch/eracom.txt
@@ -0,0 +1 @@
+Eracom - Ecole romande d'arts et communication, Lausanne
diff --git a/lib/domains/ch/fernfachhochschule.txt b/lib/domains/ch/fernfachhochschule.txt
new file mode 100644
index 0000000000..725093bc09
--- /dev/null
+++ b/lib/domains/ch/fernfachhochschule.txt
@@ -0,0 +1 @@
+Fernfachhochschule Schweiz
diff --git a/lib/domains/ch/fhsmail.txt b/lib/domains/ch/fhsmail.txt
new file mode 100644
index 0000000000..afdaf396aa
--- /dev/null
+++ b/lib/domains/ch/fhsmail.txt
@@ -0,0 +1 @@
+University of Applied Sciences St.Gallen
diff --git a/lib/domains/ch/ibw.txt b/lib/domains/ch/ibw.txt
new file mode 100644
index 0000000000..eefb08f740
--- /dev/null
+++ b/lib/domains/ch/ibw.txt
@@ -0,0 +1 @@
+Hohere Fachschule Sudostschweiz
diff --git a/lib/domains/ch/isb-sib.txt b/lib/domains/ch/isb-sib.txt
new file mode 100644
index 0000000000..9b261f9f98
--- /dev/null
+++ b/lib/domains/ch/isb-sib.txt
@@ -0,0 +1 @@
+SIB Swiss Institute of Bioinformatics
diff --git a/lib/domains/ch/samtrevano.txt b/lib/domains/ch/samtrevano.txt
new file mode 100644
index 0000000000..f38d7b89de
--- /dev/null
+++ b/lib/domains/ch/samtrevano.txt
@@ -0,0 +1 @@
+Scuola Arti e Mestieri di Trevano
\ No newline at end of file
diff --git a/lib/domains/cl/inacapmail.txt b/lib/domains/cl/inacapmail.txt
new file mode 100644
index 0000000000..beacd3c603
--- /dev/null
+++ b/lib/domains/cl/inacapmail.txt
@@ -0,0 +1 @@
+Universidad Tecnologica de Chile - INACAP
diff --git a/lib/domains/cl/udd.txt b/lib/domains/cl/udd.txt
new file mode 100644
index 0000000000..7dbbace75b
--- /dev/null
+++ b/lib/domains/cl/udd.txt
@@ -0,0 +1 @@
+Universidad del Desarrollo
diff --git a/lib/domains/cl/udd/ingenieros.txt b/lib/domains/cl/udd/ingenieros.txt
new file mode 100644
index 0000000000..7dbbace75b
--- /dev/null
+++ b/lib/domains/cl/udd/ingenieros.txt
@@ -0,0 +1 @@
+Universidad del Desarrollo
diff --git a/lib/domains/cl/upla.txt b/lib/domains/cl/upla.txt
new file mode 100644
index 0000000000..4203207df1
--- /dev/null
+++ b/lib/domains/cl/upla.txt
@@ -0,0 +1 @@
+Universidad de Playa Ancha
diff --git a/lib/domains/cn/edu/bistu.txt b/lib/domains/cn/edu/bistu.txt
new file mode 100644
index 0000000000..47e76194f8
--- /dev/null
+++ b/lib/domains/cn/edu/bistu.txt
@@ -0,0 +1 @@
+Beijing Information Science & Technology University
diff --git a/lib/domains/cn/edu/ecnu/student.txt b/lib/domains/cn/edu/ecnu/student.txt
new file mode 100644
index 0000000000..c31e4dcb62
--- /dev/null
+++ b/lib/domains/cn/edu/ecnu/student.txt
@@ -0,0 +1 @@
+East China Normal University
diff --git a/lib/domains/cn/edu/qau.txt b/lib/domains/cn/edu/qau.txt
new file mode 100644
index 0000000000..a079130fc5
--- /dev/null
+++ b/lib/domains/cn/edu/qau.txt
@@ -0,0 +1 @@
+Qingdao Agricultural University
diff --git a/lib/domains/com/audencia.txt b/lib/domains/com/audencia.txt
new file mode 100644
index 0000000000..8dab19d3df
--- /dev/null
+++ b/lib/domains/com/audencia.txt
@@ -0,0 +1 @@
+Audencia Nantes - School of management
\ No newline at end of file
diff --git a/lib/domains/com/bpp.txt b/lib/domains/com/bpp.txt
new file mode 100644
index 0000000000..40d6ec39b0
--- /dev/null
+++ b/lib/domains/com/bpp.txt
@@ -0,0 +1 @@
+"BPP" 
diff --git a/lib/domains/com/bwscampus.txt b/lib/domains/com/bwscampus.txt
new file mode 100644
index 0000000000..f23ce8d8c4
--- /dev/null
+++ b/lib/domains/com/bwscampus.txt
@@ -0,0 +1 @@
+Brentwood School
diff --git a/lib/domains/com/cic-cairo.txt b/lib/domains/com/cic-cairo.txt
new file mode 100644
index 0000000000..942802c88b
--- /dev/null
+++ b/lib/domains/com/cic-cairo.txt
@@ -0,0 +1 @@
+Canadian International College
diff --git a/lib/domains/com/cifacom.txt b/lib/domains/com/cifacom.txt
new file mode 100644
index 0000000000..7377597336
--- /dev/null
+++ b/lib/domains/com/cifacom.txt
@@ -0,0 +1 @@
+Cifacom
diff --git a/lib/domains/com/collegelasalle.txt b/lib/domains/com/collegelasalle.txt
new file mode 100644
index 0000000000..22383c6ed0
--- /dev/null
+++ b/lib/domains/com/collegelasalle.txt
@@ -0,0 +1 @@
+LaSalle College / Collège LaSalle
\ No newline at end of file
diff --git a/lib/domains/com/collierschools.txt b/lib/domains/com/collierschools.txt
new file mode 100644
index 0000000000..ba6f427f6b
--- /dev/null
+++ b/lib/domains/com/collierschools.txt
@@ -0,0 +1 @@
+Collier County Schools
diff --git a/lib/domains/com/cqumail.txt b/lib/domains/com/cqumail.txt
new file mode 100644
index 0000000000..4cf00f9928
--- /dev/null
+++ b/lib/domains/com/cqumail.txt
@@ -0,0 +1 @@
+Central Queensland University (CQU) 
diff --git a/lib/domains/com/digitalartschool.txt b/lib/domains/com/digitalartschool.txt
new file mode 100644
index 0000000000..a9523caa2a
--- /dev/null
+++ b/lib/domains/com/digitalartschool.txt
@@ -0,0 +1,3 @@
+Create digitalartschool.txt
+http://www.digitalartschool.com
+100-1632 Dickson Avenue • Kelowna, British Columbia • V1Y 7T2
diff --git a/lib/domains/com/docchula.txt b/lib/domains/com/docchula.txt
new file mode 100644
index 0000000000..959ccfee05
--- /dev/null
+++ b/lib/domains/com/docchula.txt
@@ -0,0 +1 @@
+Faculty of Medicine, Chulalongkorn University
diff --git a/lib/domains/com/estiam.txt b/lib/domains/com/estiam.txt
new file mode 100644
index 0000000000..34d434c518
--- /dev/null
+++ b/lib/domains/com/estiam.txt
@@ -0,0 +1 @@
+ÉSTIAM - École supérieure des technologies de l'information appliquées aux métiers
diff --git a/lib/domains/com/infouniron.txt b/lib/domains/com/infouniron.txt
new file mode 100644
index 0000000000..c6f6832f09
--- /dev/null
+++ b/lib/domains/com/infouniron.txt
@@ -0,0 +1 @@
+Faculdade Interamericana de Porto Velho
diff --git a/lib/domains/com/intisana.txt b/lib/domains/com/intisana.txt
new file mode 100644
index 0000000000..0fa4f8be1f
--- /dev/null
+++ b/lib/domains/com/intisana.txt
@@ -0,0 +1 @@
+Colegio Intisana
diff --git a/lib/domains/com/ipformation-lyon.txt b/lib/domains/com/ipformation-lyon.txt
new file mode 100644
index 0000000000..f8304f7c10
--- /dev/null
+++ b/lib/domains/com/ipformation-lyon.txt
@@ -0,0 +1 @@
+École Informatique IP Formation Lyon
diff --git a/lib/domains/com/ipssi-lyon.txt b/lib/domains/com/ipssi-lyon.txt
new file mode 100644
index 0000000000..f8304f7c10
--- /dev/null
+++ b/lib/domains/com/ipssi-lyon.txt
@@ -0,0 +1 @@
+École Informatique IP Formation Lyon
diff --git a/lib/domains/com/jeffstateonline.txt b/lib/domains/com/jeffstateonline.txt
new file mode 100644
index 0000000000..4a0555b080
--- /dev/null
+++ b/lib/domains/com/jeffstateonline.txt
@@ -0,0 +1 @@
+Jefferson State Community College
diff --git a/lib/domains/com/lasallecollege.txt b/lib/domains/com/lasallecollege.txt
new file mode 100644
index 0000000000..22383c6ed0
--- /dev/null
+++ b/lib/domains/com/lasallecollege.txt
@@ -0,0 +1 @@
+LaSalle College / Collège LaSalle
\ No newline at end of file
diff --git a/lib/domains/com/lecole-ldlc.txt b/lib/domains/com/lecole-ldlc.txt
new file mode 100644
index 0000000000..d1b810f33c
--- /dev/null
+++ b/lib/domains/com/lecole-ldlc.txt
@@ -0,0 +1 @@
+L'Ecole LDLC
diff --git a/lib/domains/com/manukaumail.txt b/lib/domains/com/manukaumail.txt
new file mode 100644
index 0000000000..0a5f71f9b2
--- /dev/null
+++ b/lib/domains/com/manukaumail.txt
@@ -0,0 +1 @@
+Manukau Institute of Technology
diff --git a/lib/domains/com/melroseschools.txt b/lib/domains/com/melroseschools.txt
new file mode 100644
index 0000000000..757ef10052
--- /dev/null
+++ b/lib/domains/com/melroseschools.txt
@@ -0,0 +1 @@
+Melrose Public Schools
diff --git a/lib/domains/com/outwood.txt b/lib/domains/com/outwood.txt
new file mode 100644
index 0000000000..632b06f2c0
--- /dev/null
+++ b/lib/domains/com/outwood.txt
@@ -0,0 +1 @@
+Outwood Grange Academies Trust
diff --git a/lib/domains/com/saedubai.txt b/lib/domains/com/saedubai.txt
new file mode 100644
index 0000000000..61f73a285d
--- /dev/null
+++ b/lib/domains/com/saedubai.txt
@@ -0,0 +1 @@
+Sae Institute Dubai
diff --git a/lib/domains/com/spbgut.txt b/lib/domains/com/spbgut.txt
new file mode 100644
index 0000000000..b6e4473f88
--- /dev/null
+++ b/lib/domains/com/spbgut.txt
@@ -0,0 +1 @@
+The Bonch-Bruevich Saint - Petersburg State University of Telecommunications
diff --git a/lib/domains/com/trioscollege.txt b/lib/domains/com/trioscollege.txt
new file mode 100644
index 0000000000..43d476a894
--- /dev/null
+++ b/lib/domains/com/trioscollege.txt
@@ -0,0 +1 @@
+triOS College
diff --git a/lib/domains/com/uk/turton.txt b/lib/domains/com/uk/turton.txt
new file mode 100644
index 0000000000..f19903591b
--- /dev/null
+++ b/lib/domains/com/uk/turton.txt
@@ -0,0 +1 @@
+Turton School
diff --git a/lib/domains/com/unicoischools/students.txt b/lib/domains/com/unicoischools/students.txt
new file mode 100644
index 0000000000..7e7b53b7ee
--- /dev/null
+++ b/lib/domains/com/unicoischools/students.txt
@@ -0,0 +1 @@
+Unicoi County High School
diff --git a/lib/domains/com/ynov.txt b/lib/domains/com/ynov.txt
new file mode 100644
index 0000000000..afa812b7b4
--- /dev/null
+++ b/lib/domains/com/ynov.txt
@@ -0,0 +1,2 @@
+
+Y-nov | Lim'art - Ingésup - Infosup | Carrefour des formations aux métiers du numérique.
diff --git a/lib/domains/cr/ac/uam.txt b/lib/domains/cr/ac/uam.txt
new file mode 100644
index 0000000000..8af3965c0a
--- /dev/null
+++ b/lib/domains/cr/ac/uam.txt
@@ -0,0 +1 @@
+Universidad Americana
diff --git a/lib/domains/cr/uned.txt b/lib/domains/cr/uned.txt
new file mode 100644
index 0000000000..def9b83046
--- /dev/null
+++ b/lib/domains/cr/uned.txt
@@ -0,0 +1 @@
+Universidad Estatal a Distancia
diff --git a/lib/domains/cw/uoc.txt b/lib/domains/cw/uoc.txt
new file mode 100644
index 0000000000..1a42649aa3
--- /dev/null
+++ b/lib/domains/cw/uoc.txt
@@ -0,0 +1 @@
+University of Cura�ao
\ No newline at end of file
diff --git a/lib/domains/cz/edukomplex.txt b/lib/domains/cz/edukomplex.txt
new file mode 100644
index 0000000000..266f1763aa
--- /dev/null
+++ b/lib/domains/cz/edukomplex.txt
@@ -0,0 +1 @@
+European Polytechnic Institute
diff --git a/lib/domains/cz/gymzr.txt b/lib/domains/cz/gymzr.txt
new file mode 100644
index 0000000000..922dbf02eb
--- /dev/null
+++ b/lib/domains/cz/gymzr.txt
@@ -0,0 +1 @@
+Gymnazium Zdar nad Sazavou
diff --git a/lib/domains/cz/mg-akademie.txt b/lib/domains/cz/mg-akademie.txt
new file mode 100644
index 0000000000..fbad27f789
--- /dev/null
+++ b/lib/domains/cz/mg-akademie.txt
@@ -0,0 +1 @@
+SOŠ Manažerská Akademie
\ No newline at end of file
diff --git a/lib/domains/cz/sps-cl.txt b/lib/domains/cz/sps-cl.txt
new file mode 100644
index 0000000000..aa63a9ad61
--- /dev/null
+++ b/lib/domains/cz/sps-cl.txt
@@ -0,0 +1 @@
+Střední průmyslová škola Česká Lípa
diff --git a/lib/domains/cz/sps-tabor.txt b/lib/domains/cz/sps-tabor.txt
new file mode 100644
index 0000000000..b60d755347
--- /dev/null
+++ b/lib/domains/cz/sps-tabor.txt
@@ -0,0 +1 @@
+SPŠ strojní a stavební, Tábor
diff --git a/lib/domains/cz/spse.txt b/lib/domains/cz/spse.txt
new file mode 100644
index 0000000000..0a8c0236cb
--- /dev/null
+++ b/lib/domains/cz/spse.txt
@@ -0,0 +1 @@
+SPŠE a VOŠ Pardubice
diff --git a/lib/domains/cz/spseol.txt b/lib/domains/cz/spseol.txt
new file mode 100644
index 0000000000..c4cbfef40a
--- /dev/null
+++ b/lib/domains/cz/spseol.txt
@@ -0,0 +1 @@
+Vyšší odborná škola a Střední průmyslová škola elektrotehcnická Olomouc
diff --git a/lib/domains/cz/ssinfotech.txt b/lib/domains/cz/ssinfotech.txt
new file mode 100644
index 0000000000..b38e12b852
--- /dev/null
+++ b/lib/domains/cz/ssinfotech.txt
@@ -0,0 +1 @@
+Stredni skola informacnich technologii, s.r.o.
diff --git a/lib/domains/de/asw-berufsakademie.txt b/lib/domains/de/asw-berufsakademie.txt
new file mode 100644
index 0000000000..d2f332fc6e
--- /dev/null
+++ b/lib/domains/de/asw-berufsakademie.txt
@@ -0,0 +1 @@
+ASW – Berufsakademie Saarland e.V.
diff --git a/lib/domains/de/avs-itzehoe1.txt b/lib/domains/de/avs-itzehoe1.txt
new file mode 100644
index 0000000000..25db536378
--- /dev/null
+++ b/lib/domains/de/avs-itzehoe1.txt
@@ -0,0 +1 @@
+Auguste-Viktoria-Schule Itzehoe, Hs. 1
diff --git a/lib/domains/de/ba-dresden.txt b/lib/domains/de/ba-dresden.txt
new file mode 100644
index 0000000000..b400e3d561
--- /dev/null
+++ b/lib/domains/de/ba-dresden.txt
@@ -0,0 +1 @@
+Berufsakademie Sachsen Staatliche Studienakademie Dresden
diff --git a/lib/domains/de/ba-fulda.txt b/lib/domains/de/ba-fulda.txt
new file mode 100644
index 0000000000..d20679f3ed
--- /dev/null
+++ b/lib/domains/de/ba-fulda.txt
@@ -0,0 +1,2 @@
+Private Berufsakademie Fulda University of Cooperative Education 
+http://www.ba-fulda.de
\ No newline at end of file
diff --git a/lib/domains/de/berufskolleg-geilenkirchen.txt b/lib/domains/de/berufskolleg-geilenkirchen.txt
new file mode 100644
index 0000000000..946624ad37
--- /dev/null
+++ b/lib/domains/de/berufskolleg-geilenkirchen.txt
@@ -0,0 +1 @@
+Berufskolleg Ernaehrung, Sozialwesen, Technik des Kreises Heinsberg in Geilenkirchen
diff --git a/lib/domains/de/bs-hassfurt.txt b/lib/domains/de/bs-hassfurt.txt
new file mode 100644
index 0000000000..a3f6cd439d
--- /dev/null
+++ b/lib/domains/de/bs-hassfurt.txt
@@ -0,0 +1,2 @@
+Heinrich-Thein-Schule
+Staatliches Berufliches Schulzentrum Haßfurt
diff --git a/lib/domains/de/bszh.txt b/lib/domains/de/bszh.txt
new file mode 100644
index 0000000000..abd976c185
--- /dev/null
+++ b/lib/domains/de/bszh.txt
@@ -0,0 +1 @@
+Staatliches Berufsschulzentrum Hermsdorf
\ No newline at end of file
diff --git a/lib/domains/de/dhbw-karlsruhe.txt b/lib/domains/de/dhbw-karlsruhe.txt
new file mode 100644
index 0000000000..07809fb173
--- /dev/null
+++ b/lib/domains/de/dhbw-karlsruhe.txt
@@ -0,0 +1 @@
+Duale Hochschule Baden-Württemberg Karlsruhe
\ No newline at end of file
diff --git a/lib/domains/de/dhbw-karlsruhe/student.txt b/lib/domains/de/dhbw-karlsruhe/student.txt
new file mode 100644
index 0000000000..bed404d3e1
--- /dev/null
+++ b/lib/domains/de/dhbw-karlsruhe/student.txt
@@ -0,0 +1 @@
+Duale Hochschule Baden-Württemberg Karlsruhe
diff --git a/lib/domains/de/dhbw/cas.txt b/lib/domains/de/dhbw/cas.txt
new file mode 100644
index 0000000000..cc469cec79
--- /dev/null
+++ b/lib/domains/de/dhbw/cas.txt
@@ -0,0 +1 @@
+Center for Advanced Studies Duale Hochschule Baden Württemberg
diff --git a/lib/domains/de/dhbw/mosbach.txt b/lib/domains/de/dhbw/mosbach.txt
new file mode 100644
index 0000000000..63f90c94ad
--- /dev/null
+++ b/lib/domains/de/dhbw/mosbach.txt
@@ -0,0 +1 @@
+Duale Hochschule Baden-Württemberg Mosbach
diff --git a/lib/domains/de/dhbw/mosbach/lehre.txt b/lib/domains/de/dhbw/mosbach/lehre.txt
new file mode 100644
index 0000000000..e451d27efe
--- /dev/null
+++ b/lib/domains/de/dhbw/mosbach/lehre.txt
@@ -0,0 +1 @@
+Duale Hochschule Baden-Württemberg, Mosbach
diff --git a/lib/domains/de/fh-duesseldorf.txt b/lib/domains/de/fh-duesseldorf.txt
index b7ace15dc1..df49c860e1 100644
--- a/lib/domains/de/fh-duesseldorf.txt
+++ b/lib/domains/de/fh-duesseldorf.txt
@@ -1 +1 @@
-Fachhochschule Düsseldorf
+Hochschule Düsseldorf
diff --git a/lib/domains/de/fh-koeln.txt b/lib/domains/de/fh-koeln.txt
deleted file mode 100644
index 7223c969d5..0000000000
--- a/lib/domains/de/fh-koeln.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fachhochschule Köln
diff --git a/lib/domains/de/fosbos-neumarkt.txt b/lib/domains/de/fosbos-neumarkt.txt
new file mode 100644
index 0000000000..cbecb534ea
--- /dev/null
+++ b/lib/domains/de/fosbos-neumarkt.txt
@@ -0,0 +1 @@
+Maximilian Kolbe (Fachober- & Berufsober-) Schule Neumarkt
\ No newline at end of file
diff --git a/lib/domains/de/g18.txt b/lib/domains/de/g18.txt
new file mode 100644
index 0000000000..82ea65e7e7
--- /dev/null
+++ b/lib/domains/de/g18.txt
@@ -0,0 +1 @@
+Staatliche Gewerbeschule G18 - Technical College G18
diff --git a/lib/domains/de/gewerbeschule-vs.txt b/lib/domains/de/gewerbeschule-vs.txt
new file mode 100644
index 0000000000..809cc27fbf
--- /dev/null
+++ b/lib/domains/de/gewerbeschule-vs.txt
@@ -0,0 +1 @@
+Gewerbeschule villingen Schwenningen
diff --git a/lib/domains/de/gymn-benedictinum.txt b/lib/domains/de/gymn-benedictinum.txt
new file mode 100644
index 0000000000..3f8ccf50b4
--- /dev/null
+++ b/lib/domains/de/gymn-benedictinum.txt
@@ -0,0 +1 @@
+Gymnasium der Benediktiner, Meschede
diff --git a/lib/domains/de/gymnasium-rhauderfehn.txt b/lib/domains/de/gymnasium-rhauderfehn.txt
new file mode 100644
index 0000000000..96b1f7664a
--- /dev/null
+++ b/lib/domains/de/gymnasium-rhauderfehn.txt
@@ -0,0 +1 @@
+Gymnasium Rhauderfehn
diff --git a/lib/domains/de/h-ab.txt b/lib/domains/de/h-ab.txt
new file mode 100644
index 0000000000..fe6d164e48
--- /dev/null
+++ b/lib/domains/de/h-ab.txt
@@ -0,0 +1 @@
+Hochschule Aschaffenburg
diff --git a/lib/domains/de/hpi.txt b/lib/domains/de/hpi.txt
new file mode 100644
index 0000000000..b861f87b66
--- /dev/null
+++ b/lib/domains/de/hpi.txt
@@ -0,0 +1 @@
+Hasso Plattner Institute
\ No newline at end of file
diff --git a/lib/domains/de/hs-duesseldorf.txt b/lib/domains/de/hs-duesseldorf.txt
new file mode 100644
index 0000000000..df49c860e1
--- /dev/null
+++ b/lib/domains/de/hs-duesseldorf.txt
@@ -0,0 +1 @@
+Hochschule Düsseldorf
diff --git a/lib/domains/de/hs-duesseldorf/study.txt b/lib/domains/de/hs-duesseldorf/study.txt
new file mode 100644
index 0000000000..df49c860e1
--- /dev/null
+++ b/lib/domains/de/hs-duesseldorf/study.txt
@@ -0,0 +1 @@
+Hochschule Düsseldorf
diff --git a/lib/domains/de/hs-kl.txt b/lib/domains/de/hs-kl.txt
new file mode 100644
index 0000000000..42c97f30d3
--- /dev/null
+++ b/lib/domains/de/hs-kl.txt
@@ -0,0 +1,2 @@
+Hochschule Kaiserslautern
+University of Applied Sciences
diff --git a/lib/domains/de/hs-niederrhein.txt b/lib/domains/de/hs-niederrhein.txt
new file mode 100644
index 0000000000..128253eaab
--- /dev/null
+++ b/lib/domains/de/hs-niederrhein.txt
@@ -0,0 +1 @@
+Hochschule Niederrhein
\ No newline at end of file
diff --git a/lib/domains/de/hswt.txt b/lib/domains/de/hswt.txt
new file mode 100644
index 0000000000..9e278851d0
--- /dev/null
+++ b/lib/domains/de/hswt.txt
@@ -0,0 +1 @@
+Weihenstephan-Triesdorf University of Applied Sciences
\ No newline at end of file
diff --git a/lib/domains/de/iserv-trg-oha.txt b/lib/domains/de/iserv-trg-oha.txt
new file mode 100644
index 0000000000..58ce85e565
--- /dev/null
+++ b/lib/domains/de/iserv-trg-oha.txt
@@ -0,0 +1 @@
+Tilman-Riemenschneider-Gymnasium Osterode am Harz
diff --git a/lib/domains/de/klara-oppenheimer-schule.txt b/lib/domains/de/klara-oppenheimer-schule.txt
new file mode 100644
index 0000000000..e3f01b614b
--- /dev/null
+++ b/lib/domains/de/klara-oppenheimer-schule.txt
@@ -0,0 +1 @@
+Klara-Oppenheimer-Schule Würzburg
diff --git a/lib/domains/de/knabenrealschule-neumarkt.txt b/lib/domains/de/knabenrealschule-neumarkt.txt
new file mode 100644
index 0000000000..05e89ede92
--- /dev/null
+++ b/lib/domains/de/knabenrealschule-neumarkt.txt
@@ -0,0 +1 @@
+Staatliche Knabenrealschule
\ No newline at end of file
diff --git a/lib/domains/de/law-school.txt b/lib/domains/de/law-school.txt
new file mode 100644
index 0000000000..3d811d4906
--- /dev/null
+++ b/lib/domains/de/law-school.txt
@@ -0,0 +1 @@
+Bucerius Law School gGmbH
diff --git a/lib/domains/de/lg-bs.txt b/lib/domains/de/lg-bs.txt
new file mode 100644
index 0000000000..52e76e2666
--- /dev/null
+++ b/lib/domains/de/lg-bs.txt
@@ -0,0 +1 @@
+Lessinggymnasium Braunschweig
diff --git a/lib/domains/de/louis-leitz-schule.txt b/lib/domains/de/louis-leitz-schule.txt
new file mode 100644
index 0000000000..fdd4b21508
--- /dev/null
+++ b/lib/domains/de/louis-leitz-schule.txt
@@ -0,0 +1 @@
+Louis Leitz Schule
diff --git a/lib/domains/de/maedchenrealschule-neumarkt.txt b/lib/domains/de/maedchenrealschule-neumarkt.txt
new file mode 100644
index 0000000000..6d48265e2a
--- /dev/null
+++ b/lib/domains/de/maedchenrealschule-neumarkt.txt
@@ -0,0 +1 @@
+Staatliche M�dchenrealschule
\ No newline at end of file
diff --git a/lib/domains/de/mediadesign.txt b/lib/domains/de/mediadesign.txt
new file mode 100644
index 0000000000..1e8ae33a58
--- /dev/null
+++ b/lib/domains/de/mediadesign.txt
@@ -0,0 +1 @@
+Mediadesign Hochschule
diff --git a/lib/domains/de/mpg/pks.txt b/lib/domains/de/mpg/pks.txt
new file mode 100644
index 0000000000..cf03d13133
--- /dev/null
+++ b/lib/domains/de/mpg/pks.txt
@@ -0,0 +1 @@
+Max Planck Institute for the Physics of Complex Systems
diff --git a/lib/domains/de/musin/muenchen/lfg.txt b/lib/domains/de/musin/muenchen/lfg.txt
new file mode 100644
index 0000000000..3de50ddb47
--- /dev/null
+++ b/lib/domains/de/musin/muenchen/lfg.txt
@@ -0,0 +1 @@
+St�dtisches Lion-Feuchtwanger-Gymnasium
\ No newline at end of file
diff --git a/lib/domains/de/ostendorfer.txt b/lib/domains/de/ostendorfer.txt
new file mode 100644
index 0000000000..0d1ff753f8
--- /dev/null
+++ b/lib/domains/de/ostendorfer.txt
@@ -0,0 +1 @@
+Ostendorfer Gymnasium
\ No newline at end of file
diff --git a/lib/domains/de/schule-franzburg.txt b/lib/domains/de/schule-franzburg.txt
new file mode 100644
index 0000000000..3c4808798f
--- /dev/null
+++ b/lib/domains/de/schule-franzburg.txt
@@ -0,0 +1 @@
+Regionale Schule mit Grundschule Franzburg
diff --git a/lib/domains/de/schule/bw/lb/mgl.txt b/lib/domains/de/schule/bw/lb/mgl.txt
new file mode 100644
index 0000000000..098a98e638
--- /dev/null
+++ b/lib/domains/de/schule/bw/lb/mgl.txt
@@ -0,0 +1 @@
+Mörike-Gymnasium Ludwigsburg
diff --git a/lib/domains/de/shg-hi.txt b/lib/domains/de/shg-hi.txt
new file mode 100644
index 0000000000..650e130d76
--- /dev/null
+++ b/lib/domains/de/shg-hi.txt
@@ -0,0 +1 @@
+Scharnhorstgymnasium Hildesheim
diff --git a/lib/domains/de/stiftsgymnasium.txt b/lib/domains/de/stiftsgymnasium.txt
new file mode 100644
index 0000000000..753355704b
--- /dev/null
+++ b/lib/domains/de/stiftsgymnasium.txt
@@ -0,0 +1 @@
+Stiftsgymnasium Sindelfingen
diff --git a/lib/domains/de/th-deg.txt b/lib/domains/de/th-deg.txt
new file mode 100644
index 0000000000..0813aeaa1d
--- /dev/null
+++ b/lib/domains/de/th-deg.txt
@@ -0,0 +1 @@
+Technische Hochschule Deggendorf
diff --git a/lib/domains/de/th-koeln.txt b/lib/domains/de/th-koeln.txt
new file mode 100644
index 0000000000..427ea1462a
--- /dev/null
+++ b/lib/domains/de/th-koeln.txt
@@ -0,0 +1,2 @@
+Fachhochschule Köln
+Technische Hochschule Köln
diff --git a/lib/domains/de/udk-berlin.txt b/lib/domains/de/udk-berlin.txt
new file mode 100644
index 0000000000..6897bd82b9
--- /dev/null
+++ b/lib/domains/de/udk-berlin.txt
@@ -0,0 +1 @@
+Universität der Künste Berlin
\ No newline at end of file
diff --git a/lib/domains/de/unibw.txt b/lib/domains/de/unibw.txt
new file mode 100644
index 0000000000..7106aa5096
--- /dev/null
+++ b/lib/domains/de/unibw.txt
@@ -0,0 +1,2 @@
+Universität der Bundeswehr München
+www.unibw.de
diff --git a/lib/domains/de/wgg-neumarkt.txt b/lib/domains/de/wgg-neumarkt.txt
new file mode 100644
index 0000000000..875901deec
--- /dev/null
+++ b/lib/domains/de/wgg-neumarkt.txt
@@ -0,0 +1 @@
+Willibald-Gluck-Gymnasium
\ No newline at end of file
diff --git a/lib/domains/dk/aatg.txt b/lib/domains/dk/aatg.txt
new file mode 100644
index 0000000000..5d477f593c
--- /dev/null
+++ b/lib/domains/dk/aatg.txt
@@ -0,0 +1 @@
+Aalborg Tekniske Gymnasium
diff --git a/lib/domains/dk/easj.txt b/lib/domains/dk/easj.txt
new file mode 100644
index 0000000000..68dab49068
--- /dev/null
+++ b/lib/domains/dk/easj.txt
@@ -0,0 +1 @@
+ErhvervsAkademi Sjælland
diff --git a/lib/domains/dk/ghg.txt b/lib/domains/dk/ghg.txt
new file mode 100644
index 0000000000..969bb41028
--- /dev/null
+++ b/lib/domains/dk/ghg.txt
@@ -0,0 +1 @@
+Gammel Hellerup Gymnasium
diff --git a/lib/domains/dk/skolekom.txt b/lib/domains/dk/skolekom.txt
new file mode 100644
index 0000000000..519f9c671a
--- /dev/null
+++ b/lib/domains/dk/skolekom.txt
@@ -0,0 +1 @@
+Skolekom
diff --git a/lib/domains/dz/univ-ghardaia.txt b/lib/domains/dz/univ-ghardaia.txt
new file mode 100644
index 0000000000..9644faa5a0
--- /dev/null
+++ b/lib/domains/dz/univ-ghardaia.txt
@@ -0,0 +1 @@
+Université de Ghardaia
diff --git a/lib/domains/edu/bw.txt b/lib/domains/edu/bw.txt
new file mode 100644
index 0000000000..130a52527d
--- /dev/null
+++ b/lib/domains/edu/bw.txt
@@ -0,0 +1 @@
+Baldwin Wallace University
diff --git a/lib/domains/edu/gwu.edu b/lib/domains/edu/gwu.edu
new file mode 100644
index 0000000000..7a5591c21b
--- /dev/null
+++ b/lib/domains/edu/gwu.edu
@@ -0,0 +1 @@
+George Washington University
diff --git a/lib/domains/edu/gwu.txt b/lib/domains/edu/gwu.txt
new file mode 100644
index 0000000000..7a5591c21b
--- /dev/null
+++ b/lib/domains/edu/gwu.txt
@@ -0,0 +1 @@
+George Washington University
diff --git a/lib/domains/edu/illinois.txt b/lib/domains/edu/illinois.txt
new file mode 100644
index 0000000000..5f0cb3d989
--- /dev/null
+++ b/lib/domains/edu/illinois.txt
@@ -0,0 +1 @@
+University of Illinois at Urbana-Champaign
diff --git a/lib/domains/edu/northwestern.txt b/lib/domains/edu/northwestern.txt
index 675a5f689f..012df1da8d 100644
--- a/lib/domains/edu/northwestern.txt
+++ b/lib/domains/edu/northwestern.txt
@@ -1 +1 @@
-Northwestern University In Qatar
+Northwestern University
diff --git a/lib/domains/edu/sjrstate.txt b/lib/domains/edu/sjrstate.txt
new file mode 100644
index 0000000000..4653c8790e
--- /dev/null
+++ b/lib/domains/edu/sjrstate.txt
@@ -0,0 +1 @@
+St. Johns River State College
diff --git a/lib/domains/ee/eek.txt b/lib/domains/ee/eek.txt
new file mode 100644
index 0000000000..e38737758e
--- /dev/null
+++ b/lib/domains/ee/eek.txt
@@ -0,0 +1 @@
+Estonian Entrepreneurship University of Applied Sciences
diff --git a/lib/domains/ee/khk.tx b/lib/domains/ee/khk.tx
new file mode 100644
index 0000000000..36fa54c32a
--- /dev/null
+++ b/lib/domains/ee/khk.tx
@@ -0,0 +1 @@
+Tartu Vocational Education Center
diff --git a/lib/domains/ee/khk.txt b/lib/domains/ee/khk.txt
new file mode 100644
index 0000000000..8ac1645706
--- /dev/null
+++ b/lib/domains/ee/khk.txt
@@ -0,0 +1 @@
+Tartu Vocational School
diff --git a/lib/domains/es/euncet.txt b/lib/domains/es/euncet.txt
new file mode 100644
index 0000000000..eb17007407
--- /dev/null
+++ b/lib/domains/es/euncet.txt
@@ -0,0 +1 @@
+EUNCET Business School
diff --git a/lib/domains/es/iesnervion.txt b/lib/domains/es/iesnervion.txt
new file mode 100644
index 0000000000..1a2cc980e5
--- /dev/null
+++ b/lib/domains/es/iesnervion.txt
@@ -0,0 +1 @@
+Instituto de Educación Secundaria Nervión.
diff --git a/lib/domains/es/iestrassierra.txt b/lib/domains/es/iestrassierra.txt
new file mode 100644
index 0000000000..2f1a4e3453
--- /dev/null
+++ b/lib/domains/es/iestrassierra.txt
@@ -0,0 +1,2 @@
+IES Trassierra (Córdoba, Spain)
+www.iestrassierra.com
diff --git a/lib/domains/es/roa.txt b/lib/domains/es/roa.txt
new file mode 100644
index 0000000000..74113fce94
--- /dev/null
+++ b/lib/domains/es/roa.txt
@@ -0,0 +1 @@
+ROA Spanish Naval Observatory
diff --git a/lib/domains/es/ufv.txt b/lib/domains/es/ufv.txt
new file mode 100644
index 0000000000..a13a3fe247
--- /dev/null
+++ b/lib/domains/es/ufv.txt
@@ -0,0 +1 @@
+Universidad Francisco de Vitoria
diff --git a/lib/domains/es/usj.txt b/lib/domains/es/usj.txt
new file mode 100644
index 0000000000..752402bc15
--- /dev/null
+++ b/lib/domains/es/usj.txt
@@ -0,0 +1 @@
+Universidad San Jorge
diff --git a/lib/domains/eu/apeiron-edu.txt b/lib/domains/eu/apeiron-edu.txt
new file mode 100644
index 0000000000..24379ca362
--- /dev/null
+++ b/lib/domains/eu/apeiron-edu.txt
@@ -0,0 +1 @@
+Panevropski Univerzitet Apeiron Banja Luka
diff --git a/lib/domains/eu/dauphine.txt b/lib/domains/eu/dauphine.txt
new file mode 100644
index 0000000000..8e68a3d9cd
--- /dev/null
+++ b/lib/domains/eu/dauphine.txt
@@ -0,0 +1 @@
+Université Paris-Dauphine (Paris IX)
diff --git a/lib/domains/eu/eui b/lib/domains/eu/eui
new file mode 100644
index 0000000000..ef6c5e38f7
--- /dev/null
+++ b/lib/domains/eu/eui
@@ -0,0 +1 @@
+European University Institute
diff --git a/lib/domains/eu/horyzont.txt b/lib/domains/eu/horyzont.txt
new file mode 100644
index 0000000000..462d9cdbe4
--- /dev/null
+++ b/lib/domains/eu/horyzont.txt
@@ -0,0 +1 @@
+Higher school of applied computer science "Horyzont"
diff --git a/lib/domains/eu/ihl.txt b/lib/domains/eu/ihl.txt
new file mode 100644
index 0000000000..372c79c3af
--- /dev/null
+++ b/lib/domains/eu/ihl.txt
@@ -0,0 +1 @@
+Internationale Hochschule Bad Liebenzell
\ No newline at end of file
diff --git a/lib/domains/eu/internationalschoolofeurope.txt b/lib/domains/eu/internationalschoolofeurope.txt
new file mode 100644
index 0000000000..bcb9a71cd3
--- /dev/null
+++ b/lib/domains/eu/internationalschoolofeurope.txt
@@ -0,0 +1 @@
+International School of Europe
diff --git a/lib/domains/eu/schloss-online.txt b/lib/domains/eu/schloss-online.txt
new file mode 100644
index 0000000000..d694dd6a51
--- /dev/null
+++ b/lib/domains/eu/schloss-online.txt
@@ -0,0 +1 @@
+Gymnasium am kurfuerstlichen Schloss Mainz
diff --git a/lib/domains/eus/ehu.txt b/lib/domains/eus/ehu.txt
new file mode 100644
index 0000000000..ef622d400b
--- /dev/null
+++ b/lib/domains/eus/ehu.txt
@@ -0,0 +1 @@
+University of the Basque Country
\ No newline at end of file
diff --git a/lib/domains/fi/eduouka.txt b/lib/domains/fi/eduouka.txt
new file mode 100644
index 0000000000..8a66ac1e51
--- /dev/null
+++ b/lib/domains/fi/eduouka.txt
@@ -0,0 +1 @@
+The City of Oulu Department of Education
diff --git a/lib/domains/fi/hanken.txt b/lib/domains/fi/hanken.txt
new file mode 100644
index 0000000000..765d1ec366
--- /dev/null
+++ b/lib/domains/fi/hanken.txt
@@ -0,0 +1 @@
+Hanken School of Economics
\ No newline at end of file
diff --git a/lib/domains/fi/turku/edu.txt b/lib/domains/fi/turku/edu.txt
new file mode 100644
index 0000000000..6ac902a97b
--- /dev/null
+++ b/lib/domains/fi/turku/edu.txt
@@ -0,0 +1 @@
+Turku Schools
\ No newline at end of file
diff --git a/lib/domains/fr/ac-orleans-tous.txt b/lib/domains/fr/ac-orleans-tours.txt
similarity index 100%
rename from lib/domains/fr/ac-orleans-tous.txt
rename to lib/domains/fr/ac-orleans-tours.txt
diff --git a/lib/domains/fr/ac-paris.txt b/lib/domains/fr/ac-paris.txt
index 05c8145e4c..32cbe6e295 100644
--- a/lib/domains/fr/ac-paris.txt
+++ b/lib/domains/fr/ac-paris.txt
@@ -1 +1,2 @@
 Académie de Paris
+ifocop
diff --git a/lib/domains/fr/agro-bordeaux.txt b/lib/domains/fr/agro-bordeaux.txt
new file mode 100644
index 0000000000..3ac51a35f1
--- /dev/null
+++ b/lib/domains/fr/agro-bordeaux.txt
@@ -0,0 +1 @@
+Bordeaux Sciences Agro
diff --git a/lib/domains/fr/cci/aveyron/formation.txt b/lib/domains/fr/cci/aveyron/formation.txt
new file mode 100644
index 0000000000..7703245249
--- /dev/null
+++ b/lib/domains/fr/cci/aveyron/formation.txt
@@ -0,0 +1 @@
+Chambre de Commerce et d'Industrie Aveyron
\ No newline at end of file
diff --git a/lib/domains/fr/centrale-marseille.txt b/lib/domains/fr/centrale-marseille.txt
new file mode 100644
index 0000000000..9ee86c1339
--- /dev/null
+++ b/lib/domains/fr/centrale-marseille.txt
@@ -0,0 +1 @@
+Ecole Centrale Marseille
diff --git a/lib/domains/fr/cohl.txt b/lib/domains/fr/cohl.txt
new file mode 100644
index 0000000000..946cf07f88
--- /dev/null
+++ b/lib/domains/fr/cohl.txt
@@ -0,0 +1 @@
++École d'art Emile Cohl de Lyon
diff --git a/lib/domains/fr/collegeleparc.txt b/lib/domains/fr/collegeleparc.txt
new file mode 100644
index 0000000000..4d57f6f9d6
--- /dev/null
+++ b/lib/domains/fr/collegeleparc.txt
@@ -0,0 +1 @@
+Collège le Parc
diff --git a/lib/domains/fr/emweb.txt b/lib/domains/fr/emweb.txt
new file mode 100644
index 0000000000..4f200fcbaa
--- /dev/null
+++ b/lib/domains/fr/emweb.txt
@@ -0,0 +1 @@
+L'école des métiers du web
diff --git a/lib/domains/fr/ens-rennes.txt b/lib/domains/fr/ens-rennes.txt
new file mode 100644
index 0000000000..88f379ea82
--- /dev/null
+++ b/lib/domains/fr/ens-rennes.txt
@@ -0,0 +1 @@
+École Nationale Supérieure de Rennes
diff --git a/lib/domains/fr/ensc.txt b/lib/domains/fr/ensc.txt
new file mode 100644
index 0000000000..66fd6fedeb
--- /dev/null
+++ b/lib/domains/fr/ensc.txt
@@ -0,0 +1 @@
+Ecole Nationale Supérieure de Cognitique
diff --git a/lib/domains/fr/grenoble-inp.txt b/lib/domains/fr/grenoble-inp.txt
new file mode 100644
index 0000000000..1851ea58fe
--- /dev/null
+++ b/lib/domains/fr/grenoble-inp.txt
@@ -0,0 +1 @@
+Grenoble INP
diff --git a/lib/domains/fr/groupe-esigelec.txt b/lib/domains/fr/groupe-esigelec.txt
new file mode 100644
index 0000000000..cf32f4415c
--- /dev/null
+++ b/lib/domains/fr/groupe-esigelec.txt
@@ -0,0 +1 @@
+Ecole Supérieure d'Ingénieurs en Génie Electrique
diff --git a/lib/domains/fr/inp-toulouse.txt b/lib/domains/fr/inp-toulouse.txt
new file mode 100644
index 0000000000..daea24ad83
--- /dev/null
+++ b/lib/domains/fr/inp-toulouse.txt
@@ -0,0 +1 @@
+Institut national polytechnique de Toulouse
diff --git a/lib/domains/fr/isae-supaero.txt b/lib/domains/fr/isae-supaero.txt
new file mode 100644
index 0000000000..9ea491c2f7
--- /dev/null
+++ b/lib/domains/fr/isae-supaero.txt
@@ -0,0 +1 @@
+ISAE-SUPAERO
diff --git a/lib/domains/fr/isen-bretagne.txt b/lib/domains/fr/isen-bretagne.txt
new file mode 100644
index 0000000000..206a05d226
--- /dev/null
+++ b/lib/domains/fr/isen-bretagne.txt
@@ -0,0 +1,3 @@
+ISEN - Institut Supérieur de l'Electronique et du Numérique
+
+http://www.isen.fr/
diff --git a/lib/domains/fr/isen-lille.txt b/lib/domains/fr/isen-lille.txt
new file mode 100644
index 0000000000..9b7823dfb4
--- /dev/null
+++ b/lib/domains/fr/isen-lille.txt
@@ -0,0 +1,3 @@
+ISEN Lille - Institut Supérieur de l'Electronique et du Numérique
+
+http://www.isen.fr/
diff --git a/lib/domains/fr/lyon-epsi.txt b/lib/domains/fr/lyon-epsi.txt
new file mode 100644
index 0000000000..b5e8972e32
--- /dev/null
+++ b/lib/domains/fr/lyon-epsi.txt
@@ -0,0 +1 @@
+EPSI Lyon
diff --git a/lib/domains/fr/mancheopenschool.txt b/lib/domains/fr/mancheopenschool.txt
new file mode 100644
index 0000000000..3e1e806aa9
--- /dev/null
+++ b/lib/domains/fr/mancheopenschool.txt
@@ -0,0 +1 @@
+Manche Open School
diff --git a/lib/domains/fr/master-developpement-logiciel.txt b/lib/domains/fr/master-developpement-logiciel.txt
new file mode 100644
index 0000000000..2b66eb1171
--- /dev/null
+++ b/lib/domains/fr/master-developpement-logiciel.txt
@@ -0,0 +1 @@
+Master Developpement Logiciel - Université Paul Sabatier (Toulouse III)
diff --git a/lib/domains/fr/mines-paristech.txt b/lib/domains/fr/mines-paristech.txt
new file mode 100644
index 0000000000..7b63807a74
--- /dev/null
+++ b/lib/domains/fr/mines-paristech.txt
@@ -0,0 +1 @@
+MINES ParisTech
diff --git a/lib/domains/fr/obspm.txt b/lib/domains/fr/obspm.txt
new file mode 100644
index 0000000000..fd61b747ce
--- /dev/null
+++ b/lib/domains/fr/obspm.txt
@@ -0,0 +1 @@
+Observatoire de Paris
diff --git a/lib/domains/fr/udamail.txt b/lib/domains/fr/udamail.txt
new file mode 100644
index 0000000000..469976a84a
--- /dev/null
+++ b/lib/domains/fr/udamail.txt
@@ -0,0 +1 @@
+Université d'Auvergne
diff --git a/lib/domains/fr/uha.txt b/lib/domains/fr/uha.txt
new file mode 100644
index 0000000000..7e8acf68e4
--- /dev/null
+++ b/lib/domains/fr/uha.txt
@@ -0,0 +1 @@
+Universit� de Haute Alsace
\ No newline at end of file
diff --git a/lib/domains/fr/umontpellier.txt b/lib/domains/fr/umontpellier.txt
new file mode 100644
index 0000000000..e1e3184a65
--- /dev/null
+++ b/lib/domains/fr/umontpellier.txt
@@ -0,0 +1 @@
+Université de Montpellier
diff --git a/lib/domains/fr/univ-grenoble.txt b/lib/domains/fr/univ-grenoble.txt
new file mode 100644
index 0000000000..5aa9eed30e
--- /dev/null
+++ b/lib/domains/fr/univ-grenoble.txt
@@ -0,0 +1 @@
+Université Grenoble Alpes
diff --git a/lib/domains/gr/demokritos.txt b/lib/domains/gr/demokritos.txt
new file mode 100644
index 0000000000..a06fab4c79
--- /dev/null
+++ b/lib/domains/gr/demokritos.txt
@@ -0,0 +1 @@
+NCSR Demokritos
diff --git a/lib/domains/gr/ionio.txt b/lib/domains/gr/ionio.txt
new file mode 100644
index 0000000000..c3ce6f6594
--- /dev/null
+++ b/lib/domains/gr/ionio.txt
@@ -0,0 +1 @@
+Ionian University
diff --git a/lib/domains/gr/ssl-unipi.txt b/lib/domains/gr/ssl-unipi.txt
new file mode 100644
index 0000000000..654e9495e6
--- /dev/null
+++ b/lib/domains/gr/ssl-unipi.txt
@@ -0,0 +1 @@
+Systems Security Laboratory, University of Piraeus
diff --git a/lib/domains/gr/teicm.txt b/lib/domains/gr/teicm.txt
new file mode 100644
index 0000000000..55086f5cca
--- /dev/null
+++ b/lib/domains/gr/teicm.txt
@@ -0,0 +1 @@
+Technological Educational Institute of Central Macedonia
diff --git a/lib/domains/hamburg/avh.txt b/lib/domains/hamburg/avh.txt
new file mode 100644
index 0000000000..3c573a1063
--- /dev/null
+++ b/lib/domains/hamburg/avh.txt
@@ -0,0 +1 @@
+Alexander von Humboldt Gymnasium
\ No newline at end of file
diff --git a/lib/domains/hr/fsb.hr b/lib/domains/hr/fsb.hr
new file mode 100644
index 0000000000..b01695bba5
--- /dev/null
+++ b/lib/domains/hr/fsb.hr
@@ -0,0 +1 @@
+Faculty of Mechanical Engineering and Naval Architecture
diff --git a/lib/domains/hr/fsb.txt b/lib/domains/hr/fsb.txt
new file mode 100644
index 0000000000..af4ab5aee0
--- /dev/null
+++ b/lib/domains/hr/fsb.txt
@@ -0,0 +1 @@
+Faculty of Mechanical Engineering and Naval Architecture, University of Zagreb
diff --git a/lib/domains/hr/srce.txt b/lib/domains/hr/srce.txt
new file mode 100644
index 0000000000..2b12ca3ff8
--- /dev/null
+++ b/lib/domains/hr/srce.txt
@@ -0,0 +1 @@
+Unversity of Zagreb - University Computing Centre - Srce
diff --git a/lib/domains/il/ac/braude.txt b/lib/domains/il/ac/braude.txt
new file mode 100644
index 0000000000..adeaf83361
--- /dev/null
+++ b/lib/domains/il/ac/braude.txt
@@ -0,0 +1 @@
+ORT Braude College
diff --git a/lib/domains/in/ac/bits-pilani.txt b/lib/domains/in/ac/bits-pilani.txt
deleted file mode 100644
index b7ebf358a4..0000000000
--- a/lib/domains/in/ac/bits-pilani.txt
+++ /dev/null
@@ -1 +0,0 @@
-Birla Institute of Technology and Science
\ No newline at end of file
diff --git a/lib/domains/in/ac/bits-pilani/dubai.txt b/lib/domains/in/ac/bits-pilani/dubai.txt
new file mode 100644
index 0000000000..ff9f776b6c
--- /dev/null
+++ b/lib/domains/in/ac/bits-pilani/dubai.txt
@@ -0,0 +1 @@
+Birla Institute of Technology and Science, Pilani – Dubai Campus
diff --git a/lib/domains/in/ac/bits-pilani/goa.txt b/lib/domains/in/ac/bits-pilani/goa.txt
new file mode 100644
index 0000000000..8027167200
--- /dev/null
+++ b/lib/domains/in/ac/bits-pilani/goa.txt
@@ -0,0 +1 @@
+Birla Institute of Technology and Science, Pilani – K K Birla Goa Campus
diff --git a/lib/domains/in/ac/bits-pilani/hyderabad.txt b/lib/domains/in/ac/bits-pilani/hyderabad.txt
new file mode 100644
index 0000000000..06dca1456d
--- /dev/null
+++ b/lib/domains/in/ac/bits-pilani/hyderabad.txt
@@ -0,0 +1 @@
+Birla Institute of Technology and Science, Pilani – Hyderabad Campus
diff --git a/lib/domains/in/ac/bits-pilani/pilani.txt b/lib/domains/in/ac/bits-pilani/pilani.txt
new file mode 100644
index 0000000000..bd680ccfe6
--- /dev/null
+++ b/lib/domains/in/ac/bits-pilani/pilani.txt
@@ -0,0 +1 @@
+Birla Institute of Technology and Science, Pilani – Pilani Campus
diff --git a/lib/domains/in/ac/dtu.txt b/lib/domains/in/ac/dtu.txt
new file mode 100644
index 0000000000..5334b5e4a5
--- /dev/null
+++ b/lib/domains/in/ac/dtu.txt
@@ -0,0 +1 @@
+Delhi Technological University
diff --git a/lib/domains/in/aryacollege.txt b/lib/domains/in/aryacollege.txt
new file mode 100644
index 0000000000..e74cfa85e8
--- /dev/null
+++ b/lib/domains/in/aryacollege.txt
@@ -0,0 +1 @@
+Arya College of Engineering and I.T.
diff --git a/lib/domains/in/bvicam.txt b/lib/domains/in/bvicam.txt
new file mode 100644
index 0000000000..b4003429ec
--- /dev/null
+++ b/lib/domains/in/bvicam.txt
@@ -0,0 +1 @@
+Bharati Vidyapeeth's Institute of Computer Applications and Management
diff --git a/lib/domains/in/christuniversity.txt b/lib/domains/in/christuniversity.txt
new file mode 100644
index 0000000000..9ee3d34a2b
--- /dev/null
+++ b/lib/domains/in/christuniversity.txt
@@ -0,0 +1 @@
+Christ University, Bangalore
diff --git a/lib/domains/in/csitgeu.txt b/lib/domains/in/csitgeu.txt
new file mode 100644
index 0000000000..7a2e69b219
--- /dev/null
+++ b/lib/domains/in/csitgeu.txt
@@ -0,0 +1 @@
+Department of Computer Science and Information Technology, GEU
diff --git a/lib/domains/in/edu/skpec.txt b/lib/domains/in/edu/skpec.txt
new file mode 100644
index 0000000000..f7974ac3d3
--- /dev/null
+++ b/lib/domains/in/edu/skpec.txt
@@ -0,0 +1 @@
+SKP Engineering College
diff --git a/lib/domains/in/ernet/tezu.txt b/lib/domains/in/ernet/tezu.txt
new file mode 100644
index 0000000000..691ef7cdf3
--- /dev/null
+++ b/lib/domains/in/ernet/tezu.txt
@@ -0,0 +1 @@
+Tezpur University
diff --git a/lib/domains/in/igib.txt b/lib/domains/in/igib.txt
new file mode 100644
index 0000000000..df018af0e8
--- /dev/null
+++ b/lib/domains/in/igib.txt
@@ -0,0 +1 @@
+CSIR Institute of Genomics and Integrative Biology
diff --git a/lib/domains/in/kluniversity.txt b/lib/domains/in/kluniversity.txt
new file mode 100644
index 0000000000..afbacc9925
--- /dev/null
+++ b/lib/domains/in/kluniversity.txt
@@ -0,0 +1 @@
+K L University
diff --git a/lib/domains/in/msit.txt b/lib/domains/in/msit.txt
new file mode 100644
index 0000000000..d31918d5a7
--- /dev/null
+++ b/lib/domains/in/msit.txt
@@ -0,0 +1 @@
+Maharaja Surajmal Institute of Technology
diff --git a/lib/domains/in/org/iihmr.txt b/lib/domains/in/org/iihmr.txt
new file mode 100644
index 0000000000..ba0adfe028
--- /dev/null
+++ b/lib/domains/in/org/iihmr.txt
@@ -0,0 +1 @@
+iihmr jaipur
diff --git a/lib/domains/info/rswol-iserv.txt b/lib/domains/info/rswol-iserv.txt
new file mode 100644
index 0000000000..b38426d51c
--- /dev/null
+++ b/lib/domains/info/rswol-iserv.txt
@@ -0,0 +1 @@
+Realschule Wolbeck
diff --git a/lib/domains/ir/mehr/sharif.txt b/lib/domains/ir/mehr/sharif.txt
new file mode 100644
index 0000000000..a4eafdf78e
--- /dev/null
+++ b/lib/domains/ir/mehr/sharif.txt
@@ -0,0 +1 @@
+Sharif University of Technology
diff --git a/lib/domains/it/itiscastelli.txt b/lib/domains/it/itiscastelli.txt
new file mode 100644
index 0000000000..70d7921ede
--- /dev/null
+++ b/lib/domains/it/itiscastelli.txt
@@ -0,0 +1 @@
+ITIS Castelli, Brescia
diff --git a/lib/domains/it/unicz.txt b/lib/domains/it/unicz.txt
new file mode 100644
index 0000000000..9419b567cc
--- /dev/null
+++ b/lib/domains/it/unicz.txt
@@ -0,0 +1 @@
+University Magna Graecia of Catanzaro
diff --git a/lib/domains/jp/ac/ynu.txt b/lib/domains/jp/ac/ynu.txt
new file mode 100644
index 0000000000..4b60ca74b0
--- /dev/null
+++ b/lib/domains/jp/ac/ynu.txt
@@ -0,0 +1 @@
+Yokohama National University
\ No newline at end of file
diff --git a/lib/domains/jp/chibakoudai/s.txt b/lib/domains/jp/chibakoudai/s.txt
new file mode 100644
index 0000000000..2cdb309831
--- /dev/null
+++ b/lib/domains/jp/chibakoudai/s.txt
@@ -0,0 +1 @@
+Chiba Institute of Technology.
diff --git a/lib/domains/jp/oic.txt b/lib/domains/jp/oic.txt
new file mode 100644
index 0000000000..86526359d1
--- /dev/null
+++ b/lib/domains/jp/oic.txt
@@ -0,0 +1 @@
+Osaka Information and Computer Science College
\ No newline at end of file
diff --git a/lib/domains/jp/ynu.txt b/lib/domains/jp/ynu.txt
new file mode 100644
index 0000000000..4b60ca74b0
--- /dev/null
+++ b/lib/domains/jp/ynu.txt
@@ -0,0 +1 @@
+Yokohama National University
\ No newline at end of file
diff --git a/lib/domains/kr/kau.txt b/lib/domains/kr/kau.txt
new file mode 100644
index 0000000000..d8e41ff252
--- /dev/null
+++ b/lib/domains/kr/kau.txt
@@ -0,0 +1 @@
+Korea Aerospace University
\ No newline at end of file
diff --git a/lib/domains/kz/keu.txt b/lib/domains/kz/keu.txt
new file mode 100644
index 0000000000..21329b9387
--- /dev/null
+++ b/lib/domains/kz/keu.txt
@@ -0,0 +1 @@
+Karaganda Economic University
diff --git a/lib/domains/kz/psu.txt b/lib/domains/kz/psu.txt
new file mode 100644
index 0000000000..ac2de44f66
--- /dev/null
+++ b/lib/domains/kz/psu.txt
@@ -0,0 +1 @@
+Pavlodar State University
diff --git a/lib/domains/lu/btsi.txt b/lib/domains/lu/btsi.txt
new file mode 100644
index 0000000000..de52562502
--- /dev/null
+++ b/lib/domains/lu/btsi.txt
@@ -0,0 +1 @@
+Lycee des Arts et Metiers
diff --git a/lib/domains/lu/education.txt b/lib/domains/lu/education.txt
new file mode 100644
index 0000000000..de7e9fa55d
--- /dev/null
+++ b/lib/domains/lu/education.txt
@@ -0,0 +1 @@
+Education Luxembourg
diff --git a/lib/domains/lu/school.txt b/lib/domains/lu/school.txt
new file mode 100644
index 0000000000..67d511e15d
--- /dev/null
+++ b/lib/domains/lu/school.txt
@@ -0,0 +1 @@
+Students Emails Education Luxembourg
diff --git a/lib/domains/ma/uca/cadi.txt b/lib/domains/ma/uca/cadi.txt
new file mode 100644
index 0000000000..97a891fdc5
--- /dev/null
+++ b/lib/domains/ma/uca/cadi.txt
@@ -0,0 +1 @@
+Université Cadi Ayyad
diff --git a/lib/domains/mx/edu/conalep.txt b/lib/domains/mx/edu/conalep.txt
new file mode 100644
index 0000000000..bc3fb37406
--- /dev/null
+++ b/lib/domains/mx/edu/conalep.txt
@@ -0,0 +1 @@
+Colegio Nacional de Educacion Profesional Tecnica
diff --git a/lib/domains/mx/edu/uteg.txt b/lib/domains/mx/edu/uteg.txt
new file mode 100644
index 0000000000..9af3b6e7e9
--- /dev/null
+++ b/lib/domains/mx/edu/uteg.txt
@@ -0,0 +1 @@
+Universidad Tecnologica De Guadalajara
diff --git a/lib/domains/mx/ith.txt b/lib/domains/mx/ith.txt
new file mode 100644
index 0000000000..d0d5142fdc
--- /dev/null
+++ b/lib/domains/mx/ith.txt
@@ -0,0 +1,2 @@
+Instituto Tecnológico de Hermosillo
+
diff --git a/lib/domains/mx/udla.txt b/lib/domains/mx/udladf.txt
similarity index 50%
rename from lib/domains/mx/udla.txt
rename to lib/domains/mx/udladf.txt
index 4d7bde63f5..4983b801b3 100644
--- a/lib/domains/mx/udla.txt
+++ b/lib/domains/mx/udladf.txt
@@ -1,2 +1 @@
 Universidad de las Américas
-Universidad de las Américas
diff --git a/lib/domains/net/fevaq.txt b/lib/domains/net/fevaq.txt
new file mode 100644
index 0000000000..0028603def
--- /dev/null
+++ b/lib/domains/net/fevaq.txt
@@ -0,0 +1 @@
+Facultad de Economia "Vasco de Quiroga"
\ No newline at end of file
diff --git a/lib/domains/net/fosbos.txt b/lib/domains/net/fosbos.txt
new file mode 100644
index 0000000000..cbecb534ea
--- /dev/null
+++ b/lib/domains/net/fosbos.txt
@@ -0,0 +1 @@
+Maximilian Kolbe (Fachober- & Berufsober-) Schule Neumarkt
\ No newline at end of file
diff --git a/lib/domains/net/krotoszyn/zsp2.txt b/lib/domains/net/krotoszyn/zsp2.txt
new file mode 100644
index 0000000000..348c4db197
--- /dev/null
+++ b/lib/domains/net/krotoszyn/zsp2.txt
@@ -0,0 +1 @@
+Zespół Szkół Ponadgimnazjalnych nr 2 w Krotoszynie
diff --git a/lib/domains/net/lausd.txt b/lib/domains/net/lausd.txt
new file mode 100644
index 0000000000..a40b781a7a
--- /dev/null
+++ b/lib/domains/net/lausd.txt
@@ -0,0 +1 @@
+Los Angeles Unified School District
diff --git a/lib/domains/net/pleiad.txt b/lib/domains/net/lecnam.txt
similarity index 100%
rename from lib/domains/net/pleiad.txt
rename to lib/domains/net/lecnam.txt
diff --git a/lib/domains/net/livenau.txt b/lib/domains/net/livenau.txt
new file mode 100644
index 0000000000..dc8f1d84a5
--- /dev/null
+++ b/lib/domains/net/livenau.txt
@@ -0,0 +1 @@
+National Aviation University
diff --git a/lib/domains/net/nspu.txt b/lib/domains/net/nspu.txt
new file mode 100644
index 0000000000..eac79b56fd
--- /dev/null
+++ b/lib/domains/net/nspu.txt
@@ -0,0 +1 @@
+Novosibirsk State Pedagogical University
diff --git a/lib/domains/net/oisbd.txt b/lib/domains/net/oisbd.txt
new file mode 100644
index 0000000000..062f812c16
--- /dev/null
+++ b/lib/domains/net/oisbd.txt
@@ -0,0 +1 @@
+Oxford International School
diff --git a/lib/domains/net/palisadessd.txt b/lib/domains/net/palisadessd.txt
new file mode 100644
index 0000000000..49acdb6d75
--- /dev/null
+++ b/lib/domains/net/palisadessd.txt
@@ -0,0 +1 @@
+Palisades School District
diff --git a/lib/domains/net/pennmanor.txt b/lib/domains/net/pennmanor.txt
new file mode 100644
index 0000000000..eaee132352
--- /dev/null
+++ b/lib/domains/net/pennmanor.txt
@@ -0,0 +1 @@
+Penn Manor School District
diff --git a/lib/domains/net/saltashcloud.txt b/lib/domains/net/saltashcloud.txt
new file mode 100644
index 0000000000..852fadb8ee
--- /dev/null
+++ b/lib/domains/net/saltashcloud.txt
@@ -0,0 +1 @@
+saltash.net community school
diff --git a/lib/domains/net/swcta.txt b/lib/domains/net/swcta.txt
new file mode 100644
index 0000000000..64162ff5f6
--- /dev/null
+++ b/lib/domains/net/swcta.txt
@@ -0,0 +1 @@
+Southwest Career and Technical Academy
diff --git a/lib/domains/net/uamcr.txt b/lib/domains/net/uamcr.txt
new file mode 100644
index 0000000000..8af3965c0a
--- /dev/null
+++ b/lib/domains/net/uamcr.txt
@@ -0,0 +1 @@
+Universidad Americana
diff --git a/lib/domains/net/ugtu.txt b/lib/domains/net/ugtu.txt
new file mode 100644
index 0000000000..09f704f27a
--- /dev/null
+++ b/lib/domains/net/ugtu.txt
@@ -0,0 +1 @@
+Ukhta State Technical University
diff --git a/lib/domains/net/unesc.txt b/lib/domains/net/unesc.txt
new file mode 100644
index 0000000000..72e47a3518
--- /dev/null
+++ b/lib/domains/net/unesc.txt
@@ -0,0 +1 @@
+Universidade do Extremo Sul Catarinense
diff --git a/lib/domains/net/vcpusd.txt b/lib/domains/net/vcpusd.txt
new file mode 100644
index 0000000000..d1da4ee73e
--- /dev/null
+++ b/lib/domains/net/vcpusd.txt
@@ -0,0 +1 @@
+Valley Center-Pauma Unified
diff --git a/lib/domains/ng/edu/aun.txt b/lib/domains/ng/edu/aun.txt
new file mode 100644
index 0000000000..860af0ba41
--- /dev/null
+++ b/lib/domains/ng/edu/aun.txt
@@ -0,0 +1 @@
+American University of Nigeria
diff --git a/lib/domains/ng/edu/oauife.txt b/lib/domains/ng/edu/oauife.txt
new file mode 100644
index 0000000000..555ddf7bc3
--- /dev/null
+++ b/lib/domains/ng/edu/oauife.txt
@@ -0,0 +1 @@
+Obafemi Awolowo University
diff --git a/lib/domains/ng/edu/unilorin.txt b/lib/domains/ng/edu/unilorin.txt
new file mode 100644
index 0000000000..723fe78163
--- /dev/null
+++ b/lib/domains/ng/edu/unilorin.txt
@@ -0,0 +1 @@
+University of Ilorin
diff --git a/lib/domains/ng/edu/unilorin.txt~ b/lib/domains/ng/edu/unilorin.txt~
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/domains/ng/edu/ust.txt b/lib/domains/ng/edu/ust.txt
new file mode 100644
index 0000000000..56738f1d41
--- /dev/null
+++ b/lib/domains/ng/edu/ust.txt
@@ -0,0 +1 @@
+Rivers State University of Science and Technology
diff --git a/lib/domains/nl/ahk/student.txt b/lib/domains/nl/ahk/student.txt
new file mode 100644
index 0000000000..8b5c26d0b7
--- /dev/null
+++ b/lib/domains/nl/ahk/student.txt
@@ -0,0 +1 @@
+Amsterdam University Of The Arts
diff --git a/lib/domains/nl/albeda/student.txt b/lib/domains/nl/albeda/student.txt
new file mode 100644
index 0000000000..5fb2aff199
--- /dev/null
+++ b/lib/domains/nl/albeda/student.txt
@@ -0,0 +1 @@
+Albeda College Rotterdam
\ No newline at end of file
diff --git a/lib/domains/nl/alfa-college/student.txt b/lib/domains/nl/alfa-college/student.txt
new file mode 100644
index 0000000000..7b4032ca18
--- /dev/null
+++ b/lib/domains/nl/alfa-college/student.txt
@@ -0,0 +1 @@
+Student subdomain for Alfa College in Hoogeveen and Groningen
diff --git a/lib/domains/nl/artez/student.txt b/lib/domains/nl/artez/student.txt
new file mode 100644
index 0000000000..448a000d07
--- /dev/null
+++ b/lib/domains/nl/artez/student.txt
@@ -0,0 +1 @@
+ArtEZ hogeschool voor de kunsten
diff --git a/lib/domains/nl/che.txt b/lib/domains/nl/che.txt
new file mode 100644
index 0000000000..c7247442f1
--- /dev/null
+++ b/lib/domains/nl/che.txt
@@ -0,0 +1 @@
+CHE Christian University of Applied Sciences
diff --git a/lib/domains/nl/edu-kw1c.txt b/lib/domains/nl/edu-kw1c.txt
new file mode 100644
index 0000000000..7f9f438fe4
--- /dev/null
+++ b/lib/domains/nl/edu-kw1c.txt
@@ -0,0 +1 @@
+Koning Willem 1 College
\ No newline at end of file
diff --git a/lib/domains/nl/fcroc.txt b/lib/domains/nl/fcroc.txt
new file mode 100644
index 0000000000..fc2f3963f7
--- /dev/null
+++ b/lib/domains/nl/fcroc.txt
@@ -0,0 +1 @@
+Friesland College
diff --git a/lib/domains/nl/hageveld.txt b/lib/domains/nl/hageveld.txt
new file mode 100644
index 0000000000..3a250cdd12
--- /dev/null
+++ b/lib/domains/nl/hageveld.txt
@@ -0,0 +1 @@
+Atheneum College Hageveld
diff --git a/lib/domains/nl/jtc-roosendaal.txt b/lib/domains/nl/jtc-roosendaal.txt
new file mode 100644
index 0000000000..45bac207ca
--- /dev/null
+++ b/lib/domains/nl/jtc-roosendaal.txt
@@ -0,0 +1 @@
+Jan Tinbergen College
diff --git a/lib/domains/nl/kennemerlyceum.txt b/lib/domains/nl/kennemerlyceum.txt
new file mode 100644
index 0000000000..231f25c8e3
--- /dev/null
+++ b/lib/domains/nl/kennemerlyceum.txt
@@ -0,0 +1 @@
+Kennemer Lyceum
diff --git a/lib/domains/nl/lumc.txt b/lib/domains/nl/lumc.txt
new file mode 100644
index 0000000000..9ea0d47f30
--- /dev/null
+++ b/lib/domains/nl/lumc.txt
@@ -0,0 +1 @@
+Leiden University Medical Center
diff --git a/lib/domains/nl/mondriaanict.txt b/lib/domains/nl/mondriaanict.txt
new file mode 100644
index 0000000000..42ae9a0b77
--- /dev/null
+++ b/lib/domains/nl/mondriaanict.txt
@@ -0,0 +1 @@
+ROC mondriaan School voor ICT
diff --git a/lib/domains/nl/noorderpoort/st.txt b/lib/domains/nl/noorderpoort/st.txt
new file mode 100644
index 0000000000..2eca4893ae
--- /dev/null
+++ b/lib/domains/nl/noorderpoort/st.txt
@@ -0,0 +1 @@
+ROC Noorderpoort College
diff --git a/lib/domains/nl/novacollege.txt b/lib/domains/nl/novacollege.txt
new file mode 100644
index 0000000000..61e520d8a7
--- /dev/null
+++ b/lib/domains/nl/novacollege.txt
@@ -0,0 +1 @@
+Nova College
\ No newline at end of file
diff --git a/lib/domains/nl/nyenrode.txt b/lib/domains/nl/nyenrode.txt
new file mode 100644
index 0000000000..8aead5109b
--- /dev/null
+++ b/lib/domains/nl/nyenrode.txt
@@ -0,0 +1 @@
+Nyenrode Business Universiteit
diff --git a/lib/domains/nl/rockopnh.nl b/lib/domains/nl/rockopnh.nl
new file mode 100644
index 0000000000..40989e9c35
--- /dev/null
+++ b/lib/domains/nl/rockopnh.nl
@@ -0,0 +1 @@
+ROC Kop van Noord Holland
diff --git a/lib/domains/nl/rockopnh.txt b/lib/domains/nl/rockopnh.txt
new file mode 100644
index 0000000000..40989e9c35
--- /dev/null
+++ b/lib/domains/nl/rockopnh.txt
@@ -0,0 +1 @@
+ROC Kop van Noord Holland
diff --git a/lib/domains/nl/vathorstcollege.txt b/lib/domains/nl/vathorstcollege.txt
new file mode 100644
index 0000000000..5b6e5fc249
--- /dev/null
+++ b/lib/domains/nl/vathorstcollege.txt
@@ -0,0 +1 @@
+Vathorst College
\ No newline at end of file
diff --git a/lib/domains/nl/wolfert.txt b/lib/domains/nl/wolfert.txt
new file mode 100644
index 0000000000..5cfa0480a8
--- /dev/null
+++ b/lib/domains/nl/wolfert.txt
@@ -0,0 +1 @@
+Wolfert van Borselen Scholengroep
diff --git a/lib/domains/no/hint.txt b/lib/domains/no/hint.txt
new file mode 100644
index 0000000000..fd5dab0a2f
--- /dev/null
+++ b/lib/domains/no/hint.txt
@@ -0,0 +1 @@
+Nord-Trøndelag University College
diff --git a/lib/domains/no/umb.txt b/lib/domains/no/nmbu.txt
similarity index 100%
rename from lib/domains/no/umb.txt
rename to lib/domains/no/nmbu.txt
diff --git a/lib/domains/no/westerdals.txt b/lib/domains/no/westerdals.txt
new file mode 100644
index 0000000000..6ff5fede1f
--- /dev/null
+++ b/lib/domains/no/westerdals.txt
@@ -0,0 +1 @@
+Westerdals Høyskole - Oslo School of Arts, Communication and Technology AS
diff --git a/lib/domains/org/agora.txt b/lib/domains/org/agora.txt
new file mode 100644
index 0000000000..bd464258e9
--- /dev/null
+++ b/lib/domains/org/agora.txt
@@ -0,0 +1 @@
+Agora Cyber Charter School
diff --git a/lib/domains/org/akiva.txt b/lib/domains/org/akiva.txt
new file mode 100644
index 0000000000..0fb563b51d
--- /dev/null
+++ b/lib/domains/org/akiva.txt
@@ -0,0 +1 @@
+Akiva Hebrew Day School
diff --git a/lib/domains/org/bostonpublicschools.txt b/lib/domains/org/bostonpublicschools.txt
new file mode 100644
index 0000000000..bdd11b975d
--- /dev/null
+++ b/lib/domains/org/bostonpublicschools.txt
@@ -0,0 +1 @@
+Boston Public Schools (Teachers)
diff --git a/lib/domains/org/bournemouth-school/student.txt b/lib/domains/org/bournemouth-school/student.txt
new file mode 100644
index 0000000000..5f850223fa
--- /dev/null
+++ b/lib/domains/org/bournemouth-school/student.txt
@@ -0,0 +1 @@
+Bournemouth School, Dorset
\ No newline at end of file
diff --git a/lib/domains/org/brightstarschools.txt b/lib/domains/org/brightstarschools.txt
new file mode 100644
index 0000000000..06c34bc234
--- /dev/null
+++ b/lib/domains/org/brightstarschools.txt
@@ -0,0 +1 @@
+Bright Star Schools (Staff)
diff --git a/lib/domains/org/brightstarstudents.txt b/lib/domains/org/brightstarstudents.txt
new file mode 100644
index 0000000000..c0dc471bfc
--- /dev/null
+++ b/lib/domains/org/brightstarstudents.txt
@@ -0,0 +1 @@
+Bright Star Schools (Students)
diff --git a/lib/domains/org/cherrycreekschools.txt b/lib/domains/org/cherrycreekschools.txt
new file mode 100644
index 0000000000..16f766eed6
--- /dev/null
+++ b/lib/domains/org/cherrycreekschools.txt
@@ -0,0 +1 @@
+Cherry Creek School District #5
diff --git a/lib/domains/org/cvoantwerpen.txt b/lib/domains/org/cvoantwerpen.txt
new file mode 100644
index 0000000000..f1a30efb28
--- /dev/null
+++ b/lib/domains/org/cvoantwerpen.txt
@@ -0,0 +1 @@
+CVO Antwerpen
diff --git a/lib/domains/org/dpisd.txt b/lib/domains/org/dpisd.txt
new file mode 100644
index 0000000000..e0195f26d9
--- /dev/null
+++ b/lib/domains/org/dpisd.txt
@@ -0,0 +1 @@
+Deer Park Independent School District
diff --git a/lib/domains/org/elsys-bg.txt b/lib/domains/org/elsys-bg.txt
new file mode 100644
index 0000000000..3baa0327c4
--- /dev/null
+++ b/lib/domains/org/elsys-bg.txt
@@ -0,0 +1,2 @@
+Technological school Electronic Systems
+Associated with Technical University Sofia, Bulgaria
diff --git a/lib/domains/org/esaip.txt b/lib/domains/org/esaip.txt
new file mode 100644
index 0000000000..abc3cdbde8
--- /dev/null
+++ b/lib/domains/org/esaip.txt
@@ -0,0 +1 @@
+École supérieure angevine en informatique et productique
diff --git a/lib/domains/org/friscoisd.txt b/lib/domains/org/friscoisd.txt
new file mode 100644
index 0000000000..572e15a06c
--- /dev/null
+++ b/lib/domains/org/friscoisd.txt
@@ -0,0 +1 @@
+Centennial High School
diff --git a/lib/domains/org/gissv.txt b/lib/domains/org/gissv.txt
new file mode 100644
index 0000000000..3ffefad077
--- /dev/null
+++ b/lib/domains/org/gissv.txt
@@ -0,0 +1 @@
+German International School of Silicon Valley
diff --git a/lib/domains/org/iesdonana.txt b/lib/domains/org/iesdonana.txt
new file mode 100644
index 0000000000..0935f9317f
--- /dev/null
+++ b/lib/domains/org/iesdonana.txt
@@ -0,0 +1 @@
+IES Doñana (Sanlúcar de Barrameda, Cádiz, Spain)
diff --git a/lib/domains/org/iespoblenou.txt b/lib/domains/org/iespoblenou.txt
new file mode 100644
index 0000000000..4b68135f2f
--- /dev/null
+++ b/lib/domains/org/iespoblenou.txt
@@ -0,0 +1 @@
+Institut Poblenou
diff --git a/lib/domains/org/invenio.txt b/lib/domains/org/invenio.txt
new file mode 100644
index 0000000000..b3d3c058c7
--- /dev/null
+++ b/lib/domains/org/invenio.txt
@@ -0,0 +1 @@
+Universidad Invenio
diff --git a/lib/domains/org/ipeindia.txt b/lib/domains/org/ipeindia.txt
new file mode 100644
index 0000000000..fcb390fd65
--- /dev/null
+++ b/lib/domains/org/ipeindia.txt
@@ -0,0 +1,3 @@
+Institute Of Public Enterprise
+Website: http://www.ipeindia.org
+student emails at @ipeindia.org for example 1301007@ipeindia.org
diff --git a/lib/domains/org/jpsstudents.txt b/lib/domains/org/jpsstudents.txt
new file mode 100644
index 0000000000..790defc7ad
--- /dev/null
+++ b/lib/domains/org/jpsstudents.txt
@@ -0,0 +1 @@
+Jenison Public Senior High
\ No newline at end of file
diff --git a/lib/domains/org/kua.txt b/lib/domains/org/kua.txt
new file mode 100644
index 0000000000..97bf2fe0e8
--- /dev/null
+++ b/lib/domains/org/kua.txt
@@ -0,0 +1 @@
+Kimball Union Academy
diff --git a/lib/domains/org/lakesideschool.txt b/lib/domains/org/lakesideschool.txt
new file mode 100644
index 0000000000..2908d7e86d
--- /dev/null
+++ b/lib/domains/org/lakesideschool.txt
@@ -0,0 +1 @@
+Lakeside School
diff --git a/lib/domains/org/liebenzell.txt b/lib/domains/org/liebenzell.txt
new file mode 100644
index 0000000000..372c79c3af
--- /dev/null
+++ b/lib/domains/org/liebenzell.txt
@@ -0,0 +1 @@
+Internationale Hochschule Bad Liebenzell
\ No newline at end of file
diff --git a/lib/domains/org/lordwandsworth.txt b/lib/domains/org/lordwandsworth.txt
new file mode 100644
index 0000000000..a8c907b420
--- /dev/null
+++ b/lib/domains/org/lordwandsworth.txt
@@ -0,0 +1 @@
+Lord Wandsworth College
diff --git a/lib/domains/org/mdanderson.txt b/lib/domains/org/mdanderson.txt
new file mode 100644
index 0000000000..e005ebb459
--- /dev/null
+++ b/lib/domains/org/mdanderson.txt
@@ -0,0 +1 @@
+University of Texas MD Anderson Cancer Center
diff --git a/lib/domains/org/mgs.txt b/lib/domains/org/mgs.txt
new file mode 100644
index 0000000000..00ad6666d3
--- /dev/null
+++ b/lib/domains/org/mgs.txt
@@ -0,0 +1 @@
+The Manchester Grammar School
diff --git a/lib/domains/org/npenn.txt b/lib/domains/org/npenn.txt
new file mode 100644
index 0000000000..f5071df49d
--- /dev/null
+++ b/lib/domains/org/npenn.txt
@@ -0,0 +1 @@
+North Penn School District
diff --git a/lib/domains/org/palisadessd.txt b/lib/domains/org/palisadessd.txt
new file mode 100644
index 0000000000..49acdb6d75
--- /dev/null
+++ b/lib/domains/org/palisadessd.txt
@@ -0,0 +1 @@
+Palisades School District
diff --git a/lib/domains/org/parishepiscopal.txt b/lib/domains/org/parishepiscopal.txt
new file mode 100644
index 0000000000..db03bf8d5c
--- /dev/null
+++ b/lib/domains/org/parishepiscopal.txt
@@ -0,0 +1 @@
+Parish Episcopal School
diff --git a/lib/domains/org/seattlegirlsschool.txt b/lib/domains/org/seattlegirlsschool.txt
new file mode 100644
index 0000000000..d7a634892a
--- /dev/null
+++ b/lib/domains/org/seattlegirlsschool.txt
@@ -0,0 +1 @@
+Seattle Girls' School
diff --git a/lib/domains/org/sesd.txt b/lib/domains/org/sesd.txt
new file mode 100644
index 0000000000..44e0e12ea4
--- /dev/null
+++ b/lib/domains/org/sesd.txt
@@ -0,0 +1 @@
+Sunnyvale Middle School District, CA
\ No newline at end of file
diff --git a/lib/domains/org/sgs-wa.txt b/lib/domains/org/sgs-wa.txt
new file mode 100644
index 0000000000..a2502cac15
--- /dev/null
+++ b/lib/domains/org/sgs-wa.txt
@@ -0,0 +1 @@
+Seattle Girls' School: Google Apps for Education Domain
diff --git a/lib/domains/org/smtexas.txt b/lib/domains/org/smtexas.txt
new file mode 100644
index 0000000000..ffbe03e90e
--- /dev/null
+++ b/lib/domains/org/smtexas.txt
@@ -0,0 +1 @@
+St. Mark's School of Texas
diff --git a/lib/domains/org/stjohnsprep.txt b/lib/domains/org/stjohnsprep.txt
new file mode 100644
index 0000000000..23dbf34fc7
--- /dev/null
+++ b/lib/domains/org/stjohnsprep.txt
@@ -0,0 +1 @@
+St. John's Preparatory High School
diff --git a/lib/domains/org/sun-tech.txt b/lib/domains/org/sun-tech.txt
new file mode 100644
index 0000000000..fc217d2859
--- /dev/null
+++ b/lib/domains/org/sun-tech.txt
@@ -0,0 +1 @@
+SUN Area Technical Institute
diff --git a/lib/domains/org/tcdsb.txt b/lib/domains/org/tcdsb.txt
new file mode 100644
index 0000000000..8e00791110
--- /dev/null
+++ b/lib/domains/org/tcdsb.txt
@@ -0,0 +1 @@
+Toronto Catholic District School Board
diff --git a/lib/domains/org/tggs-bangkok.txt b/lib/domains/org/tggs-bangkok.txt
new file mode 100644
index 0000000000..e704521a62
--- /dev/null
+++ b/lib/domains/org/tggs-bangkok.txt
@@ -0,0 +1 @@
+THE SIRINDHORN INTERNATIONAL THAI-GERMAN GRADUATE SCHOOL OF ENGINEERING
diff --git a/lib/domains/org/ttsdstudents.txt b/lib/domains/org/ttsdstudents.txt
new file mode 100644
index 0000000000..797db96a27
--- /dev/null
+++ b/lib/domains/org/ttsdstudents.txt
@@ -0,0 +1 @@
+Tualatin High School
\ No newline at end of file
diff --git a/lib/domains/org/vcpusd.txt b/lib/domains/org/vcpusd.txt
new file mode 100644
index 0000000000..d1da4ee73e
--- /dev/null
+++ b/lib/domains/org/vcpusd.txt
@@ -0,0 +1 @@
+Valley Center-Pauma Unified
diff --git a/lib/domains/org/viva-technology.txt b/lib/domains/org/viva-technology.txt
new file mode 100644
index 0000000000..8c0ff69637
--- /dev/null
+++ b/lib/domains/org/viva-technology.txt
@@ -0,0 +1 @@
+VIVA Institute of Technology
diff --git a/lib/domains/org/wlsv.txt b/lib/domains/org/wlsv.txt
new file mode 100644
index 0000000000..529e953abf
--- /dev/null
+++ b/lib/domains/org/wlsv.txt
@@ -0,0 +1 @@
+Wellsville Central School District
diff --git a/lib/domains/pe/edu/upao.txt b/lib/domains/pe/edu/upao.txt
new file mode 100644
index 0000000000..87724087b5
--- /dev/null
+++ b/lib/domains/pe/edu/upao.txt
@@ -0,0 +1 @@
+Universidad Privada Antenor Orrego
diff --git a/lib/domains/pe/urp.txt b/lib/domains/pe/urp.txt
new file mode 100644
index 0000000000..ce43c05b15
--- /dev/null
+++ b/lib/domains/pe/urp.txt
@@ -0,0 +1 @@
+Universidad Ricardo Palma
diff --git a/lib/domains/pe/usil.txt b/lib/domains/pe/usil.txt
new file mode 100644
index 0000000000..62acf6387f
--- /dev/null
+++ b/lib/domains/pe/usil.txt
@@ -0,0 +1 @@
+Universidad San Ignacio de Loyola
diff --git a/lib/domains/pl/cdv.txt b/lib/domains/pl/cdv.txt
new file mode 100644
index 0000000000..87bccca0e4
--- /dev/null
+++ b/lib/domains/pl/cdv.txt
@@ -0,0 +1 @@
+Collegium Da Vinci
\ No newline at end of file
diff --git a/lib/domains/pl/dwspit.txt b/lib/domains/pl/dwspit.txt
new file mode 100644
index 0000000000..aae7a3ee83
--- /dev/null
+++ b/lib/domains/pl/dwspit.txt
@@ -0,0 +1,3 @@
+Dolnoslaska Wyzsza Szkola Przedsiebiorczosci i Techniki w Polkowicach
+The Lower Silesian University of Entrepreneurship and Technology in
+Polkowice
diff --git a/lib/domains/pl/edu/ewsie.txt b/lib/domains/pl/edu/ewsie.txt
new file mode 100644
index 0000000000..f2704dee37
--- /dev/null
+++ b/lib/domains/pl/edu/ewsie.txt
@@ -0,0 +1 @@
+Europejska Uczelnia Informatyczno - Ekonomiczna w Warszawie
diff --git a/lib/domains/pl/poznan/ae.txt b/lib/domains/pl/poznan/ae.txt
deleted file mode 100644
index d089e8a8e3..0000000000
--- a/lib/domains/pl/poznan/ae.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Academy of Economics in Poznan
-Academy of Economics in Poznan
diff --git a/lib/domains/pl/poznan/ue.txt b/lib/domains/pl/poznan/ue.txt
new file mode 100644
index 0000000000..245a47a23c
--- /dev/null
+++ b/lib/domains/pl/poznan/ue.txt
@@ -0,0 +1 @@
+Poznan University of Economics
diff --git a/lib/domains/pl/suwalki/zst.txt b/lib/domains/pl/suwalki/zst.txt
new file mode 100644
index 0000000000..c9aec9642d
--- /dev/null
+++ b/lib/domains/pl/suwalki/zst.txt
@@ -0,0 +1 @@
+Group of Technical Schools
diff --git a/lib/domains/pl/waw/ibb.txt b/lib/domains/pl/waw/ibb.txt
new file mode 100644
index 0000000000..cf72d160a0
--- /dev/null
+++ b/lib/domains/pl/waw/ibb.txt
@@ -0,0 +1 @@
+Institute of Biochemistry and Biophysics Polish Academy of Sciences
\ No newline at end of file
diff --git a/lib/domains/pt/ipl/isel.txt b/lib/domains/pt/ipl/isel.txt
new file mode 100644
index 0000000000..9dabbfccca
--- /dev/null
+++ b/lib/domains/pt/ipl/isel.txt
@@ -0,0 +1 @@
+ Instituto Superior de Engenharia de Lisboa
diff --git a/lib/domains/ro/anmb.txt b/lib/domains/ro/anmb.txt
new file mode 100644
index 0000000000..cfccbd1970
--- /dev/null
+++ b/lib/domains/ro/anmb.txt
@@ -0,0 +1 @@
+Academia Navala "Mircea cel Batran"
diff --git a/lib/domains/ru/bfmiit.txt b/lib/domains/ru/bfmiit.txt
new file mode 100644
index 0000000000..d3d394803c
--- /dev/null
+++ b/lib/domains/ru/bfmiit.txt
@@ -0,0 +1,2 @@
+Bryansk branch Moscow State University of Railway Engineering (BfMIIT)
+Брянский филиал Московского государственного университета путей сообщения (БфМИИТ)
diff --git a/lib/domains/ru/birsk.txt b/lib/domains/ru/birsk.txt
new file mode 100644
index 0000000000..6a4a94aa3f
--- /dev/null
+++ b/lib/domains/ru/birsk.txt
@@ -0,0 +1 @@
+Bashkir State University Birsk Branch
diff --git a/lib/domains/ru/biysk-liceum.txt b/lib/domains/ru/biysk-liceum.txt
new file mode 100644
index 0000000000..9fa2ef1754
--- /dev/null
+++ b/lib/domains/ru/biysk-liceum.txt
@@ -0,0 +1 @@
+Biysk Liceum
diff --git a/lib/domains/ru/cfuv.txt b/lib/domains/ru/cfuv.txt
new file mode 100644
index 0000000000..4c827f9516
--- /dev/null
+++ b/lib/domains/ru/cfuv.txt
@@ -0,0 +1 @@
+V.I. Vernadsky Crimean Federal University
\ No newline at end of file
diff --git a/lib/domains/ru/mgppu.txt b/lib/domains/ru/mgppu.txt
new file mode 100644
index 0000000000..d2ce75f76d
--- /dev/null
+++ b/lib/domains/ru/mgppu.txt
@@ -0,0 +1 @@
+Moscow city university of psychology and pedagogy
diff --git a/lib/domains/ru/mgup.txt b/lib/domains/ru/mgup.txt
new file mode 100644
index 0000000000..d403b6d13a
--- /dev/null
+++ b/lib/domains/ru/mgup.txt
@@ -0,0 +1 @@
+Moscow State University of Printing Arts
diff --git a/lib/domains/ru/napks.txt b/lib/domains/ru/napks.txt
new file mode 100644
index 0000000000..d71c523c50
--- /dev/null
+++ b/lib/domains/ru/napks.txt
@@ -0,0 +1 @@
+Vernadsky Academy of Constructuion and Architecture
diff --git a/lib/domains/ru/ncshta.txt b/lib/domains/ru/ncshta.txt
new file mode 100644
index 0000000000..516d8c2a73
--- /dev/null
+++ b/lib/domains/ru/ncshta.txt
@@ -0,0 +1 @@
+North-Caucasian State Humanities and Technological Academy
diff --git a/lib/domains/ru/nnov/uic.txt b/lib/domains/ru/nnov/uic.txt
new file mode 100644
index 0000000000..77dd047e70
--- /dev/null
+++ b/lib/domains/ru/nnov/uic.txt
@@ -0,0 +1 @@
+Lobachevsky State University of Nizhni Novgorod
\ No newline at end of file
diff --git a/lib/domains/ru/pfur.txt b/lib/domains/ru/pfur.txt
new file mode 100644
index 0000000000..2e926b9fa7
--- /dev/null
+++ b/lib/domains/ru/pfur.txt
@@ -0,0 +1 @@
+ People Friendship University of Russia
diff --git a/lib/domains/ru/pktm.txt b/lib/domains/ru/pktm.txt
new file mode 100644
index 0000000000..9db0ee0e11
--- /dev/null
+++ b/lib/domains/ru/pktm.txt
@@ -0,0 +1 @@
+Povolzhsky College of Technologies and Management Balakovo
diff --git a/lib/domains/ru/pnzgu.txt b/lib/domains/ru/pnzgu.txt
new file mode 100644
index 0000000000..ae423e2f3f
--- /dev/null
+++ b/lib/domains/ru/pnzgu.txt
@@ -0,0 +1 @@
+Penza State University
diff --git a/lib/domains/ru/psati.txt b/lib/domains/ru/psati.txt
new file mode 100644
index 0000000000..298196e400
--- /dev/null
+++ b/lib/domains/ru/psati.txt
@@ -0,0 +1 @@
+Povolzhsky State University of Telecommunications and Informatics
diff --git a/lib/domains/ru/pstu.txt b/lib/domains/ru/pstu.txt
new file mode 100644
index 0000000000..12e0c2b02d
--- /dev/null
+++ b/lib/domains/ru/pstu.txt
@@ -0,0 +1 @@
+Perm National Research Polytechnic University
diff --git a/lib/domains/ru/psuti.txt b/lib/domains/ru/psuti.txt
new file mode 100644
index 0000000000..298196e400
--- /dev/null
+++ b/lib/domains/ru/psuti.txt
@@ -0,0 +1 @@
+Povolzhsky State University of Telecommunications and Informatics
diff --git a/lib/domains/ru/rsvpu.txt b/lib/domains/ru/rsvpu.txt
new file mode 100644
index 0000000000..30a6eeaf53
--- /dev/null
+++ b/lib/domains/ru/rsvpu.txt
@@ -0,0 +1 @@
+Russian State Vocational Pedagogical University
diff --git a/lib/domains/ru/sde/elearn.txt b/lib/domains/ru/sde/elearn.txt
new file mode 100644
index 0000000000..979f61a56f
--- /dev/null
+++ b/lib/domains/ru/sde/elearn.txt
@@ -0,0 +1 @@
+Moscow State Industrial University
diff --git a/lib/domains/ru/spbgut.txt b/lib/domains/ru/spbgut.txt
new file mode 100644
index 0000000000..b6e4473f88
--- /dev/null
+++ b/lib/domains/ru/spbgut.txt
@@ -0,0 +1 @@
+The Bonch-Bruevich Saint - Petersburg State University of Telecommunications
diff --git a/lib/domains/ru/surgu.txt b/lib/domains/ru/surgu.txt
new file mode 100644
index 0000000000..969b4709a3
--- /dev/null
+++ b/lib/domains/ru/surgu.txt
@@ -0,0 +1 @@
+Surgut State University
diff --git a/lib/domains/ru/tatngpi.txt b/lib/domains/ru/tatngpi.txt
new file mode 100644
index 0000000000..3e8ca1984b
--- /dev/null
+++ b/lib/domains/ru/tatngpi.txt
@@ -0,0 +1 @@
+The Naberezhnye Chelny Institute of Social and Educational Technologies and Resources
diff --git a/lib/domains/ru/tfrggu.txt b/lib/domains/ru/tfrggu.txt
new file mode 100644
index 0000000000..445ed0fd6a
--- /dev/null
+++ b/lib/domains/ru/tfrggu.txt
@@ -0,0 +1 @@
+Branch of Russian State University of Humanity in Togliatty
\ No newline at end of file
diff --git a/lib/domains/ru/tgmu.txt b/lib/domains/ru/tgmu.txt
new file mode 100644
index 0000000000..1e054bd1c1
--- /dev/null
+++ b/lib/domains/ru/tgmu.txt
@@ -0,0 +1 @@
+Pacific State Medical University
\ No newline at end of file
diff --git a/lib/domains/ru/vimvd.txt b/lib/domains/ru/vimvd.txt
new file mode 100644
index 0000000000..fbc25b15be
--- /dev/null
+++ b/lib/domains/ru/vimvd.txt
@@ -0,0 +1 @@
+Voronezh Institute of the Ministry of the Interior of Russia
\ No newline at end of file
diff --git a/lib/domains/ru/vyatsu.txt b/lib/domains/ru/vyatsu.txt
new file mode 100644
index 0000000000..a27562b116
--- /dev/null
+++ b/lib/domains/ru/vyatsu.txt
@@ -0,0 +1 @@
+Vyatka State University
diff --git a/lib/domains/se/grillska.txt b/lib/domains/se/grillska.txt
new file mode 100644
index 0000000000..53b74eaf15
--- /dev/null
+++ b/lib/domains/se/grillska.txt
@@ -0,0 +1 @@
+Grillska Gymnasiet Eskilstuna
\ No newline at end of file
diff --git a/lib/domains/se/itggot.txt b/lib/domains/se/itggot.txt
new file mode 100644
index 0000000000..e31bef9d89
--- /dev/null
+++ b/lib/domains/se/itggot.txt
@@ -0,0 +1 @@
+Göteborg - IT Gymnasiet
diff --git a/lib/domains/se/jgy.txt b/lib/domains/se/jgy.txt
new file mode 100644
index 0000000000..7ce98b9140
--- /dev/null
+++ b/lib/domains/se/jgy.txt
@@ -0,0 +1,2 @@
+Added Jämtlands Gymnasium, Sweden. 
+www.jgy.se
diff --git a/lib/domains/se/lu/lunduniversity.txt b/lib/domains/se/lu/lunduniversity.txt
new file mode 100644
index 0000000000..a924534c37
--- /dev/null
+++ b/lib/domains/se/lu/lunduniversity.txt
@@ -0,0 +1 @@
+Lund University
diff --git a/lib/domains/se/nacka/edu.txt b/lib/domains/se/nacka/edu.txt
new file mode 100644
index 0000000000..4cda222b08
--- /dev/null
+++ b/lib/domains/se/nacka/edu.txt
@@ -0,0 +1 @@
+Nacka Gymnasium
diff --git a/lib/domains/si/ijs.txt b/lib/domains/si/ijs.txt
new file mode 100644
index 0000000000..40111f68b6
--- /dev/null
+++ b/lib/domains/si/ijs.txt
@@ -0,0 +1 @@
+Jozef Stefan Institute
diff --git a/lib/domains/si/sc-nm.si b/lib/domains/si/sc-nm.si
new file mode 100644
index 0000000000..3bdc94efad
--- /dev/null
+++ b/lib/domains/si/sc-nm.si
@@ -0,0 +1 @@
+School Center Novo mesto
diff --git a/lib/domains/si/sc-nm.txt b/lib/domains/si/sc-nm.txt
new file mode 100644
index 0000000000..3bdc94efad
--- /dev/null
+++ b/lib/domains/si/sc-nm.txt
@@ -0,0 +1 @@
+School Center Novo mesto
diff --git a/lib/domains/sv/edu/uls.txt b/lib/domains/sv/edu/uls.txt
new file mode 100644
index 0000000000..110704833d
--- /dev/null
+++ b/lib/domains/sv/edu/uls.txt
@@ -0,0 +1 @@
+Universidad Luterana Salvadoreña
diff --git a/lib/domains/tn/rnu/issatso.txt b/lib/domains/tn/rnu/issatso.txt
new file mode 100644
index 0000000000..3cfa75f846
--- /dev/null
+++ b/lib/domains/tn/rnu/issatso.txt
@@ -0,0 +1 @@
+Higher Institute of Applied Sciences and Technology of Sousse
diff --git a/lib/domains/ua/in/kpi.txt b/lib/domains/ua/in/kpi.txt
new file mode 100644
index 0000000000..c1afff5e3c
--- /dev/null
+++ b/lib/domains/ua/in/kpi.txt
@@ -0,0 +1 @@
+National Technical University (Kiev Politechnical Institute)
diff --git a/lib/domains/ua/kr/kspu.txt b/lib/domains/ua/kr/kspu.txt
new file mode 100644
index 0000000000..4c8fc446c2
--- /dev/null
+++ b/lib/domains/ua/kr/kspu.txt
@@ -0,0 +1 @@
+Kirovograd State Pedagogical University
diff --git a/lib/domains/ua/lpnu.txt b/lib/domains/ua/lpnu.txt
new file mode 100644
index 0000000000..46973edba0
--- /dev/null
+++ b/lib/domains/ua/lpnu.txt
@@ -0,0 +1 @@
+Lviv Polytechnic National University
diff --git a/lib/domains/ua/nure.txt b/lib/domains/ua/nure.txt
new file mode 100644
index 0000000000..425bc24247
--- /dev/null
+++ b/lib/domains/ua/nure.txt
@@ -0,0 +1 @@
+Kharkiv National University Radioelectronics, Ukraine
diff --git a/lib/domains/uk/ac/collyers.txt b/lib/domains/uk/ac/collyers.txt
new file mode 100644
index 0000000000..de996d05f5
--- /dev/null
+++ b/lib/domains/uk/ac/collyers.txt
@@ -0,0 +1 @@
+The College of Richard Collyer
diff --git a/lib/domains/uk/ac/esc.txt b/lib/domains/uk/ac/esc.txt
new file mode 100644
index 0000000000..0eab26e769
--- /dev/null
+++ b/lib/domains/uk/ac/esc.txt
@@ -0,0 +1 @@
+East Surrey College
diff --git a/lib/domains/uk/ac/gcu.txt b/lib/domains/uk/ac/gcu.txt
new file mode 100644
index 0000000000..af0b83aea6
--- /dev/null
+++ b/lib/domains/uk/ac/gcu.txt
@@ -0,0 +1 @@
+Glasgow Caledonian University
diff --git a/lib/domains/uk/ac/ncl.txt b/lib/domains/uk/ac/ncl.txt
index eab8d78a47..d30c25eecc 100644
--- a/lib/domains/uk/ac/ncl.txt
+++ b/lib/domains/uk/ac/ncl.txt
@@ -1,2 +1,3 @@
 Newcastle University, Medicine Malaysia 
 University of Newcastle-upon-Tyne
+"Newcastle Univeristy" 
diff --git a/lib/domains/uk/ac/portsmouth-college.txt b/lib/domains/uk/ac/portsmouth-college.txt
new file mode 100644
index 0000000000..115a498b4f
--- /dev/null
+++ b/lib/domains/uk/ac/portsmouth-college.txt
@@ -0,0 +1 @@
+Portsmouth College
diff --git a/lib/domains/uk/co/calday.txt b/lib/domains/uk/co/calday.txt
new file mode 100644
index 0000000000..b2bc3dfc60
--- /dev/null
+++ b/lib/domains/uk/co/calday.txt
@@ -0,0 +1 @@
+Calday Grange Grammar School
diff --git a/lib/domains/uk/co/ilford-school.txt b/lib/domains/uk/co/ilford-school.txt
new file mode 100644
index 0000000000..b576ca02d0
--- /dev/null
+++ b/lib/domains/uk/co/ilford-school.txt
@@ -0,0 +1 @@
+Ilford Grammar School
diff --git a/lib/domains/uk/co/mmhs.txt b/lib/domains/uk/co/mmhs.txt
new file mode 100644
index 0000000000..00a5ba6c12
--- /dev/null
+++ b/lib/domains/uk/co/mmhs.txt
@@ -0,0 +1 @@
+Matthew Moss
\ No newline at end of file
diff --git a/lib/domains/uk/co/prioryacademies.txt b/lib/domains/uk/co/prioryacademies.txt
new file mode 100644
index 0000000000..40db085a52
--- /dev/null
+++ b/lib/domains/uk/co/prioryacademies.txt
@@ -0,0 +1 @@
+The Priory Academy
diff --git a/lib/domains/uk/co/sheringhamhigh.txt b/lib/domains/uk/co/sheringhamhigh.txt
new file mode 100644
index 0000000000..1425f9ff1d
--- /dev/null
+++ b/lib/domains/uk/co/sheringhamhigh.txt
@@ -0,0 +1 @@
+Sheringham High School
diff --git a/lib/domains/uk/co/uptonhigh.txt b/lib/domains/uk/co/uptonhigh.txt
new file mode 100644
index 0000000000..1b10b88129
--- /dev/null
+++ b/lib/domains/uk/co/uptonhigh.txt
@@ -0,0 +1 @@
+Upton-by-Chester High School
diff --git a/lib/domains/uk/org/bucksgfl.txt b/lib/domains/uk/org/bucksgfl.txt
new file mode 100644
index 0000000000..7336c8d962
--- /dev/null
+++ b/lib/domains/uk/org/bucksgfl.txt
@@ -0,0 +1 @@
+Bucks Grid for Learning
diff --git a/lib/domains/uk/org/gordanoschool.txt b/lib/domains/uk/org/gordanoschool.txt
new file mode 100644
index 0000000000..67036d76c5
--- /dev/null
+++ b/lib/domains/uk/org/gordanoschool.txt
@@ -0,0 +1 @@
+Gordano School
diff --git a/lib/domains/us/ca.k12/vcpusd.txt b/lib/domains/us/ca.k12/vcpusd.txt
new file mode 100644
index 0000000000..d1da4ee73e
--- /dev/null
+++ b/lib/domains/us/ca.k12/vcpusd.txt
@@ -0,0 +1 @@
+Valley Center-Pauma Unified
diff --git a/lib/domains/us/kyschools/boone/stu.txt b/lib/domains/us/kyschools/boone/stu.txt
new file mode 100644
index 0000000000..c9abcd74f6
--- /dev/null
+++ b/lib/domains/us/kyschools/boone/stu.txt
@@ -0,0 +1 @@
+Boone County Schools
diff --git a/lib/domains/us/or/k12/hsd.txt b/lib/domains/us/or/k12/hsd.txt
new file mode 100644
index 0000000000..82f7193018
--- /dev/null
+++ b/lib/domains/us/or/k12/hsd.txt
@@ -0,0 +1 @@
+Hillsboro School District
diff --git a/lib/domains/us/pa/k12/basd.txt b/lib/domains/us/pa/k12/basd.txt
new file mode 100644
index 0000000000..38b785bcd3
--- /dev/null
+++ b/lib/domains/us/pa/k12/basd.txt
@@ -0,0 +1 @@
+Beaver Area School District
diff --git a/lib/domains/us/pausd.txt b/lib/domains/us/pausd.txt
new file mode 100644
index 0000000000..96f268f7b7
--- /dev/null
+++ b/lib/domains/us/pausd.txt
@@ -0,0 +1 @@
+Palo Alto Unified School District
diff --git a/lib/domains/us/smusd.txt b/lib/domains/us/smusd.txt
new file mode 100644
index 0000000000..5fe63bf26b
--- /dev/null
+++ b/lib/domains/us/smusd.txt
@@ -0,0 +1 @@
+San Marino Unified School District
diff --git a/lib/domains/vn/aptech.txt b/lib/domains/vn/aptech.txt
new file mode 100644
index 0000000000..b74db3b049
--- /dev/null
+++ b/lib/domains/vn/aptech.txt
@@ -0,0 +1 @@
+Hanoi-Aptech Computer Education
diff --git a/lib/domains/vn/edu/arena.txt b/lib/domains/vn/edu/arena.txt
new file mode 100644
index 0000000000..a7e478f3ef
--- /dev/null
+++ b/lib/domains/vn/edu/arena.txt
@@ -0,0 +1 @@
+FPT Arena Multimedia Education
diff --git a/lib/domains/vn/edu/hce.txt b/lib/domains/vn/edu/hce.txt
new file mode 100644
index 0000000000..355f5c1739
--- /dev/null
+++ b/lib/domains/vn/edu/hce.txt
@@ -0,0 +1 @@
+Hue College of Economics
diff --git a/lib/domains/vn/edu/hcmiu.txt b/lib/domains/vn/edu/hcmiu.txt
new file mode 100644
index 0000000000..97dbe36174
--- /dev/null
+++ b/lib/domains/vn/edu/hcmiu.txt
@@ -0,0 +1 @@
+International University Ho Chi Minh City
diff --git a/lib/domains/vn/edu/hubt.txt b/lib/domains/vn/edu/hubt.txt
new file mode 100644
index 0000000000..dfa7b3550f
--- /dev/null
+++ b/lib/domains/vn/edu/hubt.txt
@@ -0,0 +1 @@
+Hanoi University of Business and Technology
diff --git a/lib/domains/vn/edu/hutech.txt b/lib/domains/vn/edu/hutech.txt
new file mode 100644
index 0000000000..cf61948240
--- /dev/null
+++ b/lib/domains/vn/edu/hutech.txt
@@ -0,0 +1 @@
+University of Technology
diff --git a/lib/domains/vn/edu/ptit.txt b/lib/domains/vn/edu/ptit.txt
new file mode 100644
index 0000000000..a58b745477
--- /dev/null
+++ b/lib/domains/vn/edu/ptit.txt
@@ -0,0 +1 @@
+Posts & Telecommunications Institude of Technology
diff --git a/lib/domains/vn/edu/tdt.txt b/lib/domains/vn/edu/tdt.txt
new file mode 100644
index 0000000000..7ae1515912
--- /dev/null
+++ b/lib/domains/vn/edu/tdt.txt
@@ -0,0 +1 @@
+Ton Duc Thang University
diff --git a/lib/domains/vn/edu/tdu.txt b/lib/domains/vn/edu/tdu.txt
new file mode 100644
index 0000000000..a8e6ec3f1f
--- /dev/null
+++ b/lib/domains/vn/edu/tdu.txt
@@ -0,0 +1 @@
+Tay Do University
diff --git a/lib/domains/vn/edu/uit.txt b/lib/domains/vn/edu/uit.txt
new file mode 100644
index 0000000000..68ed80e8a1
--- /dev/null
+++ b/lib/domains/vn/edu/uit.txt
@@ -0,0 +1 @@
+University of Information Technology Ho Chi Minh City
\ No newline at end of file
diff --git a/lib/domains/vn/edu/vaa.txt b/lib/domains/vn/edu/vaa.txt
new file mode 100644
index 0000000000..dc9835bcc3
--- /dev/null
+++ b/lib/domains/vn/edu/vaa.txt
@@ -0,0 +1 @@
+Ministry of Transport Vietnam Aviation Academy
diff --git a/lib/domains/vn/vanlanguni.txt b/lib/domains/vn/vanlanguni.txt
new file mode 100644
index 0000000000..12e9b4dced
--- /dev/null
+++ b/lib/domains/vn/vanlanguni.txt
@@ -0,0 +1 @@
+Van Lang University
diff --git a/lib/domains/za/ac/nwu.txt b/lib/domains/za/ac/nwu.txt
new file mode 100644
index 0000000000..5cc49a9e24
--- /dev/null
+++ b/lib/domains/za/ac/nwu.txt
@@ -0,0 +1 @@
+North-West University
\ No newline at end of file
diff --git a/lib/domains/zm/unza.txt b/lib/domains/zm/unza.txt
new file mode 100644
index 0000000000..0d33b9d4f5
--- /dev/null
+++ b/lib/domains/zm/unza.txt
@@ -0,0 +1 @@
+University of Zambia
diff --git a/src/swot/Compiler.kt b/src/swot/Compiler.kt
index 978b8083b1..35dbf91cbf 100644
--- a/src/swot/Compiler.kt
+++ b/src/swot/Compiler.kt
@@ -13,16 +13,16 @@ object CompilationState {
 
 fun main(args: Array<String>) {
     val root = File("lib/domains")
-    root.recurse {
-        if (it.isFile()) {
-            val parts = root.relativePath(it).replace('\\', '/').trimTrailing(".txt").split('/').toList()
+    root.walkTopDown().forEach {
+        if (it.isFile) {
+            val parts = it.toRelativeString(root).replace('\\', '/').removeSuffix(".txt").split('/').toList()
             if (!checkSet(CompilationState.blacklist, parts) && !checkSet(CompilationState.domains, parts)) {
-                CompilationState.domains.add(parts.reverse().join("."))
+                CompilationState.domains.add(parts.reversed().joinToString("."))
             }
         }
     }
 
-    val blacklist = CompilationState.blacklist.map { "-$it" }.sort().join("\n")
+    val blacklist = CompilationState.blacklist.map { "-$it" }.sorted().joinToString("\n")
     File("out/artifacts").mkdirs()
-    File("out/artifacts/swot.txt").writeText(blacklist + "\n" + CompilationState.domains.sort().join("\n"))
+    File("out/artifacts/swot.txt").writeText(blacklist + "\n" + CompilationState.domains.sorted().joinToString("\n"))
 }
diff --git a/src/swot/Swot.kt b/src/swot/Swot.kt
index 61b1569e54..9905ee3ff5 100644
--- a/src/swot/Swot.kt
+++ b/src/swot/Swot.kt
@@ -22,7 +22,7 @@ private object Resources {
     val blackList = readList("/blacklist.txt") ?: error("Cannot find /blacklist.txt")
 
     fun readList(resource: String) : Set<String>? {
-        return javaClass.getResourceAsStream(resource)?.reader()?.buffered()?.lines()?.toHashSet()
+        return javaClass.getResourceAsStream(resource)?.reader()?.buffered()?.lineSequence()?.toHashSet()
     }
 }
 
@@ -40,10 +40,10 @@ private fun findSchoolNames(parts: List<String>): List<String> {
 }
 
 private fun domainParts(emailOrDomain: String): List<String> {
-    return emailOrDomain.trim().toLowerCase().substringAfter('@').substringAfter("://").substringBefore(':').split('.').reverse()
+    return emailOrDomain.trim().toLowerCase().substringAfter('@').substringAfter("://").substringBefore(':').split('.').reversed()
 }
 
-private fun checkSet(set: Set<String>, parts: List<String>): Boolean {
+internal fun checkSet(set: Set<String>, parts: List<String>): Boolean {
     val subj = StringBuilder()
     for (part in parts) {
         subj.insert(0, part)
diff --git a/test/swot/SwotTest.kt b/test/swot/SwotTest.kt
index 509a3bc8a1..8585575832 100644
--- a/test/swot/SwotTest.kt
+++ b/test/swot/SwotTest.kt
@@ -1,7 +1,6 @@
 package swot
 
-import kotlin.test.*
-import junit.framework.*
+import junit.framework.TestCase
 
 class SwotTest : TestCase() {
     fun testSwot() {
@@ -44,12 +43,15 @@ class SwotTest : TestCase() {
         assertEquals (true , isAcademic("lee@mail.harvard.edu"))
 
         assertEquals(false, isAcademic("imposter@si.edu"))
+
+        // Iran sanctions are lifted
+        assertEquals(true, isAcademic("lee@acmt.ac.ir"))
     }
 
     fun testSchoolNames() {
         assertEquals("University of Strathclyde", findSchoolNames("lreilly@cs.strath.ac.uk").single())
         assertEquals("BRG Fadingerstraße Linz, Austria", findSchoolNames("lreilly@fadi.at").single())
         assertEquals("St. Petersburg State University", findSchoolNames("max@spbu.ru ").single())
-        assertEquals(0, findSchoolNames("foo@shop.com").size())
+        assertEquals(0, findSchoolNames("foo@shop.com").size)
     }
 }