diff --git a/README.md b/README.md
index 7b3b232399..e649030fd2 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 # swot
 
-JetBrains uses this **swot** repository to grant free licenses for JetBrains tools to students and teachers worldwide. If your email is in one of the domains listed in this repository, you are entitled to request your free license from JetBrains. Visit http://jetbrains.com/student to request!
+JetBrains uses this **swot** repository to grant free licenses for JetBrains tools to students and teachers worldwide. If your email is in one of the domains listed in this repository, you may request your free license from JetBrains. Visit http://jetbrains.com/student to request!
 
-There is `lib/domains` directory which contains hierarcicaly structured list of email domains belonged to various educational institutions. The domains are mostly owned by colleges and universities, and also by groups of schools united together because they are sharing the same email domains between several institutions, such as Township High School District 211 of Cook County, Illinois.
+There is `lib/domains` directory which contains a hierarchically structured list of email domains belonging to various educational institutions. The domains are mostly owned by colleges and universities, and also by groups of schools united together because they are sharing the same email domain between several institutions, such as Township High School District 211 of Cook County, Illinois.
 
-If you know a school, college or university which is not in this list, feel free to submit a pull request to add it.
+If you know a school, college or university which is not on this list, feel free to submit a pull request to add it.
 
 ## Which educational institutions can be added to the repository?
 
@@ -13,40 +13,40 @@ Your pull request for adding a new email domain to the repository will be satisf
 
 1. The domain is used by an educational institution, which offers at least one long-term course (one year or longer), and the course is somehow related to IT (it is in computer science, software engineering, statistics, bioinformatics, etc.)
 
-2. The educational institution has a physically existing location, where students attend classes in the classrooms. In general, we do not include online universities to this repository. 
+2. The educational institution is a physical entity with student attendance and recognized as providing a learning curriculum for the educational system, or the institution is an accredited online educational organization providing their students with: (1) online courses with a curriculum at least one year long, (2) a dedicated email address which is provided to students only until their graduation.
 
-**NOTE:** If an organization provides primary and secondary education only (i.e., no high or higher education programs), it shall not be included into the list. Primary and secondary school students usually do not need professional developer tools, and in case they learn some programming, we are glad to offer them Community versions of the tools, which are free to everybody, such as PyCharm Community Edition, etc.
+**NOTE:** If an organization provides primary or secondary education only (i.e., no high or higher education programs), it will not be included in the list. Primary and secondary school students do not usually need access to professional developer tools, and if they learn some programming, we are glad to offer them Community versions of the tools, such as PyCharm Community Edition, to use which are free to everybody.
 
-If you represent a primary or secondary school and you are certain of the necessity of professional version of a JetBrains tool for your school, please contact JetBrains sales team via  https://www.jetbrains.com/support/sales/
+If you represent a primary or secondary school and you are certain of the necessity of a professional version of a JetBrains tool for your school, please contact JetBrains sales team via https://www.jetbrains.com/support/sales/
 
 ## How to add a domain to this repository
 
 To add a domain, make a pull request. You must be familiar with git tool or GitHub user interface in order to make a pull request.
-We review your request and merge it (i.e., accept it) if it meets the following rules:
+We will review your request, and if we accept that it meets all the following conditions then we will merge it:
 
-1. Each domain is represented by a single `.txt` file in the repository. If there is a file `lib/domains/edu/mit.txt`, it means that e-mail domain `mit.edu` is included into the repository. Please note that the repository uses reverse order of the name components, and also note that **.txt extension is mandatory**. Example: add file `/lib/domains/ng/edu/unaab.txt` to add a domain `unaab.edu.ng` to the repository.
+1. Each domain is represented by a single `.txt` file in the repository. If there is a file `lib/domains/edu/mit.txt`, it means that an email domain `mit.edu` is included in the repository. Please note that the repository reverses the order of the name components, and also note that **.txt extension is mandatory**. Example: add file `/lib/domains/ng/edu/unaab.txt` to add a domain `unaab.edu.ng` to the repository.
 
-2. Pull request can include one or more files which you wish to add.
+2. Pull requests can include one or more files which you wish to add.
 
-3. Each file in the repository has to contain a name of the university, which the domain represented by the file belongs to. For example, a file `/lib/domains/ng/edu/unaab.txt` has to contain a line in it: *"Federal University of Agriculture, Abeokuta"*.
-First line of the file has to contain an official name of the educational organization.
-Other lines can contain other known names of the university. A university in a non-English speaking country can have a line containing the university name in their native language, and another line with the name in English.
+3. Each file in the repository has to contain the name of the university, which the domain represented by the file belongs to. For example, a file `/lib/domains/ng/edu/unaab.txt` has to contain a line in it: *"Federal University of Agriculture, Abeokuta"*.
+The first line of the file has to contain the official name of the educational organization.
+Other lines can contain other names the university is known by. A university in a non-English speaking country can have a line containing the university name in their native language, and another line with the name in English.
 
-4. If the domain is shared among several institutions, such a school district domain, please add the last line starting with dot (`.`) followed by a word "group". Example:
+4. If the domain is shared by several institutions, such a school district domain, please add the last line starting with a dot (`.`) followed by the word "group". Example:
 `.group`
 
-> #### How to add the domain quicker
-> We merge pull requests manually, and check the information which you have provided us with prior to merge.
-> Thus, if you wish to make the verification easier for us and therefore much quicker, please mention the following in your comment to the request:
-> * the university official website URL, if different from the domain you are submitting
-> * an URL of a page on the official website where an IT-related long-term (>1 year) course is offered by the university
-> * an URL of a page or another proof (.pdf or a screenshot are OK) showing that the university recognizes the domain which you are submitting as an  official email domain for the students.
+#### How to add the domain quicker
+> We merge pull requests manually and check the information which you have provided us with before merging it.
+> Thus, if you wish to make the verification process easier for us and therefore much quicker, please mention the following in your comment to the request:
+> * the university official website URL, if it is different from the domain you are submitting
+> * a URL of a page on the official website where a long-term (>1 year) IT related course is offered by the university
+> * a URL of a page or some other proof (.pdf or a screenshot are OK) showing that the university recognizes the domain which you are submitting as an official email domain for the enrolled students.
 
-## How to change a domain to this repository
-If a university changes its email domain or name, you can submit a pull request with necessary changes.
+## How to change a domain in this repository
+If a university changes its email domain or name, you can submit a pull request with the necessary changes.
 
 ## Additional references
-Please refer to `CONTRIBUTING.md` file of this repository to read more about repository structure and contributing rules.
+Please refer to the `CONTRIBUTING.md` file in this repository to read more about the repository structure and contributing rules.
 
 ## FAQ
 #### There are many domains in my university, how can I add all of them?
@@ -56,5 +56,5 @@ However, if the upper-level domain is also used by alumni, research staff, and o
 
 If the university uses several email domains in different upper-level domains (for example, `euroacademia.ee` and `euroacademia.eu`), please submit several files with different paths and the same content (i.e., same name of the university) in your pull request.
 
-#### Some universities have their names duplicated in the first and the second line in respective .txt file in this repository. Shall I put the university name twice in my .txt file to have the domain added?
+#### Some universities have their names duplicated in the first and the second line in the respective .txt file in this repository. Shall I put the university name twice in my .txt file to have the domain added?
 No, it's not needed. However, nothing bad happens if you do it, don't worry. It does not affect our decision on your request. 
diff --git a/lib/domains/ac/diu.txt b/lib/domains/ac/diu.txt
new file mode 100644
index 0000000000..195520f7b2
--- /dev/null
+++ b/lib/domains/ac/diu.txt
@@ -0,0 +1,2 @@
+DIU
+Dhaka International University
diff --git a/lib/domains/ac/halifaxuni.txt b/lib/domains/ac/halifaxuni.txt
deleted file mode 100644
index e457cdc9b7..0000000000
--- a/lib/domains/ac/halifaxuni.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Halifax, Birmingham Campus
diff --git a/lib/domains/ac/in/gmit.txt b/lib/domains/ac/in/gmit.txt
new file mode 100644
index 0000000000..032fdf7b83
--- /dev/null
+++ b/lib/domains/ac/in/gmit.txt
@@ -0,0 +1,2 @@
+www.gmit.ac.in
+GM Institute of Technology a hi-tech & Top Engineering college in Davangere
\ No newline at end of file
diff --git a/lib/domains/ac/kcu.txt b/lib/domains/ac/kcu.txt
new file mode 100644
index 0000000000..024685d8e7
--- /dev/null
+++ b/lib/domains/ac/kcu.txt
@@ -0,0 +1 @@
+SOONGSIL CYBER UNIVERSITY
diff --git a/lib/domains/ac/koyauni.txt b/lib/domains/ac/koyauni.txt
deleted file mode 100644
index f8a622238a..0000000000
--- a/lib/domains/ac/koyauni.txt
+++ /dev/null
@@ -1 +0,0 @@
-Koya University (Kurdistan Region)
diff --git a/lib/domains/ac/lcst.txt b/lib/domains/ac/lcst.txt
deleted file mode 100644
index 893a154566..0000000000
--- a/lib/domains/ac/lcst.txt
+++ /dev/null
@@ -1 +0,0 @@
-London College of Science & Technology
diff --git a/lib/domains/ac/sclondon.txt b/lib/domains/ac/sclondon.txt
deleted file mode 100644
index 2bdbd857d5..0000000000
--- a/lib/domains/ac/sclondon.txt
+++ /dev/null
@@ -1 +0,0 @@
-Stratford College London
diff --git a/lib/domains/ae/ac/ece.txt b/lib/domains/ae/ac/ece.txt
deleted file mode 100644
index 32f95dbdd8..0000000000
--- a/lib/domains/ae/ac/ece.txt
+++ /dev/null
@@ -1 +0,0 @@
-Etisalat University College
diff --git a/lib/domains/ae/ac/ittihad.txt b/lib/domains/ae/ac/ittihad.txt
deleted file mode 100644
index a8a43f908d..0000000000
--- a/lib/domains/ae/ac/ittihad.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ittihad University
diff --git a/lib/domains/al/edu/aefs.txt b/lib/domains/al/edu/aefs.txt
deleted file mode 100644
index 71f89d0bf1..0000000000
--- a/lib/domains/al/edu/aefs.txt
+++ /dev/null
@@ -1 +0,0 @@
-Academy of Sports and Physical Training
diff --git a/lib/domains/al/edu/akademiaearteve.txt b/lib/domains/al/edu/akademiaearteve.txt
deleted file mode 100644
index b4d9593902..0000000000
--- a/lib/domains/al/edu/akademiaearteve.txt
+++ /dev/null
@@ -1 +0,0 @@
-Academy of Arts
diff --git a/lib/domains/al/edu/beder.txt b/lib/domains/al/edu/beder.txt
new file mode 100644
index 0000000000..e46d348236
--- /dev/null
+++ b/lib/domains/al/edu/beder.txt
@@ -0,0 +1 @@
+University College Bedër
diff --git a/lib/domains/al/unizkm.txt b/lib/domains/al/unizkm.txt
new file mode 100644
index 0000000000..7bb8f6503c
--- /dev/null
+++ b/lib/domains/al/unizkm.txt
@@ -0,0 +1 @@
+Catholic University "Our Lady of Good Counsel"
diff --git a/lib/domains/am/isec.txt b/lib/domains/am/isec.txt
new file mode 100644
index 0000000000..20a2af51c9
--- /dev/null
+++ b/lib/domains/am/isec.txt
@@ -0,0 +1 @@
+International Scientific-Educational Center of the National Academy of Sciences of Republic of Armenia (ISEC)
diff --git a/lib/domains/am/nuaca.txt b/lib/domains/am/nuaca.txt
new file mode 100644
index 0000000000..595dd9964f
--- /dev/null
+++ b/lib/domains/am/nuaca.txt
@@ -0,0 +1 @@
+NATIONAL UNIVERSITY OF ARCHITECTURE AND CONSTRUCTION OF ARMENIA
diff --git a/lib/domains/ar/com/ispi4038.txt b/lib/domains/ar/com/ispi4038.txt
new file mode 100644
index 0000000000..45e84c10bf
--- /dev/null
+++ b/lib/domains/ar/com/ispi4038.txt
@@ -0,0 +1 @@
+Instituto Superior Particular Incorporado Nº 4038
diff --git a/lib/domains/ar/edu/ucongres.txt b/lib/domains/ar/edu/ucongres.txt
deleted file mode 100644
index f757d7783e..0000000000
--- a/lib/domains/ar/edu/ucongres.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad de Congreso
diff --git a/lib/domains/ar/edu/ulp.txt b/lib/domains/ar/edu/ulp.txt
new file mode 100644
index 0000000000..55e7e0adfc
--- /dev/null
+++ b/lib/domains/ar/edu/ulp.txt
@@ -0,0 +1 @@
+Universidad de La Punta
diff --git a/lib/domains/ar/uba/fi.txt b/lib/domains/ar/uba/fi.txt
new file mode 100644
index 0000000000..a2f618b2d2
--- /dev/null
+++ b/lib/domains/ar/uba/fi.txt
@@ -0,0 +1 @@
+Facultad de Ingenieria de la Universidad de Buenos Aires
diff --git a/lib/domains/at/hak-bregenz.txt b/lib/domains/at/hak-bregenz.txt
new file mode 100644
index 0000000000..f6124d4f4e
--- /dev/null
+++ b/lib/domains/at/hak-bregenz.txt
@@ -0,0 +1 @@
+HAK Bregenz
diff --git a/lib/domains/at/hakzell.txt b/lib/domains/at/hakzell.txt
new file mode 100644
index 0000000000..9884c7f98c
--- /dev/null
+++ b/lib/domains/at/hakzell.txt
@@ -0,0 +1 @@
+BHAK/BHAS Zell am See
\ No newline at end of file
diff --git a/lib/domains/at/hlw10.txt b/lib/domains/at/hlw10.txt
new file mode 100644
index 0000000000..40741f2ea4
--- /dev/null
+++ b/lib/domains/at/hlw10.txt
@@ -0,0 +1 @@
+Höhere Bundeslehranstalt für wirtschaftliche Berufe
diff --git a/lib/domains/at/holztechnikum.txt b/lib/domains/at/holztechnikum.txt
new file mode 100644
index 0000000000..73d2a7bfa6
--- /dev/null
+++ b/lib/domains/at/holztechnikum.txt
@@ -0,0 +1 @@
+Holztechnikum Kuchl
\ No newline at end of file
diff --git a/lib/domains/at/phst.txt b/lib/domains/at/phst.txt
new file mode 100644
index 0000000000..eba309fe44
--- /dev/null
+++ b/lib/domains/at/phst.txt
@@ -0,0 +1,2 @@
+University College of Teacher Education Styria
+Pädagogische Hochschule Steiermark
diff --git a/lib/domains/at/ufg.txt b/lib/domains/at/ufg.txt
new file mode 100644
index 0000000000..cfdd09f3be
--- /dev/null
+++ b/lib/domains/at/ufg.txt
@@ -0,0 +1 @@
+University of Art and Design Linz
\ No newline at end of file
diff --git a/lib/domains/au/edu/aie.txt b/lib/domains/au/edu/aie.txt
new file mode 100644
index 0000000000..5ba26c7dc3
--- /dev/null
+++ b/lib/domains/au/edu/aie.txt
@@ -0,0 +1 @@
+The Academy of Interactive Entertainment
diff --git a/lib/domains/au/edu/icthm.txt b/lib/domains/au/edu/icthm.txt
deleted file mode 100644
index d94bb41f28..0000000000
--- a/lib/domains/au/edu/icthm.txt
+++ /dev/null
@@ -1 +0,0 @@
-International College of Tourism and Hotel Management
diff --git a/lib/domains/au/edu/nsw/ait.txt b/lib/domains/au/edu/nsw/ait.txt
new file mode 100644
index 0000000000..9e5d321cbd
--- /dev/null
+++ b/lib/domains/au/edu/nsw/ait.txt
@@ -0,0 +1 @@
+Academy of Information Technology
\ No newline at end of file
diff --git a/lib/domains/au/gov/vic/education.txt b/lib/domains/au/gov/vic/education.txt
new file mode 100644
index 0000000000..365463707c
--- /dev/null
+++ b/lib/domains/au/gov/vic/education.txt
@@ -0,0 +1 @@
+Department of Education and Training, Victoria, Australia for Teacher's accounts
diff --git a/lib/domains/au/oz/adfa.txt b/lib/domains/au/oz/adfa.txt
deleted file mode 100644
index fe5d27a63a..0000000000
--- a/lib/domains/au/oz/adfa.txt
+++ /dev/null
@@ -1 +0,0 @@
-Australian Defence Force Academy
diff --git a/lib/domains/ax/ha.txt b/lib/domains/ax/ha.txt
new file mode 100644
index 0000000000..41bf0c9e16
--- /dev/null
+++ b/lib/domains/ax/ha.txt
@@ -0,0 +1 @@
+Åland University of Applied Sciences
diff --git a/lib/domains/az/abu.txt b/lib/domains/az/abu.txt
deleted file mode 100644
index b4df420550..0000000000
--- a/lib/domains/az/abu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Azerbaijan International University
diff --git a/lib/domains/az/aseu.txt b/lib/domains/az/aseu.txt
deleted file mode 100644
index c2dbaa1b40..0000000000
--- a/lib/domains/az/aseu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Azerbaijan State Economic University
diff --git a/lib/domains/ba/fet.txt b/lib/domains/ba/fet.txt
new file mode 100644
index 0000000000..078774c85c
--- /dev/null
+++ b/lib/domains/ba/fet.txt
@@ -0,0 +1 @@
+Faculty of Electrical Engineering Tuzla
diff --git a/lib/domains/ba/fpmoz.txt b/lib/domains/ba/fpmoz.txt
index 9a4d69daad..fc1babedb2 100644
--- a/lib/domains/ba/fpmoz.txt
+++ b/lib/domains/ba/fpmoz.txt
@@ -1 +1 @@
-Faculty of science and education, University of Mostar
+Faculty of Science and Education, University of Mostar
diff --git a/lib/domains/ba/sum.txt b/lib/domains/ba/sum.txt
new file mode 100644
index 0000000000..c368ea0f8a
--- /dev/null
+++ b/lib/domains/ba/sum.txt
@@ -0,0 +1 @@
+University of Mostar
diff --git a/lib/domains/ba/sum/fpmoz.txt b/lib/domains/ba/sum/fpmoz.txt
new file mode 100644
index 0000000000..ac96162387
--- /dev/null
+++ b/lib/domains/ba/sum/fpmoz.txt
@@ -0,0 +1 @@
+Faculty of Science and Education
diff --git a/lib/domains/bd/ac/gub.txt b/lib/domains/bd/ac/gub.txt
deleted file mode 100644
index cb13758694..0000000000
--- a/lib/domains/bd/ac/gub.txt
+++ /dev/null
@@ -1 +0,0 @@
-Green University of Bangladesh
diff --git a/lib/domains/bd/ac/thepub.txt b/lib/domains/bd/ac/thepub.txt
deleted file mode 100644
index a880e7fd93..0000000000
--- a/lib/domains/bd/ac/thepub.txt
+++ /dev/null
@@ -1 +0,0 @@
-People's University of Bangladesh
diff --git a/lib/domains/bd/edu/atishdipankaruniversity.txt b/lib/domains/bd/edu/atishdipankaruniversity.txt
deleted file mode 100644
index e5c62f3435..0000000000
--- a/lib/domains/bd/edu/atishdipankaruniversity.txt
+++ /dev/null
@@ -1 +0,0 @@
-Atish Dipankar University
diff --git a/lib/domains/bd/edu/bangladeshuniversity.txt b/lib/domains/bd/edu/bangladeshuniversity.txt
deleted file mode 100644
index d3e172af67..0000000000
--- a/lib/domains/bd/edu/bangladeshuniversity.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bangladesh University
diff --git a/lib/domains/bd/edu/ustc.txt b/lib/domains/bd/edu/ustc.txt
deleted file mode 100644
index 77770c54ef..0000000000
--- a/lib/domains/bd/edu/ustc.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Science & Technology Chittagong (USTC)
diff --git a/lib/domains/be/actournai.txt b/lib/domains/be/actournai.txt
new file mode 100644
index 0000000000..83f3e4b285
--- /dev/null
+++ b/lib/domains/be/actournai.txt
@@ -0,0 +1,2 @@
+Official website : http://www.actournai.be/
+long term course on the official website (IT art, including game and web dev) : http://www.actournai.be/atelier/arts_numeriques
diff --git a/lib/domains/be/avondschool.txt b/lib/domains/be/avondschool.txt
new file mode 100644
index 0000000000..3ab015bcb9
--- /dev/null
+++ b/lib/domains/be/avondschool.txt
@@ -0,0 +1 @@
+CVO Panta Rhei
diff --git a/lib/domains/be/donboscoverviers.txt b/lib/domains/be/donboscoverviers.txt
new file mode 100644
index 0000000000..8c09bd1b4f
--- /dev/null
+++ b/lib/domains/be/donboscoverviers.txt
@@ -0,0 +1,7 @@
+Institut Donbosco Verviers : Rue des Alliés 70, 4800 Verviers
+
+http://www.donboscoverviers.be/
+
+http://tqinfo.donboscoverviers.be/
+
+email adresse : XXX.XXXX@donboscoverviers.be
diff --git a/lib/domains/be/heaj/student.txt b/lib/domains/be/heaj/student.txt
new file mode 100644
index 0000000000..18719faa88
--- /dev/null
+++ b/lib/domains/be/heaj/student.txt
@@ -0,0 +1 @@
+Haute Ecole Albert Jacquard
diff --git a/lib/domains/be/icinstitute.txt b/lib/domains/be/icinstitute.txt
new file mode 100644
index 0000000000..350d715193
--- /dev/null
+++ b/lib/domains/be/icinstitute.txt
@@ -0,0 +1 @@
+IC Institute
diff --git a/lib/domains/be/ifosupwavre.txt b/lib/domains/be/ifosupwavre.txt
new file mode 100644
index 0000000000..9c7c38c6d3
--- /dev/null
+++ b/lib/domains/be/ifosupwavre.txt
@@ -0,0 +1 @@
+IFOSUP - Institute de Formation Superieure
diff --git a/lib/domains/be/ikorn.txt b/lib/domains/be/ikorn.txt
new file mode 100644
index 0000000000..8a337893dc
--- /dev/null
+++ b/lib/domains/be/ikorn.txt
@@ -0,0 +1 @@
+IKORN NINOVE
diff --git a/lib/domains/be/s19.txt b/lib/domains/be/s19.txt
new file mode 100644
index 0000000000..301b588a53
--- /dev/null
+++ b/lib/domains/be/s19.txt
@@ -0,0 +1 @@
+Ecole 19
\ No newline at end of file
diff --git a/lib/domains/be/uliege.txt b/lib/domains/be/uliege.txt
new file mode 100644
index 0000000000..b8ad9454aa
--- /dev/null
+++ b/lib/domains/be/uliege.txt
@@ -0,0 +1 @@
+Université de Liège
diff --git a/lib/domains/bg/ntbg.txt b/lib/domains/bg/ntbg.txt
new file mode 100644
index 0000000000..2bfdd83a64
--- /dev/null
+++ b/lib/domains/bg/ntbg.txt
@@ -0,0 +1 @@
+National Trade and Banking High School
diff --git a/lib/domains/bg/shu.txt b/lib/domains/bg/shu.txt
new file mode 100644
index 0000000000..e889a0ef70
--- /dev/null
+++ b/lib/domains/bg/shu.txt
@@ -0,0 +1 @@
+Shumen University "Konstantin Preslavsky" (http://shu.bg)
diff --git a/lib/domains/bg/uwekind.txt b/lib/domains/bg/uwekind.txt
new file mode 100644
index 0000000000..65ab4fc00f
--- /dev/null
+++ b/lib/domains/bg/uwekind.txt
@@ -0,0 +1 @@
+International School Uwekind 
diff --git a/lib/domains/blacklist.txt b/lib/domains/blacklist.txt
index cdc7156b67..eab7d1410e 100644
--- a/lib/domains/blacklist.txt
+++ b/lib/domains/blacklist.txt
@@ -8,4 +8,11 @@ alumni.cmu.edu
 int.edu.gr
 sbu.ac.ir
 mail.sbu.ac.ir
-maricopa.edu
+sharif.ir
+sharif.edu
+my.edu.moi
+art.edu.lv
+aaedu.edu.pl
+k.tut.edu.pl
+uno.edu.gr
+mdu.edu.rs
\ No newline at end of file
diff --git a/lib/domains/bn/edu/itb.txt b/lib/domains/bn/edu/itb.txt
deleted file mode 100644
index e612c51089..0000000000
--- a/lib/domains/bn/edu/itb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institut Teknologi Brunei
diff --git a/lib/domains/bo/com/udivirtual.txt b/lib/domains/bo/com/udivirtual.txt
new file mode 100644
index 0000000000..7712e6ad70
--- /dev/null
+++ b/lib/domains/bo/com/udivirtual.txt
@@ -0,0 +1 @@
+Universidad para el Desarrollo y la Innovación
\ No newline at end of file
diff --git a/lib/domains/br/cesjf.txt b/lib/domains/br/cesjf.txt
new file mode 100644
index 0000000000..173bf3dbd2
--- /dev/null
+++ b/lib/domains/br/cesjf.txt
@@ -0,0 +1 @@
+Centro de Ensino Superior de Juiz de Fora
diff --git a/lib/domains/br/cesuc/dti.txt b/lib/domains/br/cesuc.txt
similarity index 100%
rename from lib/domains/br/cesuc/dti.txt
rename to lib/domains/br/cesuc.txt
diff --git a/lib/domains/br/com/alunofg.txt b/lib/domains/br/com/alunofg.txt
new file mode 100644
index 0000000000..3718f28709
--- /dev/null
+++ b/lib/domains/br/com/alunofg.txt
@@ -0,0 +1 @@
+UNIFG - Centro Universitário dos Guararapes
diff --git a/lib/domains/br/com/ceepcascavel.txt b/lib/domains/br/com/ceepcascavel.txt
new file mode 100644
index 0000000000..a2fa5cba30
--- /dev/null
+++ b/lib/domains/br/com/ceepcascavel.txt
@@ -0,0 +1,2 @@
+Centro Estadual de Educação Profissional Pedro Boaretto Neto
+CEEP - Pedro Boaretto Neto
diff --git a/lib/domains/br/com/colband.txt b/lib/domains/br/com/colband.txt
new file mode 100644
index 0000000000..54ec416470
--- /dev/null
+++ b/lib/domains/br/com/colband.txt
@@ -0,0 +1 @@
+Colégio Bandeirantes
diff --git a/lib/domains/br/com/fametro.txt b/lib/domains/br/com/fametro.txt
new file mode 100644
index 0000000000..4444357cd9
--- /dev/null
+++ b/lib/domains/br/com/fametro.txt
@@ -0,0 +1 @@
+Faculdade Metropolitana
\ No newline at end of file
diff --git a/lib/domains/br/com/sempreuninassau.txt b/lib/domains/br/com/sempreuninassau.txt
new file mode 100644
index 0000000000..51bbf70ae4
--- /dev/null
+++ b/lib/domains/br/com/sempreuninassau.txt
@@ -0,0 +1 @@
+UniNassau University
diff --git a/lib/domains/br/com/uniasselvi.txt b/lib/domains/br/com/uniasselvi.txt
new file mode 100644
index 0000000000..fa8ac847e1
--- /dev/null
+++ b/lib/domains/br/com/uniasselvi.txt
@@ -0,0 +1 @@
+Sociedade Educacional Leonardo da Vinci - UNIASSELVI
diff --git a/lib/domains/br/com/unigranet.txt b/lib/domains/br/com/unigranet.txt
new file mode 100644
index 0000000000..1ff2f98229
--- /dev/null
+++ b/lib/domains/br/com/unigranet.txt
@@ -0,0 +1 @@
+Universidade da Grande Dourados - UNIGRANET
\ No newline at end of file
diff --git a/lib/domains/br/com/viannasempre.txt b/lib/domains/br/com/viannasempre.txt
new file mode 100644
index 0000000000..81c49e8f23
--- /dev/null
+++ b/lib/domains/br/com/viannasempre.txt
@@ -0,0 +1 @@
+Instituto Vianna Júnior
diff --git a/lib/domains/br/edu/cesumar.txt b/lib/domains/br/edu/cesumar.txt
new file mode 100644
index 0000000000..765fb873db
--- /dev/null
+++ b/lib/domains/br/edu/cesumar.txt
@@ -0,0 +1 @@
+Centro Universitário Cesumar
\ No newline at end of file
diff --git a/lib/domains/br/edu/ifpe.txt b/lib/domains/br/edu/ifpe.txt
new file mode 100644
index 0000000000..3fad913895
--- /dev/null
+++ b/lib/domains/br/edu/ifpe.txt
@@ -0,0 +1 @@
+Instituto Federal de Pernambuco
diff --git a/lib/domains/br/edu/ifsc.txt b/lib/domains/br/edu/ifsc.txt
new file mode 100644
index 0000000000..29594b7365
--- /dev/null
+++ b/lib/domains/br/edu/ifsc.txt
@@ -0,0 +1 @@
+Federal Institute of Santa Catarina
\ No newline at end of file
diff --git a/lib/domains/br/edu/ifsudestemg.txt b/lib/domains/br/edu/ifsudestemg.txt
new file mode 100644
index 0000000000..4a3022fbd6
--- /dev/null
+++ b/lib/domains/br/edu/ifsudestemg.txt
@@ -0,0 +1 @@
+Instituto Federal Sudeste de Minas Gerais
diff --git a/lib/domains/br/edu/uniasselvi.txt b/lib/domains/br/edu/uniasselvi.txt
new file mode 100644
index 0000000000..fa8ac847e1
--- /dev/null
+++ b/lib/domains/br/edu/uniasselvi.txt
@@ -0,0 +1 @@
+Sociedade Educacional Leonardo da Vinci - UNIASSELVI
diff --git a/lib/domains/br/edu/unigran.txt b/lib/domains/br/edu/unigran.txt
new file mode 100644
index 0000000000..29fa8ebcdd
--- /dev/null
+++ b/lib/domains/br/edu/unigran.txt
@@ -0,0 +1 @@
+Centro Universitário da Grande Dourados
diff --git a/lib/domains/br/edu/unitri.txt b/lib/domains/br/edu/unitri.txt
new file mode 100644
index 0000000000..af15b7167a
--- /dev/null
+++ b/lib/domains/br/edu/unitri.txt
@@ -0,0 +1 @@
+Unitri - Centro Universitário do Triângulo
diff --git a/lib/domains/br/edu/universidadedevassouras.txt b/lib/domains/br/edu/universidadedevassouras.txt
new file mode 100644
index 0000000000..22bb243af7
--- /dev/null
+++ b/lib/domains/br/edu/universidadedevassouras.txt
@@ -0,0 +1 @@
+Universidade de Vassouras
diff --git a/lib/domains/br/esamc.txt b/lib/domains/br/esamc.txt
new file mode 100644
index 0000000000..8a88a7edfd
--- /dev/null
+++ b/lib/domains/br/esamc.txt
@@ -0,0 +1 @@
+Escola Superior de Administração, Marketing e Comunicação
diff --git a/lib/domains/br/faesa.txt b/lib/domains/br/faesa.txt
new file mode 100644
index 0000000000..1188ad2110
--- /dev/null
+++ b/lib/domains/br/faesa.txt
@@ -0,0 +1 @@
+FAESA Centro Universitário
diff --git a/lib/domains/br/funcesi.txt b/lib/domains/br/funcesi.txt
new file mode 100644
index 0000000000..c3c69fa7dc
--- /dev/null
+++ b/lib/domains/br/funcesi.txt
@@ -0,0 +1 @@
+Fundacao Comunitaria de Ensino Superior de Itabira
diff --git a/lib/domains/br/furb/al.txt b/lib/domains/br/furb/al.txt
deleted file mode 100644
index ea9fb47db4..0000000000
--- a/lib/domains/br/furb/al.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Fundação Universidade Regional de Blumenau - http://www.furb.br
-Domain: user@al.furb.br
-Instrução para habilitar a conta de e-mail: https://sp.furb.br/sites/wiki/Paginas/Contas%20de%20E-mail.aspx
diff --git a/lib/domains/br/iesb.txt b/lib/domains/br/iesb.txt
new file mode 100644
index 0000000000..bbccf73fe2
--- /dev/null
+++ b/lib/domains/br/iesb.txt
@@ -0,0 +1,2 @@
+Instituto de Educação Superior de Brasília
+Superior Education Institute of Brasília
diff --git a/lib/domains/br/poli.txt b/lib/domains/br/poli.txt
new file mode 100644
index 0000000000..c020b75d30
--- /dev/null
+++ b/lib/domains/br/poli.txt
@@ -0,0 +1 @@
+Escola Politécnica de Pernambuco
diff --git a/lib/domains/br/ucam-campos.txt b/lib/domains/br/ucam-campos.txt
new file mode 100644
index 0000000000..f432a3e73d
--- /dev/null
+++ b/lib/domains/br/ucam-campos.txt
@@ -0,0 +1 @@
+Universidade Candido Mendes - Campos dos Goytacazes
diff --git a/lib/domains/br/ucg.txt b/lib/domains/br/ucg.txt
deleted file mode 100644
index 2643b50a80..0000000000
--- a/lib/domains/br/ucg.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidade Católica de Goiás
diff --git a/lib/domains/br/uems.txt b/lib/domains/br/uems.txt
new file mode 100644
index 0000000000..17908b90af
--- /dev/null
+++ b/lib/domains/br/uems.txt
@@ -0,0 +1 @@
+Universidade Estadual de Mato Grosso do Sul
diff --git a/lib/domains/br/ugf.txt b/lib/domains/br/ugf.txt
deleted file mode 100644
index e4ea572985..0000000000
--- a/lib/domains/br/ugf.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidade Gama Filho
diff --git a/lib/domains/br/unimes.txt b/lib/domains/br/unimes.txt
new file mode 100644
index 0000000000..4d5a2f74a9
--- /dev/null
+++ b/lib/domains/br/unimes.txt
@@ -0,0 +1 @@
+Universidade Metropolitana de Santos
diff --git a/lib/domains/br/uniron-ro.txt b/lib/domains/br/uniron-ro.txt
deleted file mode 100644
index c6f6832f09..0000000000
--- a/lib/domains/br/uniron-ro.txt
+++ /dev/null
@@ -1 +0,0 @@
-Faculdade Interamericana de Porto Velho
diff --git a/lib/domains/by/bsac.txt b/lib/domains/by/bsac.txt
new file mode 100644
index 0000000000..469d45ac5a
--- /dev/null
+++ b/lib/domains/by/bsac.txt
@@ -0,0 +1 @@
+Belarusian State Academy of Telecommunications
diff --git a/lib/domains/ca/ab/kingsu.txt b/lib/domains/ca/ab/kingsu.txt
deleted file mode 100644
index 7c80fb7cfa..0000000000
--- a/lib/domains/ca/ab/kingsu.txt
+++ /dev/null
@@ -1 +0,0 @@
-King's University College
diff --git a/lib/domains/ca/bc/cariboo.txt b/lib/domains/ca/bc/cariboo.txt
deleted file mode 100644
index 6627c55ea2..0000000000
--- a/lib/domains/ca/bc/cariboo.txt
+++ /dev/null
@@ -1 +0,0 @@
-University College of the Cariboo
diff --git a/lib/domains/ca/bc/sd64.txt b/lib/domains/ca/bc/sd64.txt
new file mode 100644
index 0000000000..0390e14eff
--- /dev/null
+++ b/lib/domains/ca/bc/sd64.txt
@@ -0,0 +1 @@
+Gulf Islands Secondary School
diff --git a/lib/domains/ca/bc/ucfv.txt b/lib/domains/ca/bc/ucfv.txt
deleted file mode 100644
index 56eaf318b0..0000000000
--- a/lib/domains/ca/bc/ucfv.txt
+++ /dev/null
@@ -1 +0,0 @@
-University College of the Fraser Valley
diff --git a/lib/domains/ca/bialik.txt b/lib/domains/ca/bialik.txt
new file mode 100644
index 0000000000..12d3c36915
--- /dev/null
+++ b/lib/domains/ca/bialik.txt
@@ -0,0 +1 @@
+Bialik Hebrew Day School
diff --git a/lib/domains/ca/on/lacitec.txt b/lib/domains/ca/collegelacite/edu.txt
similarity index 100%
rename from lib/domains/ca/on/lacitec.txt
rename to lib/domains/ca/collegelacite/edu.txt
diff --git a/lib/domains/ca/lambtoncollege.txt b/lib/domains/ca/lambtoncollege.txt
new file mode 100644
index 0000000000..eea3a3effb
--- /dev/null
+++ b/lib/domains/ca/lambtoncollege.txt
@@ -0,0 +1 @@
+Lambton College
diff --git a/lib/domains/ca/mitt.txt b/lib/domains/ca/mitt.txt
new file mode 100644
index 0000000000..c306d8e5aa
--- /dev/null
+++ b/lib/domains/ca/mitt.txt
@@ -0,0 +1 @@
+Manitoba Institute of Trades and Technology
diff --git a/lib/domains/ca/ns/nsac.txt b/lib/domains/ca/ns/nsac.txt
deleted file mode 100644
index b94837c960..0000000000
--- a/lib/domains/ca/ns/nsac.txt
+++ /dev/null
@@ -1 +0,0 @@
-Nova Scotia Agricultural College
diff --git a/lib/domains/ca/on/lambton.txt b/lib/domains/ca/on/lambton.txt
new file mode 100644
index 0000000000..eea3a3effb
--- /dev/null
+++ b/lib/domains/ca/on/lambton.txt
@@ -0,0 +1 @@
+Lambton College
diff --git a/lib/domains/ca/on/stclairc.txt b/lib/domains/ca/on/stclairc.txt
deleted file mode 100644
index 9a44cef885..0000000000
--- a/lib/domains/ca/on/stclairc.txt
+++ /dev/null
@@ -1 +0,0 @@
-St. Clair College
diff --git a/lib/domains/ca/picollege.txt b/lib/domains/ca/picollege.txt
deleted file mode 100644
index 570bb9f930..0000000000
--- a/lib/domains/ca/picollege.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pacific International College
diff --git a/lib/domains/ca/qc/cegepgranby.txt b/lib/domains/ca/qc/cegepgranby.txt
new file mode 100644
index 0000000000..6225162ff6
--- /dev/null
+++ b/lib/domains/ca/qc/cegepgranby.txt
@@ -0,0 +1 @@
+Cégep de Granby
diff --git a/lib/domains/ca/qc/edu-collanaud.txt b/lib/domains/ca/qc/edu-collanaud.txt
deleted file mode 100644
index 964af872f3..0000000000
--- a/lib/domains/ca/qc/edu-collanaud.txt
+++ /dev/null
@@ -1 +0,0 @@
-S’applique pour les trois Cégeps constituants de Lanaudière
\ No newline at end of file
diff --git a/lib/domains/ca/qc/johnabbott.txt b/lib/domains/ca/qc/johnabbott.txt
new file mode 100644
index 0000000000..988655c1d2
--- /dev/null
+++ b/lib/domains/ca/qc/johnabbott.txt
@@ -0,0 +1 @@
+John Abbott College
\ No newline at end of file
diff --git a/lib/domains/ca/uwaterloo/edu.txt b/lib/domains/ca/uwaterloo/edu.txt
new file mode 100644
index 0000000000..bbd1d2b7cf
--- /dev/null
+++ b/lib/domains/ca/uwaterloo/edu.txt
@@ -0,0 +1,2 @@
+University of St. Jerome's College
+University of Waterloo
diff --git a/lib/domains/cat/fedac.txt b/lib/domains/cat/fedac.txt
new file mode 100644
index 0000000000..c83901b786
--- /dev/null
+++ b/lib/domains/cat/fedac.txt
@@ -0,0 +1 @@
+Escoles FEDAC
diff --git a/lib/domains/cat/insgabrielamistral.txt b/lib/domains/cat/insgabrielamistral.txt
new file mode 100644
index 0000000000..d49318356e
--- /dev/null
+++ b/lib/domains/cat/insgabrielamistral.txt
@@ -0,0 +1 @@
+Institut Gabriela Mistral
diff --git a/lib/domains/cat/sapalomera.txt b/lib/domains/cat/sapalomera.txt
new file mode 100644
index 0000000000..4401d167b8
--- /dev/null
+++ b/lib/domains/cat/sapalomera.txt
@@ -0,0 +1 @@
+Institut Sa Palomera (polytechnic High School)
\ No newline at end of file
diff --git a/lib/domains/cd/ucbukavu.txt b/lib/domains/cd/ucbukavu.txt
deleted file mode 100644
index b1a03962da..0000000000
--- a/lib/domains/cd/ucbukavu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Catholique de Bukavu
diff --git a/lib/domains/cd/unikis-ac.txt b/lib/domains/cd/unikis-ac.txt
deleted file mode 100644
index 918cc55888..0000000000
--- a/lib/domains/cd/unikis-ac.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université de Kisangani
diff --git a/lib/domains/cd/upc-rdc.txt b/lib/domains/cd/upc-rdc.txt
deleted file mode 100644
index 0984d18d95..0000000000
--- a/lib/domains/cd/upc-rdc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Protestante au Congo
diff --git a/lib/domains/ch/stud.bbbaden.txt b/lib/domains/ch/bbbaden/stud.txt
similarity index 100%
rename from lib/domains/ch/stud.bbbaden.txt
rename to lib/domains/ch/bbbaden/stud.txt
diff --git a/lib/domains/ch/bwdbern.txt b/lib/domains/ch/bwdbern.txt
new file mode 100644
index 0000000000..cb3113f319
--- /dev/null
+++ b/lib/domains/ch/bwdbern.txt
@@ -0,0 +1 @@
+Bildungszentrum für Wirtschaft und Dienstleistung
diff --git a/lib/domains/ch/divcom.txt b/lib/domains/ch/divcom.txt
new file mode 100644
index 0000000000..43f51273c2
--- /dev/null
+++ b/lib/domains/ch/divcom.txt
@@ -0,0 +1 @@
+Ecole professionnelle commerciale du canton du Jura
\ No newline at end of file
diff --git a/lib/domains/ch/educanet2/gyre.txt b/lib/domains/ch/educanet2/gyre.txt
new file mode 100644
index 0000000000..f9ce45a789
--- /dev/null
+++ b/lib/domains/ch/educanet2/gyre.txt
@@ -0,0 +1 @@
+Gymnase de Renens
diff --git a/lib/domains/ch/fernuni.txt b/lib/domains/ch/fernuni.txt
new file mode 100644
index 0000000000..e23a433466
--- /dev/null
+++ b/lib/domains/ch/fernuni.txt
@@ -0,0 +1,2 @@
+Universitare Fernstudien Schweiz
+Distance learning University Switzerland
\ No newline at end of file
diff --git a/lib/domains/ch/gbchur.txt b/lib/domains/ch/gbchur.txt
new file mode 100644
index 0000000000..9dbf54966a
--- /dev/null
+++ b/lib/domains/ch/gbchur.txt
@@ -0,0 +1 @@
+Gewerbliche Berufsschule Chur (GBC)
\ No newline at end of file
diff --git a/lib/domains/ch/gibz.txt b/lib/domains/ch/gibz.txt
new file mode 100644
index 0000000000..55bbd57bf6
--- /dev/null
+++ b/lib/domains/ch/gibz.txt
@@ -0,0 +1 @@
+Gewerblich-industrielle Bildungszentrum Zug
diff --git a/lib/domains/ch/gymo.txt b/lib/domains/ch/gymo.txt
new file mode 100644
index 0000000000..1b2cea8ccd
--- /dev/null
+++ b/lib/domains/ch/gymo.txt
@@ -0,0 +1 @@
+Gymnasium Oberaargau, Switzerland
diff --git a/lib/domains/ch/kantisargans.txt b/lib/domains/ch/kantisargans.txt
new file mode 100644
index 0000000000..5c4569cb1e
--- /dev/null
+++ b/lib/domains/ch/kantisargans.txt
@@ -0,0 +1 @@
+Kantonsschule Sargans
diff --git a/lib/domains/ch/ksimlee/stud.txt b/lib/domains/ch/ksimlee/stud.txt
new file mode 100644
index 0000000000..37d30ddcc2
--- /dev/null
+++ b/lib/domains/ch/ksimlee/stud.txt
@@ -0,0 +1 @@
+Kantonsschule Im Lee Winterthur
diff --git a/lib/domains/ch/ksobwalden.txt b/lib/domains/ch/ksobwalden.txt
new file mode 100644
index 0000000000..b0a6d56748
--- /dev/null
+++ b/lib/domains/ch/ksobwalden.txt
@@ -0,0 +1 @@
+Kantonsschule Obwalden
\ No newline at end of file
diff --git a/lib/domains/ch/kswe.txt b/lib/domains/ch/kswe.txt
new file mode 100644
index 0000000000..566c704900
--- /dev/null
+++ b/lib/domains/ch/kswe.txt
@@ -0,0 +1 @@
+Kantonsschule Wettingen
\ No newline at end of file
diff --git a/lib/domains/ch/schule-eschenbach.txt b/lib/domains/ch/schule-eschenbach.txt
new file mode 100644
index 0000000000..b31e3781a3
--- /dev/null
+++ b/lib/domains/ch/schule-eschenbach.txt
@@ -0,0 +1 @@
+Schule Eschenbach
diff --git a/lib/domains/ch/victoria-uni.txt b/lib/domains/ch/victoria-uni.txt
deleted file mode 100644
index d0fefa52df..0000000000
--- a/lib/domains/ch/victoria-uni.txt
+++ /dev/null
@@ -1 +0,0 @@
-Victoria University
diff --git a/lib/domains/ch/zhwin.txt b/lib/domains/ch/zhwin.txt
deleted file mode 100644
index e8a3953bc9..0000000000
--- a/lib/domains/ch/zhwin.txt
+++ /dev/null
@@ -1 +0,0 @@
-Zurich University of Applied Sciences Winterthur
diff --git a/lib/domains/ci/univmetiers.txt b/lib/domains/ci/univmetiers.txt
new file mode 100644
index 0000000000..969bf0c592
--- /dev/null
+++ b/lib/domains/ci/univmetiers.txt
@@ -0,0 +1 @@
+School actual website is http://www.pigierci.com/, Mails are hosted by microsoft but via http://univmetiers.onmicrosoft.com/.
diff --git a/lib/domains/cl/ciisa.txt b/lib/domains/cl/ciisa.txt
new file mode 100644
index 0000000000..b2d163341d
--- /dev/null
+++ b/lib/domains/cl/ciisa.txt
@@ -0,0 +1 @@
+Instituto de Ciencias Tecnológicas CIISA
diff --git a/lib/domains/cl/ipciisa.txt b/lib/domains/cl/ipciisa.txt
new file mode 100644
index 0000000000..c3fa84822f
--- /dev/null
+++ b/lib/domains/cl/ipciisa.txt
@@ -0,0 +1 @@
+Instituto de Ciencias Tecnológicas IP CIISA
diff --git a/lib/domains/cl/uautonoma.txt b/lib/domains/cl/uautonoma.txt
new file mode 100644
index 0000000000..6f04e22a2a
--- /dev/null
+++ b/lib/domains/cl/uautonoma.txt
@@ -0,0 +1 @@
+Universidad Autonoma de Chile
diff --git a/lib/domains/cl/ucervantes.txt b/lib/domains/cl/ucervantes.txt
deleted file mode 100644
index 691c08ead6..0000000000
--- a/lib/domains/cl/ucervantes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Miguel de Cervantes
diff --git a/lib/domains/cl/ujso.txt b/lib/domains/cl/ujso.txt
deleted file mode 100644
index 17959503ca..0000000000
--- a/lib/domains/cl/ujso.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad José Santos Ossa
diff --git a/lib/domains/cl/unab.txt b/lib/domains/cl/unab.txt
index d91b22d64d..419bcf021b 100644
--- a/lib/domains/cl/unab.txt
+++ b/lib/domains/cl/unab.txt
@@ -1 +1 @@
-Universidad Nacional Andrés Bello
+Universidad Andrés Bello
diff --git a/lib/domains/cl/unachile.txt b/lib/domains/cl/unachile.txt
deleted file mode 100644
index 55ebe51ace..0000000000
--- a/lib/domains/cl/unachile.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Adventista de Chile
diff --git a/lib/domains/cl/uvipro.txt b/lib/domains/cl/uvipro.txt
deleted file mode 100644
index 8669dddc52..0000000000
--- a/lib/domains/cl/uvipro.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Tecnologica Vicente Perez Rosales
diff --git a/lib/domains/cm/iut-douala.txt b/lib/domains/cm/iut-douala.txt
new file mode 100644
index 0000000000..6067db3a76
--- /dev/null
+++ b/lib/domains/cm/iut-douala.txt
@@ -0,0 +1,2 @@
+Institut Universitaire des Technologies
+Univesity Institute Of Technologies
\ No newline at end of file
diff --git a/lib/domains/cn/com/alevel.txt b/lib/domains/cn/com/alevel.txt
new file mode 100644
index 0000000000..d8546076b4
--- /dev/null
+++ b/lib/domains/cn/com/alevel.txt
@@ -0,0 +1 @@
+Shenzhen College of International Education
diff --git a/lib/domains/cn/com/scie.txt b/lib/domains/cn/com/scie.txt
new file mode 100644
index 0000000000..5ea1a92940
--- /dev/null
+++ b/lib/domains/cn/com/scie.txt
@@ -0,0 +1,3 @@
+Shenzhen College of Internation Education
+深圳国际交流学院
+URL: http://www.alevel.com.cn/
diff --git a/lib/domains/cn/dwlxs.txt b/lib/domains/cn/dwlxs.txt
new file mode 100644
index 0000000000..04e88be447
--- /dev/null
+++ b/lib/domains/cn/dwlxs.txt
@@ -0,0 +1 @@
+Dalian University Of Foreign Languages
\ No newline at end of file
diff --git a/lib/domains/cn/edu/ahau.txt b/lib/domains/cn/edu/ahau.txt
new file mode 100644
index 0000000000..f1d9a5b91f
--- /dev/null
+++ b/lib/domains/cn/edu/ahau.txt
@@ -0,0 +1 @@
+Anhui Agriculture University
diff --git a/lib/domains/cn/edu/bbc.txt b/lib/domains/cn/edu/bbc.txt
new file mode 100644
index 0000000000..a018b1fe0f
--- /dev/null
+++ b/lib/domains/cn/edu/bbc.txt
@@ -0,0 +1 @@
+Bengbu University
diff --git a/lib/domains/cn/edu/bjut.txt b/lib/domains/cn/edu/bjut.txt
new file mode 100644
index 0000000000..9f698673f0
--- /dev/null
+++ b/lib/domains/cn/edu/bjut.txt
@@ -0,0 +1 @@
+Beijing University of Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/bnuz.txt b/lib/domains/cn/edu/bnuz.txt
new file mode 100644
index 0000000000..dc385e36fe
--- /dev/null
+++ b/lib/domains/cn/edu/bnuz.txt
@@ -0,0 +1 @@
+BEIJING NORMAL UNIVERSITY ZHUHAI
\ No newline at end of file
diff --git a/lib/domains/cn/edu/btbu.txt b/lib/domains/cn/edu/btbu.txt
new file mode 100644
index 0000000000..7e8d85d133
--- /dev/null
+++ b/lib/domains/cn/edu/btbu.txt
@@ -0,0 +1 @@
+Beijing Technology and Business University
diff --git a/lib/domains/cn/edu/bucea/stu.txt b/lib/domains/cn/edu/bucea/stu.txt
new file mode 100644
index 0000000000..5a8b0d2505
--- /dev/null
+++ b/lib/domains/cn/edu/bucea/stu.txt
@@ -0,0 +1 @@
+BEIJING UNIVERSITY OF CIVITL ENGINEERING AND ARCHITECTURE
diff --git a/lib/domains/cn/edu/cdu.txt b/lib/domains/cn/edu/cdu.txt
new file mode 100644
index 0000000000..9fc63f19d0
--- /dev/null
+++ b/lib/domains/cn/edu/cdu.txt
@@ -0,0 +1 @@
+Chengdu University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/chd.txt b/lib/domains/cn/edu/chd.txt
new file mode 100644
index 0000000000..1f1db93008
--- /dev/null
+++ b/lib/domains/cn/edu/chd.txt
@@ -0,0 +1 @@
+Chang'an University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/chu.txt b/lib/domains/cn/edu/chu.txt
new file mode 100644
index 0000000000..b4abebc0f0
--- /dev/null
+++ b/lib/domains/cn/edu/chu.txt
@@ -0,0 +1,2 @@
+Official website: http://www.chu.edu.cn/
+Student mailbox login page: http://mail.chu.edu.cn/
diff --git a/lib/domains/cn/edu/cjlu.txt b/lib/domains/cn/edu/cjlu.txt
new file mode 100644
index 0000000000..d98fa4c59f
--- /dev/null
+++ b/lib/domains/cn/edu/cjlu.txt
@@ -0,0 +1,2 @@
+China Jiliang University
+中国计量大学
diff --git a/lib/domains/cn/edu/cjlu/stu.txt b/lib/domains/cn/edu/cjlu/stu.txt
new file mode 100644
index 0000000000..9c19901e32
--- /dev/null
+++ b/lib/domains/cn/edu/cjlu/stu.txt
@@ -0,0 +1,2 @@
+China Jiliang University
+中国计量大学(学生邮箱)
diff --git a/lib/domains/cn/edu/cqut/2014.txt b/lib/domains/cn/edu/cqut/2014.txt
new file mode 100644
index 0000000000..eeada8bf3d
--- /dev/null
+++ b/lib/domains/cn/edu/cqut/2014.txt
@@ -0,0 +1 @@
+Chongqing University of Technology
diff --git a/lib/domains/cn/edu/cslg.txt b/lib/domains/cn/edu/cslg.txt
new file mode 100644
index 0000000000..44b79471b2
--- /dev/null
+++ b/lib/domains/cn/edu/cslg.txt
@@ -0,0 +1 @@
+ChangShu Institute of Technology 
\ No newline at end of file
diff --git a/lib/domains/cn/edu/csuft.txt b/lib/domains/cn/edu/csuft.txt
new file mode 100644
index 0000000000..4d8aa3bb14
--- /dev/null
+++ b/lib/domains/cn/edu/csuft.txt
@@ -0,0 +1 @@
+Central South University of Forestry and Technology
diff --git a/lib/domains/cn/edu/csust.txt b/lib/domains/cn/edu/csust.txt
new file mode 100644
index 0000000000..7298c21992
--- /dev/null
+++ b/lib/domains/cn/edu/csust.txt
@@ -0,0 +1 @@
+Changsha University of Science & Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/csust/stu.txt b/lib/domains/cn/edu/csust/stu.txt
new file mode 100644
index 0000000000..af39914de8
--- /dev/null
+++ b/lib/domains/cn/edu/csust/stu.txt
@@ -0,0 +1 @@
+Changsha University of Science and Technology
diff --git a/lib/domains/cn/edu/ctbu.txt b/lib/domains/cn/edu/ctbu.txt
new file mode 100644
index 0000000000..6312bfdf85
--- /dev/null
+++ b/lib/domains/cn/edu/ctbu.txt
@@ -0,0 +1 @@
+Chongqing Technology and Business University
diff --git a/lib/domains/cn/edu/cuit.txt b/lib/domains/cn/edu/cuit.txt
new file mode 100644
index 0000000000..ca3c39713d
--- /dev/null
+++ b/lib/domains/cn/edu/cuit.txt
@@ -0,0 +1 @@
+Chengdu University of Information Technology
diff --git a/lib/domains/cn/edu/cup.txt b/lib/domains/cn/edu/cup.txt
new file mode 100644
index 0000000000..784b861c7f
--- /dev/null
+++ b/lib/domains/cn/edu/cup.txt
@@ -0,0 +1 @@
+China University of Petroleum-Beijing
diff --git a/lib/domains/cn/edu/cup/student.txt b/lib/domains/cn/edu/cup/student.txt
new file mode 100644
index 0000000000..a2413106df
--- /dev/null
+++ b/lib/domains/cn/edu/cup/student.txt
@@ -0,0 +1 @@
+China University of Petroleum-Beijing
\ No newline at end of file
diff --git a/lib/domains/cn/edu/cupk.txt b/lib/domains/cn/edu/cupk.txt
new file mode 100644
index 0000000000..ff5c777216
--- /dev/null
+++ b/lib/domains/cn/edu/cupk.txt
@@ -0,0 +1,2 @@
+China University of Petroleum-Beijing at Karamay
+中国石油大学（北京）克拉玛依校区
diff --git a/lib/domains/cn/edu/cust.txt b/lib/domains/cn/edu/cust.txt
new file mode 100644
index 0000000000..70a812c9ed
--- /dev/null
+++ b/lib/domains/cn/edu/cust.txt
@@ -0,0 +1 @@
+Changchun University of Science and Technology
diff --git a/lib/domains/cn/edu/cwu/email.txt b/lib/domains/cn/edu/cwu/email.txt
new file mode 100644
index 0000000000..a507b44275
--- /dev/null
+++ b/lib/domains/cn/edu/cwu/email.txt
@@ -0,0 +1,2 @@
+CHINA WOMEN'S UNIVERSITY
+中华女子学院
\ No newline at end of file
diff --git a/lib/domains/cn/edu/dgut.txt b/lib/domains/cn/edu/dgut.txt
new file mode 100644
index 0000000000..770b37e37b
--- /dev/null
+++ b/lib/domains/cn/edu/dgut.txt
@@ -0,0 +1 @@
+Dongguan University Of Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/dlufl.txt b/lib/domains/cn/edu/dlufl.txt
new file mode 100644
index 0000000000..04e88be447
--- /dev/null
+++ b/lib/domains/cn/edu/dlufl.txt
@@ -0,0 +1 @@
+Dalian University Of Foreign Languages
\ No newline at end of file
diff --git a/lib/domains/cn/edu/dlufl/student.txt b/lib/domains/cn/edu/dlufl/student.txt
new file mode 100644
index 0000000000..04e88be447
--- /dev/null
+++ b/lib/domains/cn/edu/dlufl/student.txt
@@ -0,0 +1 @@
+Dalian University Of Foreign Languages
\ No newline at end of file
diff --git a/lib/domains/cn/edu/fjut.txt b/lib/domains/cn/edu/fjut.txt
new file mode 100644
index 0000000000..88c72d5234
--- /dev/null
+++ b/lib/domains/cn/edu/fjut.txt
@@ -0,0 +1 @@
+Fujian University of Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/gdou.txt b/lib/domains/cn/edu/gdou.txt
new file mode 100644
index 0000000000..413d844138
--- /dev/null
+++ b/lib/domains/cn/edu/gdou.txt
@@ -0,0 +1 @@
+Guangdong Ocean University
diff --git a/lib/domains/cn/edu/gdpu.txt b/lib/domains/cn/edu/gdpu.txt
new file mode 100644
index 0000000000..17b3bf2157
--- /dev/null
+++ b/lib/domains/cn/edu/gdpu.txt
@@ -0,0 +1 @@
+Guangdong Pharmaceutical University
diff --git a/lib/domains/cn/edu/gduf.txt b/lib/domains/cn/edu/gduf.txt
new file mode 100644
index 0000000000..9dd68c52aa
--- /dev/null
+++ b/lib/domains/cn/edu/gduf.txt
@@ -0,0 +1 @@
+Guangdong University Of Finance
diff --git a/lib/domains/cn/edu/glut.txt b/lib/domains/cn/edu/glut.txt
new file mode 100644
index 0000000000..52283bf342
--- /dev/null
+++ b/lib/domains/cn/edu/glut.txt
@@ -0,0 +1 @@
+Guilin university of technology
diff --git a/lib/domains/cn/edu/gsli.txt b/lib/domains/cn/edu/gsli.txt
new file mode 100644
index 0000000000..ef2d7810f2
--- /dev/null
+++ b/lib/domains/cn/edu/gsli.txt
@@ -0,0 +1 @@
+ GanSu Political Science And Law Institute
diff --git a/lib/domains/cn/edu/guet/mails.txt b/lib/domains/cn/edu/guet/mails.txt
new file mode 100644
index 0000000000..d169a1434b
--- /dev/null
+++ b/lib/domains/cn/edu/guet/mails.txt
@@ -0,0 +1 @@
+Guilin University Of Electronic Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/gzucm/stu.txt b/lib/domains/cn/edu/gzucm/stu.txt
new file mode 100644
index 0000000000..4720e545a6
--- /dev/null
+++ b/lib/domains/cn/edu/gzucm/stu.txt
@@ -0,0 +1 @@
+Guangzhou University of Chinese Medicine
diff --git a/lib/domains/cn/edu/haue.txt b/lib/domains/cn/edu/haue.txt
new file mode 100644
index 0000000000..7441bb3c14
--- /dev/null
+++ b/lib/domains/cn/edu/haue.txt
@@ -0,0 +1 @@
+add Henan University of Engineering
diff --git a/lib/domains/cn/edu/haust.txt b/lib/domains/cn/edu/haust.txt
new file mode 100644
index 0000000000..970d11a221
--- /dev/null
+++ b/lib/domains/cn/edu/haust.txt
@@ -0,0 +1 @@
+Henan University of Science and Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/haut.txt b/lib/domains/cn/edu/haut.txt
new file mode 100644
index 0000000000..e1f062ab4f
--- /dev/null
+++ b/lib/domains/cn/edu/haut.txt
@@ -0,0 +1,2 @@
+Henan University of Technology
+
diff --git a/lib/domains/cn/edu/hbuas.txt b/lib/domains/cn/edu/hbuas.txt
new file mode 100644
index 0000000000..dd9d71a2be
--- /dev/null
+++ b/lib/domains/cn/edu/hbuas.txt
@@ -0,0 +1,2 @@
+HUBEI UNIVERSITY OF ARTS AND SCIENCE
+湖北文理学院
diff --git a/lib/domains/cn/edu/hdu.txt b/lib/domains/cn/edu/hdu.txt
new file mode 100644
index 0000000000..39247a220a
--- /dev/null
+++ b/lib/domains/cn/edu/hdu.txt
@@ -0,0 +1 @@
+Hangzhou Dianzi University
diff --git a/lib/domains/cn/edu/hhit.txt b/lib/domains/cn/edu/hhit.txt
new file mode 100644
index 0000000000..fa07679f99
--- /dev/null
+++ b/lib/domains/cn/edu/hhit.txt
@@ -0,0 +1 @@
+HuaiHai Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/hitsz/stmail.txt b/lib/domains/cn/edu/hitsz/stmail.txt
new file mode 100644
index 0000000000..120b4fc14e
--- /dev/null
+++ b/lib/domains/cn/edu/hitsz/stmail.txt
@@ -0,0 +1 @@
+Harbin Institute of Technology, Shenzhen
diff --git a/lib/domains/cn/edu/hnuahe.txt b/lib/domains/cn/edu/hnuahe.txt
new file mode 100644
index 0000000000..859718d834
--- /dev/null
+++ b/lib/domains/cn/edu/hnuahe.txt
@@ -0,0 +1 @@
+Henan University of Animal Husbandry and Economy
\ No newline at end of file
diff --git a/lib/domains/cn/edu/hpu.txt b/lib/domains/cn/edu/hpu.txt
new file mode 100644
index 0000000000..77a943f604
--- /dev/null
+++ b/lib/domains/cn/edu/hpu.txt
@@ -0,0 +1 @@
+Henan Polytechnic University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/huat.txt b/lib/domains/cn/edu/huat.txt
new file mode 100644
index 0000000000..0300c2f89f
--- /dev/null
+++ b/lib/domains/cn/edu/huat.txt
@@ -0,0 +1 @@
+Hubei University of Automotive Industry
diff --git a/lib/domains/cn/edu/hunau.txt b/lib/domains/cn/edu/hunau.txt
new file mode 100644
index 0000000000..1bc593b09e
--- /dev/null
+++ b/lib/domains/cn/edu/hunau.txt
@@ -0,0 +1 @@
+Hunan Agricultural University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/hut.txt b/lib/domains/cn/edu/hut.txt
new file mode 100644
index 0000000000..4b8832fb91
--- /dev/null
+++ b/lib/domains/cn/edu/hut.txt
@@ -0,0 +1 @@
+HuNan University of Technology
diff --git a/lib/domains/cn/edu/hyit.txt b/lib/domains/cn/edu/hyit.txt
new file mode 100644
index 0000000000..5c39850da7
--- /dev/null
+++ b/lib/domains/cn/edu/hyit.txt
@@ -0,0 +1 @@
+Huaiyin Institute Of Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/hznu.txt b/lib/domains/cn/edu/hznu.txt
new file mode 100644
index 0000000000..c4656e7769
--- /dev/null
+++ b/lib/domains/cn/edu/hznu.txt
@@ -0,0 +1 @@
+Hangzhou Normal University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/jit.txt b/lib/domains/cn/edu/jit.txt
new file mode 100644
index 0000000000..75e3cb9232
--- /dev/null
+++ b/lib/domains/cn/edu/jit.txt
@@ -0,0 +1 @@
+Jinling Institute of Technology
diff --git a/lib/domains/cn/edu/jit/stu.txt b/lib/domains/cn/edu/jit/stu.txt
new file mode 100644
index 0000000000..5bbe45ea62
--- /dev/null
+++ b/lib/domains/cn/edu/jit/stu.txt
@@ -0,0 +1 @@
+Jinling Institute Of Technology (Student Used)
diff --git a/lib/domains/cn/edu/jlnu.txt b/lib/domains/cn/edu/jlnu.txt
new file mode 100644
index 0000000000..bcca854a76
--- /dev/null
+++ b/lib/domains/cn/edu/jlnu.txt
@@ -0,0 +1 @@
+Jilin Normal University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/just/stu.txt b/lib/domains/cn/edu/just/stu.txt
new file mode 100644
index 0000000000..75b86c7889
--- /dev/null
+++ b/lib/domains/cn/edu/just/stu.txt
@@ -0,0 +1 @@
+Jiangsu University of Science and Technology
diff --git a/lib/domains/cn/edu/jxust/mail.txt b/lib/domains/cn/edu/jxust/mail.txt
new file mode 100644
index 0000000000..0b39f1c45f
--- /dev/null
+++ b/lib/domains/cn/edu/jxust/mail.txt
@@ -0,0 +1 @@
+JiangXi University of Science and Technology
diff --git a/lib/domains/cn/edu/kfu.txt b/lib/domains/cn/edu/kfu.txt
new file mode 100644
index 0000000000..b5d9e3ebf9
--- /dev/null
+++ b/lib/domains/cn/edu/kfu.txt
@@ -0,0 +1 @@
+Kaifeng University
diff --git a/lib/domains/cn/edu/lcu.txt b/lib/domains/cn/edu/lcu.txt
new file mode 100644
index 0000000000..9ef4024c51
--- /dev/null
+++ b/lib/domains/cn/edu/lcu.txt
@@ -0,0 +1,2 @@
+Liaocheng University
+聊城大学
diff --git a/lib/domains/cn/edu/nau.txt b/lib/domains/cn/edu/nau.txt
new file mode 100644
index 0000000000..c8988aa7d5
--- /dev/null
+++ b/lib/domains/cn/edu/nau.txt
@@ -0,0 +1 @@
+Nanjing Audit University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/nchu.txt b/lib/domains/cn/edu/nchu.txt
new file mode 100644
index 0000000000..0ba98670fe
--- /dev/null
+++ b/lib/domains/cn/edu/nchu.txt
@@ -0,0 +1 @@
+Nanchang Hangkong University
diff --git a/lib/domains/cn/edu/ncist.txt b/lib/domains/cn/edu/ncist.txt
new file mode 100644
index 0000000000..3dfcccc2db
--- /dev/null
+++ b/lib/domains/cn/edu/ncist.txt
@@ -0,0 +1 @@
+North China Institute of Science and Technology
diff --git a/lib/domains/cn/edu/ncst.txt b/lib/domains/cn/edu/ncst.txt
new file mode 100644
index 0000000000..d664f2322e
--- /dev/null
+++ b/lib/domains/cn/edu/ncst.txt
@@ -0,0 +1,2 @@
+North China University of Science and Technology
+华北理工大学
diff --git a/lib/domains/cn/edu/nit.txt b/lib/domains/cn/edu/nit.txt
new file mode 100644
index 0000000000..042d587f62
--- /dev/null
+++ b/lib/domains/cn/edu/nit.txt
@@ -0,0 +1 @@
+Nanchang Institute Of Technology
diff --git a/lib/domains/cn/edu/njit.txt b/lib/domains/cn/edu/njit.txt
new file mode 100644
index 0000000000..9ea665e9cb
--- /dev/null
+++ b/lib/domains/cn/edu/njit.txt
@@ -0,0 +1 @@
+Nanjing Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/njtech.txt b/lib/domains/cn/edu/njtech.txt
new file mode 100644
index 0000000000..0a1b9a989b
--- /dev/null
+++ b/lib/domains/cn/edu/njtech.txt
@@ -0,0 +1 @@
+Nanjing Tech University
diff --git a/lib/domains/cn/edu/njxzc.txt b/lib/domains/cn/edu/njxzc.txt
new file mode 100644
index 0000000000..c31fac70e6
--- /dev/null
+++ b/lib/domains/cn/edu/njxzc.txt
@@ -0,0 +1 @@
+Nanjing Xiaozhuang University
diff --git a/lib/domains/cn/edu/njxzc/st.txt b/lib/domains/cn/edu/njxzc/st.txt
new file mode 100644
index 0000000000..c31fac70e6
--- /dev/null
+++ b/lib/domains/cn/edu/njxzc/st.txt
@@ -0,0 +1 @@
+Nanjing Xiaozhuang University
diff --git a/lib/domains/cn/edu/nottingham.txt b/lib/domains/cn/edu/nottingham.txt
new file mode 100644
index 0000000000..e272b3f425
--- /dev/null
+++ b/lib/domains/cn/edu/nottingham.txt
@@ -0,0 +1 @@
+University of Nottingham Ningbo China
\ No newline at end of file
diff --git a/lib/domains/cn/edu/ntu.txt b/lib/domains/cn/edu/ntu.txt
new file mode 100644
index 0000000000..7ab4bb0ce8
--- /dev/null
+++ b/lib/domains/cn/edu/ntu.txt
@@ -0,0 +1 @@
+nantong university
\ No newline at end of file
diff --git a/lib/domains/cn/edu/ntu/stu.txt b/lib/domains/cn/edu/ntu/stu.txt
new file mode 100644
index 0000000000..7ab4bb0ce8
--- /dev/null
+++ b/lib/domains/cn/edu/ntu/stu.txt
@@ -0,0 +1 @@
+nantong university
\ No newline at end of file
diff --git a/lib/domains/cn/edu/nuc.txt b/lib/domains/cn/edu/nuc.txt
new file mode 100644
index 0000000000..4df2b71012
--- /dev/null
+++ b/lib/domains/cn/edu/nuc.txt
@@ -0,0 +1 @@
+North University of China
diff --git a/lib/domains/cn/edu/nuist.txt b/lib/domains/cn/edu/nuist.txt
new file mode 100644
index 0000000000..2ccba24f86
--- /dev/null
+++ b/lib/domains/cn/edu/nuist.txt
@@ -0,0 +1 @@
+Nanjing University of Information Science and Technology
diff --git a/lib/domains/cn/edu/nuit.txt b/lib/domains/cn/edu/nuit.txt
new file mode 100644
index 0000000000..338071f857
--- /dev/null
+++ b/lib/domains/cn/edu/nuit.txt
@@ -0,0 +1 @@
+Neusoft Institute Guangdong
\ No newline at end of file
diff --git a/lib/domains/cn/edu/nun/stu.txt b/lib/domains/cn/edu/nun/stu.txt
new file mode 100644
index 0000000000..5d29b6adfa
--- /dev/null
+++ b/lib/domains/cn/edu/nun/stu.txt
@@ -0,0 +1,2 @@
+北方民族大学
+North Minzu University
diff --git a/lib/domains/cn/edu/nwafu.txt b/lib/domains/cn/edu/nwafu.txt
new file mode 100644
index 0000000000..6b1616d73c
--- /dev/null
+++ b/lib/domains/cn/edu/nwafu.txt
@@ -0,0 +1 @@
+Northwest A&F University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/nwsuaf.txt b/lib/domains/cn/edu/nwsuaf.txt
new file mode 100644
index 0000000000..6b1616d73c
--- /dev/null
+++ b/lib/domains/cn/edu/nwsuaf.txt
@@ -0,0 +1 @@
+Northwest A&F University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/qlu.txt b/lib/domains/cn/edu/qlu.txt
new file mode 100644
index 0000000000..43472e28f7
--- /dev/null
+++ b/lib/domains/cn/edu/qlu.txt
@@ -0,0 +1 @@
+Qilu university of Technology
diff --git a/lib/domains/cn/edu/scuec.txt b/lib/domains/cn/edu/scuec.txt
new file mode 100644
index 0000000000..debc0faf75
--- /dev/null
+++ b/lib/domains/cn/edu/scuec.txt
@@ -0,0 +1 @@
+South-Central University for Nationalities
\ No newline at end of file
diff --git a/lib/domains/cn/edu/sdyu.txt b/lib/domains/cn/edu/sdyu.txt
new file mode 100644
index 0000000000..a5785509a2
--- /dev/null
+++ b/lib/domains/cn/edu/sdyu.txt
@@ -0,0 +1 @@
+SHANDONG YOUTH UNIVERITY OF POLITICAL SCIENCE
diff --git a/lib/domains/cn/edu/shanghaitech.txt b/lib/domains/cn/edu/shanghaitech.txt
new file mode 100644
index 0000000000..9789940370
--- /dev/null
+++ b/lib/domains/cn/edu/shanghaitech.txt
@@ -0,0 +1 @@
+ShanghaiTech University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/shnu/smail.txt b/lib/domains/cn/edu/shnu/smail.txt
new file mode 100644
index 0000000000..ab680b6518
--- /dev/null
+++ b/lib/domains/cn/edu/shnu/smail.txt
@@ -0,0 +1 @@
+Shanghai Normal University
diff --git a/lib/domains/cn/edu/shou/stu.txt b/lib/domains/cn/edu/shou/stu.txt
new file mode 100644
index 0000000000..01ccb9cb2f
--- /dev/null
+++ b/lib/domains/cn/edu/shou/stu.txt
@@ -0,0 +1 @@
+Shanghai Ocean University;
diff --git a/lib/domains/cn/edu/smu.txt b/lib/domains/cn/edu/smu.txt
new file mode 100644
index 0000000000..62a5ca27f0
--- /dev/null
+++ b/lib/domains/cn/edu/smu.txt
@@ -0,0 +1,2 @@
+Official website: http://www.smu.edu.cn/
+Student mailbox login page: http://mail.smu.edu.cn/
diff --git a/lib/domains/cn/edu/sspu/stu.txt b/lib/domains/cn/edu/sspu/stu.txt
new file mode 100644
index 0000000000..63884ef3de
--- /dev/null
+++ b/lib/domains/cn/edu/sspu/stu.txt
@@ -0,0 +1 @@
+Shanghai Second Polytechnic University
diff --git a/lib/domains/cn/edu/sufe/163.txt b/lib/domains/cn/edu/sufe/163.txt
new file mode 100644
index 0000000000..43dc1cd0b6
--- /dev/null
+++ b/lib/domains/cn/edu/sufe/163.txt
@@ -0,0 +1 @@
+Shanghai University of Finance and Economics
diff --git a/lib/domains/cn/edu/sufe/live.txt b/lib/domains/cn/edu/sufe/live.txt
new file mode 100644
index 0000000000..43dc1cd0b6
--- /dev/null
+++ b/lib/domains/cn/edu/sufe/live.txt
@@ -0,0 +1 @@
+Shanghai University of Finance and Economics
diff --git a/lib/domains/cn/edu/sustc.txt b/lib/domains/cn/edu/sustc.txt
new file mode 100644
index 0000000000..a48f492429
--- /dev/null
+++ b/lib/domains/cn/edu/sustc.txt
@@ -0,0 +1,2 @@
+南方科技大学
+Southern University of Science and Technology
diff --git a/lib/domains/cn/edu/swpu.txt b/lib/domains/cn/edu/swpu.txt
new file mode 100644
index 0000000000..b8042cc6bc
--- /dev/null
+++ b/lib/domains/cn/edu/swpu.txt
@@ -0,0 +1 @@
+Southwest Petroleum University
diff --git a/lib/domains/cn/edu/swust.txt b/lib/domains/cn/edu/swust.txt
new file mode 100644
index 0000000000..a706670de7
--- /dev/null
+++ b/lib/domains/cn/edu/swust.txt
@@ -0,0 +1 @@
+Southwest University of Science and Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/sysu.txt b/lib/domains/cn/edu/sysu.txt
new file mode 100644
index 0000000000..92724841e4
--- /dev/null
+++ b/lib/domains/cn/edu/sysu.txt
@@ -0,0 +1 @@
+Sun Yat-Sen University
diff --git a/lib/domains/cn/edu/sysu/mail2.txt b/lib/domains/cn/edu/sysu/mail2.txt
new file mode 100644
index 0000000000..417008906d
--- /dev/null
+++ b/lib/domains/cn/edu/sysu/mail2.txt
@@ -0,0 +1 @@
+Sun Yat-sen University
diff --git a/lib/domains/cn/edu/sysu/mail3.txt b/lib/domains/cn/edu/sysu/mail3.txt
new file mode 100644
index 0000000000..92724841e4
--- /dev/null
+++ b/lib/domains/cn/edu/sysu/mail3.txt
@@ -0,0 +1 @@
+Sun Yat-Sen University
diff --git a/lib/domains/cn/edu/szpt/mail.txt b/lib/domains/cn/edu/szpt/mail.txt
new file mode 100644
index 0000000000..56b1f073bf
--- /dev/null
+++ b/lib/domains/cn/edu/szpt/mail.txt
@@ -0,0 +1 @@
+Shenzhen Polytechnic
\ No newline at end of file
diff --git a/lib/domains/cn/edu/tmu.txt b/lib/domains/cn/edu/tmu.txt
new file mode 100644
index 0000000000..812f9dbec8
--- /dev/null
+++ b/lib/domains/cn/edu/tmu.txt
@@ -0,0 +1 @@
+Tianjin Medical University
diff --git a/lib/domains/cn/edu/tust/mail.txt b/lib/domains/cn/edu/tust/mail.txt
new file mode 100644
index 0000000000..1d1ec644a1
--- /dev/null
+++ b/lib/domains/cn/edu/tust/mail.txt
@@ -0,0 +1 @@
+Tianjin University of Science&Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/tynu.txt b/lib/domains/cn/edu/tynu.txt
new file mode 100644
index 0000000000..a0b016d2cc
--- /dev/null
+++ b/lib/domains/cn/edu/tynu.txt
@@ -0,0 +1 @@
+Taiyuan Normal University.
diff --git a/lib/domains/cn/edu/tyust/stu.txt b/lib/domains/cn/edu/tyust/stu.txt
new file mode 100644
index 0000000000..c6ebad412f
--- /dev/null
+++ b/lib/domains/cn/edu/tyust/stu.txt
@@ -0,0 +1 @@
+Taiyuan University of Science and Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/ucas.txt b/lib/domains/cn/edu/ucas.txt
new file mode 100644
index 0000000000..67617053df
--- /dev/null
+++ b/lib/domains/cn/edu/ucas.txt
@@ -0,0 +1 @@
+University of Chinese Academy of Sciences
diff --git a/lib/domains/cn/edu/ujs.txt b/lib/domains/cn/edu/ujs.txt
new file mode 100644
index 0000000000..b29f52f83d
--- /dev/null
+++ b/lib/domains/cn/edu/ujs.txt
@@ -0,0 +1 @@
+Jiangsu University
diff --git a/lib/domains/cn/edu/ujs/stmail.txt b/lib/domains/cn/edu/ujs/stmail.txt
new file mode 100644
index 0000000000..b29f52f83d
--- /dev/null
+++ b/lib/domains/cn/edu/ujs/stmail.txt
@@ -0,0 +1 @@
+Jiangsu University
diff --git a/lib/domains/cn/edu/upc.txt b/lib/domains/cn/edu/upc.txt
new file mode 100644
index 0000000000..cfa9099a5e
--- /dev/null
+++ b/lib/domains/cn/edu/upc.txt
@@ -0,0 +1 @@
+China University of Petroleum-Huadong
diff --git a/lib/domains/cn/edu/upc/s.txt b/lib/domains/cn/edu/upc/s.txt
new file mode 100644
index 0000000000..cfa9099a5e
--- /dev/null
+++ b/lib/domains/cn/edu/upc/s.txt
@@ -0,0 +1 @@
+China University of Petroleum-Huadong
diff --git a/lib/domains/cn/edu/usth.txt b/lib/domains/cn/edu/usth.txt
new file mode 100644
index 0000000000..c396334e9d
--- /dev/null
+++ b/lib/domains/cn/edu/usth.txt
@@ -0,0 +1 @@
+Heilongjiang University of science and technology
diff --git a/lib/domains/cn/edu/usts.txt b/lib/domains/cn/edu/usts.txt
new file mode 100644
index 0000000000..299534e3a4
--- /dev/null
+++ b/lib/domains/cn/edu/usts.txt
@@ -0,0 +1 @@
+Suzhou University of Science and Technology
diff --git a/lib/domains/cn/edu/wmu.txt b/lib/domains/cn/edu/wmu.txt
new file mode 100644
index 0000000000..1f4589e014
--- /dev/null
+++ b/lib/domains/cn/edu/wmu.txt
@@ -0,0 +1 @@
+Wenzhou Medical University
diff --git a/lib/domains/cn/edu/wtu.txt b/lib/domains/cn/edu/wtu.txt
new file mode 100644
index 0000000000..c133c1e427
--- /dev/null
+++ b/lib/domains/cn/edu/wtu.txt
@@ -0,0 +1 @@
+Wuhan Textile University
diff --git a/lib/domains/cn/edu/xjtlu/student.txt b/lib/domains/cn/edu/xjtlu/student.txt
new file mode 100644
index 0000000000..322e40f80f
--- /dev/null
+++ b/lib/domains/cn/edu/xjtlu/student.txt
@@ -0,0 +1 @@
+Xi'an Jiaotong Liverpool University
diff --git a/lib/domains/cn/edu/xmut/stu.txt b/lib/domains/cn/edu/xmut/stu.txt
new file mode 100644
index 0000000000..29cde01dd4
--- /dev/null
+++ b/lib/domains/cn/edu/xmut/stu.txt
@@ -0,0 +1 @@
+Xiamen University Of Technology
diff --git a/lib/domains/cn/edu/xsyu.txt b/lib/domains/cn/edu/xsyu.txt
new file mode 100644
index 0000000000..9a1b141ee1
--- /dev/null
+++ b/lib/domains/cn/edu/xsyu.txt
@@ -0,0 +1,2 @@
+西安石油大学
+Xi’an Shiyou University 
diff --git a/lib/domains/cn/edu/xupt/stu.txt b/lib/domains/cn/edu/xupt/stu.txt
new file mode 100644
index 0000000000..bb5c144c17
--- /dev/null
+++ b/lib/domains/cn/edu/xupt/stu.txt
@@ -0,0 +1 @@
+Xi�an University of Posts and Telecommunications
\ No newline at end of file
diff --git a/lib/domains/cn/edu/xust.txt b/lib/domains/cn/edu/xust.txt
new file mode 100644
index 0000000000..962dce9a24
--- /dev/null
+++ b/lib/domains/cn/edu/xust.txt
@@ -0,0 +1 @@
+Xi'an University of Science and Technology
\ No newline at end of file
diff --git a/lib/domains/cn/edu/ynu.txt b/lib/domains/cn/edu/ynu.txt
new file mode 100644
index 0000000000..d99ea73d7c
--- /dev/null
+++ b/lib/domains/cn/edu/ynu.txt
@@ -0,0 +1 @@
+Yunnan University
\ No newline at end of file
diff --git a/lib/domains/cn/edu/yzu.txt b/lib/domains/cn/edu/yzu.txt
new file mode 100644
index 0000000000..0cba041287
--- /dev/null
+++ b/lib/domains/cn/edu/yzu.txt
@@ -0,0 +1 @@
+Yangzhou University
diff --git a/lib/domains/cn/edu/zjgsu.txt b/lib/domains/cn/edu/zjgsu.txt
new file mode 100644
index 0000000000..578df1afb8
--- /dev/null
+++ b/lib/domains/cn/edu/zjgsu.txt
@@ -0,0 +1 @@
+Zhejiang Gongshang University
diff --git a/lib/domains/cn/edu/zjnu.txt b/lib/domains/cn/edu/zjnu.txt
new file mode 100644
index 0000000000..30aa5a0915
--- /dev/null
+++ b/lib/domains/cn/edu/zjnu.txt
@@ -0,0 +1 @@
+Zhejiang Normal University
diff --git a/lib/domains/cn/edu/zknu.txt b/lib/domains/cn/edu/zknu.txt
new file mode 100644
index 0000000000..9de6ff9016
--- /dev/null
+++ b/lib/domains/cn/edu/zknu.txt
@@ -0,0 +1 @@
+ADD Zhoukou Normal University
diff --git a/lib/domains/cn/edu/zqu.txt b/lib/domains/cn/edu/zqu.txt
new file mode 100644
index 0000000000..6d17813924
--- /dev/null
+++ b/lib/domains/cn/edu/zqu.txt
@@ -0,0 +1,2 @@
+ZHAOQING UNIVERSITY
+肇庆学院
diff --git a/lib/domains/cn/edu/zsc.txt b/lib/domains/cn/edu/zsc.txt
new file mode 100644
index 0000000000..dc74ff167e
--- /dev/null
+++ b/lib/domains/cn/edu/zsc.txt
@@ -0,0 +1 @@
+University of Electronic Science and Technology of China，Zhongshan Institute
diff --git a/lib/domains/cn/edu/zucc.txt b/lib/domains/cn/edu/zucc.txt
new file mode 100644
index 0000000000..a067c01206
--- /dev/null
+++ b/lib/domains/cn/edu/zucc.txt
@@ -0,0 +1,2 @@
+Zhejiang University City College
+浙江大学城市学院
diff --git a/lib/domains/cn/edu/zucc/stu.txt b/lib/domains/cn/edu/zucc/stu.txt
new file mode 100644
index 0000000000..a067c01206
--- /dev/null
+++ b/lib/domains/cn/edu/zucc/stu.txt
@@ -0,0 +1,2 @@
+Zhejiang University City College
+浙江大学城市学院
diff --git a/lib/domains/cn/edu/zuel.txt b/lib/domains/cn/edu/zuel.txt
new file mode 100644
index 0000000000..0b53881dda
--- /dev/null
+++ b/lib/domains/cn/edu/zuel.txt
@@ -0,0 +1 @@
+Zhongnan University of Economics and Law
diff --git a/lib/domains/cn/edu/zufe.txt b/lib/domains/cn/edu/zufe.txt
new file mode 100644
index 0000000000..22132dce2d
--- /dev/null
+++ b/lib/domains/cn/edu/zufe.txt
@@ -0,0 +1 @@
+Zhejiang University of Finance & Economic, Hangzhou, China
diff --git a/lib/domains/cn/edu/zust.txt b/lib/domains/cn/edu/zust.txt
new file mode 100644
index 0000000000..6dfdfe9c45
--- /dev/null
+++ b/lib/domains/cn/edu/zust.txt
@@ -0,0 +1,2 @@
+Zhejiang University of Science & Technology
+浙江科技学院(浙江科技大学)
\ No newline at end of file
diff --git a/lib/domains/cn/edu/zut.txt b/lib/domains/cn/edu/zut.txt
new file mode 100644
index 0000000000..e93cbb1a33
--- /dev/null
+++ b/lib/domains/cn/edu/zut.txt
@@ -0,0 +1 @@
+  Zhongyuan University of Technology (ZUT)
diff --git a/lib/domains/cn/edu/zzu.txt b/lib/domains/cn/edu/zzu.txt
new file mode 100644
index 0000000000..27ff694a3a
--- /dev/null
+++ b/lib/domains/cn/edu/zzu.txt
@@ -0,0 +1 @@
+Zhengzhou University
diff --git a/lib/domains/cn/gdcp.txt b/lib/domains/cn/gdcp.txt
new file mode 100644
index 0000000000..623116fc30
--- /dev/null
+++ b/lib/domains/cn/gdcp.txt
@@ -0,0 +1 @@
+Guangdong Communication Polytechnic
diff --git a/lib/domains/cn/gyu.txt b/lib/domains/cn/gyu.txt
new file mode 100644
index 0000000000..3f97c63141
--- /dev/null
+++ b/lib/domains/cn/gyu.txt
@@ -0,0 +1 @@
+Guiyang University
\ No newline at end of file
diff --git a/lib/domains/cn/hsefz.txt b/lib/domains/cn/hsefz.txt
new file mode 100644
index 0000000000..4a0a113f6f
--- /dev/null
+++ b/lib/domains/cn/hsefz.txt
@@ -0,0 +1,2 @@
+华东师范大学第二附属中学
+No.2 High School of East China Normal University
diff --git a/lib/domains/cn/nbcc.txt b/lib/domains/cn/nbcc.txt
new file mode 100644
index 0000000000..b9454c9a57
--- /dev/null
+++ b/lib/domains/cn/nbcc.txt
@@ -0,0 +1 @@
+NingBo City College Of Vacational Technology
diff --git a/lib/domains/cn/net/nit.txt b/lib/domains/cn/net/nit.txt
new file mode 100644
index 0000000000..385346552e
--- /dev/null
+++ b/lib/domains/cn/net/nit.txt
@@ -0,0 +1 @@
+Ningbo Institute of Technology. Zhejiang University
diff --git a/lib/domains/cn/net/tjbhzy.txt b/lib/domains/cn/net/tjbhzy.txt
new file mode 100644
index 0000000000..8adc7b7e80
--- /dev/null
+++ b/lib/domains/cn/net/tjbhzy.txt
@@ -0,0 +1 @@
+TIANJIN BOHAI VOCATIONAL TECHNOLOGY COLLEGE
diff --git a/lib/domains/cn/ybzy.txt b/lib/domains/cn/ybzy.txt
new file mode 100644
index 0000000000..8796f8c45c
--- /dev/null
+++ b/lib/domains/cn/ybzy.txt
@@ -0,0 +1 @@
+YiBin Vocational And Technical College
\ No newline at end of file
diff --git a/lib/domains/cn/yznu.txt b/lib/domains/cn/yznu.txt
new file mode 100644
index 0000000000..fc500a63e8
--- /dev/null
+++ b/lib/domains/cn/yznu.txt
@@ -0,0 +1 @@
+Yangtze Normal University
diff --git a/lib/domains/cn/zimc.txt b/lib/domains/cn/zimc.txt
new file mode 100644
index 0000000000..77f146d4be
--- /dev/null
+++ b/lib/domains/cn/zimc.txt
@@ -0,0 +1 @@
+Zhejiang International Maritime College
\ No newline at end of file
diff --git a/lib/domains/co/edu/cuao.txt b/lib/domains/co/edu/cuao.txt
deleted file mode 100644
index 7c4e7dc37f..0000000000
--- a/lib/domains/co/edu/cuao.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Autónoma de Occidente
diff --git a/lib/domains/co/edu/cui.txt b/lib/domains/co/edu/cui.txt
deleted file mode 100644
index 3b8dc6184d..0000000000
--- a/lib/domains/co/edu/cui.txt
+++ /dev/null
@@ -1 +0,0 @@
-Corporación Universitaria de Ibagué (CORUNIVERSITARIA)
diff --git a/lib/domains/co/edu/cutb.txt b/lib/domains/co/edu/cutb.txt
deleted file mode 100644
index de594cb5e6..0000000000
--- a/lib/domains/co/edu/cutb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Corporación Universitaria Tecnológica de Bolivar
diff --git a/lib/domains/co/edu/escueladepolicia.txt b/lib/domains/co/edu/escueladepolicia.txt
deleted file mode 100644
index 70d51eab3a..0000000000
--- a/lib/domains/co/edu/escueladepolicia.txt
+++ /dev/null
@@ -1 +0,0 @@
-Escuela de Policia General Santander
diff --git a/lib/domains/co/edu/politecjic.txt b/lib/domains/co/edu/politecjic.txt
deleted file mode 100644
index 50856ebe70..0000000000
--- a/lib/domains/co/edu/politecjic.txt
+++ /dev/null
@@ -1 +0,0 @@
-Politécnico Columbiano Jaime Isaza Cadavid
diff --git a/lib/domains/co/edu/uan.txt b/lib/domains/co/edu/uan.txt
new file mode 100644
index 0000000000..f6fdf885db
--- /dev/null
+++ b/lib/domains/co/edu/uan.txt
@@ -0,0 +1 @@
+Universidad Antonio Narino
\ No newline at end of file
diff --git a/lib/domains/co/edu/uanarino.txt b/lib/domains/co/edu/uanarino.txt
deleted file mode 100644
index 8e14584e16..0000000000
--- a/lib/domains/co/edu/uanarino.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Antonio Nariño
diff --git a/lib/domains/co/edu/ucatolicamz.txt b/lib/domains/co/edu/ucatolicamz.txt
deleted file mode 100644
index 994aa62bd4..0000000000
--- a/lib/domains/co/edu/ucatolicamz.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Católica de Manizales
diff --git a/lib/domains/co/edu/ucpr.txt b/lib/domains/co/edu/ucpr.txt
deleted file mode 100644
index e8b54aa657..0000000000
--- a/lib/domains/co/edu/ucpr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Católica Popular del Risaralda
diff --git a/lib/domains/co/edu/usaca.txt b/lib/domains/co/edu/usaca.txt
deleted file mode 100644
index a25adfdb14..0000000000
--- a/lib/domains/co/edu/usaca.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Santiago de Cali
diff --git a/lib/domains/co/za/studentgroup.txt b/lib/domains/co/za/studentgroup.txt
deleted file mode 100644
index 4db37877ca..0000000000
--- a/lib/domains/co/za/studentgroup.txt
+++ /dev/null
@@ -1 +0,0 @@
-Email Domain for students at cti.ac.za
diff --git a/lib/domains/co/za/studentgroup.txt~ b/lib/domains/co/za/studentgroup.txt~
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lib/domains/com/algonquincollege..txt b/lib/domains/com/algonquincollege..txt
deleted file mode 100644
index 0b16ce86b9..0000000000
--- a/lib/domains/com/algonquincollege..txt
+++ /dev/null
@@ -1 +0,0 @@
-Algonquin College of Applied Arts and Technology
diff --git a/lib/domains/com/amityonline.txt b/lib/domains/com/amityonline.txt
new file mode 100644
index 0000000000..ceb84e005b
--- /dev/null
+++ b/lib/domains/com/amityonline.txt
@@ -0,0 +1 @@
+Amity University
\ No newline at end of file
diff --git a/lib/domains/com/bj35.txt b/lib/domains/com/bj35.txt
new file mode 100644
index 0000000000..6b475e2568
--- /dev/null
+++ b/lib/domains/com/bj35.txt
@@ -0,0 +1 @@
+No.35 high school of Beijing
diff --git a/lib/domains/com/buchananschools.txt b/lib/domains/com/buchananschools.txt
new file mode 100644
index 0000000000..7ed8419d59
--- /dev/null
+++ b/lib/domains/com/buchananschools.txt
@@ -0,0 +1 @@
+Buchanan Community Schools
diff --git a/lib/domains/com/c-isd.txt b/lib/domains/com/c-isd.txt
new file mode 100644
index 0000000000..9616205753
--- /dev/null
+++ b/lib/domains/com/c-isd.txt
@@ -0,0 +1 @@
+Cleburne Independent School District
diff --git a/lib/domains/com/centralcatholichs.txt b/lib/domains/com/centralcatholichs.txt
new file mode 100644
index 0000000000..7dfa714a0c
--- /dev/null
+++ b/lib/domains/com/centralcatholichs.txt
@@ -0,0 +1 @@
+Central Catholic High School, Pittsburgh Pennsylvania
diff --git a/lib/domains/com/churcherscollege.txt b/lib/domains/com/churcherscollege.txt
new file mode 100644
index 0000000000..f135b8b066
--- /dev/null
+++ b/lib/domains/com/churcherscollege.txt
@@ -0,0 +1 @@
+  Churcher's College
diff --git a/lib/domains/com/clarendonacademy.txt b/lib/domains/com/clarendonacademy.txt
new file mode 100644
index 0000000000..90944c7d6f
--- /dev/null
+++ b/lib/domains/com/clarendonacademy.txt
@@ -0,0 +1 @@
+Clarendon Academy
\ No newline at end of file
diff --git a/lib/domains/com/davjalandhar.txt b/lib/domains/com/davjalandhar.txt
new file mode 100644
index 0000000000..be5eda9140
--- /dev/null
+++ b/lib/domains/com/davjalandhar.txt
@@ -0,0 +1 @@
+DAV College Jalandhar
diff --git a/lib/domains/com/doverbroecks.txt b/lib/domains/com/doverbroecks.txt
new file mode 100644
index 0000000000..56343590d3
--- /dev/null
+++ b/lib/domains/com/doverbroecks.txt
@@ -0,0 +1 @@
+D'Overbroecks School 
diff --git a/lib/domains/com/ecole-ipssi.txt b/lib/domains/com/ecole-ipssi.txt
new file mode 100644
index 0000000000..c78f490b46
--- /dev/null
+++ b/lib/domains/com/ecole-ipssi.txt
@@ -0,0 +1 @@
+IPSSI - École d’Informatique, Web et Design Graphique
diff --git a/lib/domains/com/eitiedu.txt b/lib/domains/com/eitiedu.txt
new file mode 100644
index 0000000000..04eca5bb9f
--- /dev/null
+++ b/lib/domains/com/eitiedu.txt
@@ -0,0 +1 @@
+Ekibastuz technical and engineering institute (Kazakshstan, Pavlodar Province, Ekibastuz)
diff --git a/lib/domains/com/furzeplatt.txt b/lib/domains/com/furzeplatt.txt
new file mode 100644
index 0000000000..2f7d9ab3da
--- /dev/null
+++ b/lib/domains/com/furzeplatt.txt
@@ -0,0 +1 @@
+Furze Platt Senior School
\ No newline at end of file
diff --git a/lib/domains/com/gdgoenkasurat.txt b/lib/domains/com/gdgoenkasurat.txt
new file mode 100644
index 0000000000..d9ce4547da
--- /dev/null
+++ b/lib/domains/com/gdgoenkasurat.txt
@@ -0,0 +1,2 @@
+G D Goenka International School 
+http://www.gdgoenkasurat.com/
diff --git a/lib/domains/com/gtu-info.txt b/lib/domains/com/gtu-info.txt
new file mode 100644
index 0000000000..50c8086470
--- /dev/null
+++ b/lib/domains/com/gtu-info.txt
@@ -0,0 +1 @@
+Gujarat technology University
diff --git a/lib/domains/com/iesdoctorbalmis.txt b/lib/domains/com/iesdoctorbalmis.txt
new file mode 100644
index 0000000000..a71812e065
--- /dev/null
+++ b/lib/domains/com/iesdoctorbalmis.txt
@@ -0,0 +1 @@
+Instituto de Educación Secundaria "Doctor Balmis"
diff --git a/lib/domains/com/iesmarenostrum.txt b/lib/domains/com/iesmarenostrum.txt
new file mode 100644
index 0000000000..d9adfd5457
--- /dev/null
+++ b/lib/domains/com/iesmarenostrum.txt
@@ -0,0 +1 @@
+IES Mare Nostrum (Alicante)
diff --git a/lib/domains/com/iihtsrt.txt b/lib/domains/com/iihtsrt.txt
new file mode 100644
index 0000000000..87e181134a
--- /dev/null
+++ b/lib/domains/com/iihtsrt.txt
@@ -0,0 +1 @@
+Indian Institute of Hardware Technology,Surat,Gujarat,India
diff --git a/lib/domains/com/it-akademija.txt b/lib/domains/com/it-akademija.txt
new file mode 100644
index 0000000000..f92dd0cf10
--- /dev/null
+++ b/lib/domains/com/it-akademija.txt
@@ -0,0 +1 @@
+It Akademija
diff --git a/lib/domains/com/lasallecollegevancouver.txt b/lib/domains/com/lasallecollegevancouver.txt
new file mode 100644
index 0000000000..2b804881ca
--- /dev/null
+++ b/lib/domains/com/lasallecollegevancouver.txt
@@ -0,0 +1 @@
+LaSalle College Vancouver
diff --git a/lib/domains/com/lycee-langevin-wallon.txt b/lib/domains/com/lycee-langevin-wallon.txt
new file mode 100644
index 0000000000..07acaf0bbf
--- /dev/null
+++ b/lib/domains/com/lycee-langevin-wallon.txt
@@ -0,0 +1 @@
+Lycée Langevin-Wallon
diff --git a/lib/domains/com/marxadella.txt b/lib/domains/com/marxadella.txt
new file mode 100644
index 0000000000..536b67910e
--- /dev/null
+++ b/lib/domains/com/marxadella.txt
@@ -0,0 +1 @@
+IES La Marxadella
diff --git a/lib/domains/com/mitkundapura.txt b/lib/domains/com/mitkundapura.txt
new file mode 100644
index 0000000000..fd386a7a86
--- /dev/null
+++ b/lib/domains/com/mitkundapura.txt
@@ -0,0 +1 @@
+mitkundapura engineering college : mitkundapura.com
diff --git a/lib/domains/com/moniris.txt b/lib/domains/com/moniris.txt
new file mode 100644
index 0000000000..c0cfba6c3d
--- /dev/null
+++ b/lib/domains/com/moniris.txt
@@ -0,0 +1 @@
+Ecole IRIS
diff --git a/lib/domains/com/mspvl.txt b/lib/domains/com/mspvl.txt
new file mode 100644
index 0000000000..db57bd9439
--- /dev/null
+++ b/lib/domains/com/mspvl.txt
@@ -0,0 +1 @@
+MSP Velayutha Nadar Lakshmithaiammal Polytechnic College
diff --git a/lib/domains/com/nhlstenden.txt b/lib/domains/com/nhlstenden.txt
new file mode 100644
index 0000000000..483a50bf6f
--- /dev/null
+++ b/lib/domains/com/nhlstenden.txt
@@ -0,0 +1 @@
+NHL Stenden University
diff --git a/lib/domains/com/onmicrosoft/chippewavalley.txt b/lib/domains/com/onmicrosoft/chippewavalley.txt
new file mode 100644
index 0000000000..e1408025b6
--- /dev/null
+++ b/lib/domains/com/onmicrosoft/chippewavalley.txt
@@ -0,0 +1 @@
+Chippewa Valley Schools
diff --git a/lib/domains/com/pccsk12.txt b/lib/domains/com/pccsk12.txt
new file mode 100644
index 0000000000..0138e26c88
--- /dev/null
+++ b/lib/domains/com/pccsk12.txt
@@ -0,0 +1 @@
+Plymouth-Canton Community Schools
diff --git a/lib/domains/com/pearlacademy/stu.txt b/lib/domains/com/pearlacademy/stu.txt
new file mode 100644
index 0000000000..a3ba7a202b
--- /dev/null
+++ b/lib/domains/com/pearlacademy/stu.txt
@@ -0,0 +1 @@
+Pearl Academy, India
diff --git a/lib/domains/com/powayusd.txt b/lib/domains/com/powayusd.txt
new file mode 100644
index 0000000000..ea9b3391a1
--- /dev/null
+++ b/lib/domains/com/powayusd.txt
@@ -0,0 +1 @@
+Poway Unified School District
diff --git a/lib/domains/com/rennes-sb.txt b/lib/domains/com/rennes-sb.txt
new file mode 100644
index 0000000000..02bff37dbc
--- /dev/null
+++ b/lib/domains/com/rennes-sb.txt
@@ -0,0 +1 @@
+Renne School of Business
diff --git a/lib/domains/com/rgshw.txt b/lib/domains/com/rgshw.txt
new file mode 100644
index 0000000000..8080fb58db
--- /dev/null
+++ b/lib/domains/com/rgshw.txt
@@ -0,0 +1 @@
+Royal Grammar School, High Wycombe
diff --git a/lib/domains/com/rubika-edu.txt b/lib/domains/com/rubika-edu.txt
new file mode 100644
index 0000000000..bbbf897f37
--- /dev/null
+++ b/lib/domains/com/rubika-edu.txt
@@ -0,0 +1 @@
+Rubika
diff --git a/lib/domains/com/sanataneducation.txt b/lib/domains/com/sanataneducation.txt
new file mode 100644
index 0000000000..e9f03f9b64
--- /dev/null
+++ b/lib/domains/com/sanataneducation.txt
@@ -0,0 +1 @@
+SANATAN PUBLIC SCHOOL, TOHANA, INDIA
diff --git a/lib/domains/com/springbranchisd.txt b/lib/domains/com/springbranchisd.txt
new file mode 100644
index 0000000000..2089c1df09
--- /dev/null
+++ b/lib/domains/com/springbranchisd.txt
@@ -0,0 +1,2 @@
+Spring Branch ISD
+.group
diff --git a/lib/domains/com/srhstheschool.txt b/lib/domains/com/srhstheschool.txt
new file mode 100644
index 0000000000..7cdd8988cb
--- /dev/null
+++ b/lib/domains/com/srhstheschool.txt
@@ -0,0 +1 @@
+Sree Raghavendra High School
diff --git a/lib/domains/com/stucom.txt b/lib/domains/com/stucom.txt
new file mode 100644
index 0000000000..876044ecce
--- /dev/null
+++ b/lib/domains/com/stucom.txt
@@ -0,0 +1 @@
+El Centre d’Estudis Stucom
diff --git a/lib/domains/com/stwillibrord.txt b/lib/domains/com/stwillibrord.txt
new file mode 100644
index 0000000000..026736f561
--- /dev/null
+++ b/lib/domains/com/stwillibrord.txt
@@ -0,0 +1,2 @@
+St. Willibrord High School and Juinor College of Science and Commerce
+Mumbai, Maharashtra, India.
diff --git a/lib/domains/com/stxtigers.txt b/lib/domains/com/stxtigers.txt
new file mode 100644
index 0000000000..b196229228
--- /dev/null
+++ b/lib/domains/com/stxtigers.txt
@@ -0,0 +1 @@
+St. Xavier High School 
\ No newline at end of file
diff --git a/lib/domains/com/taawish.txt b/lib/domains/com/taawish.txt
new file mode 100644
index 0000000000..7748258fe6
--- /dev/null
+++ b/lib/domains/com/taawish.txt
@@ -0,0 +1 @@
+Taawish College of Education
diff --git a/lib/domains/com/univ-barackobama.txt b/lib/domains/com/univ-barackobama.txt
new file mode 100644
index 0000000000..0c1c8642d8
--- /dev/null
+++ b/lib/domains/com/univ-barackobama.txt
@@ -0,0 +1 @@
+University of Barack Obama
\ No newline at end of file
diff --git a/lib/domains/com/univ-catho-sjd.txt b/lib/domains/com/univ-catho-sjd.txt
new file mode 100644
index 0000000000..4ca8b55d4c
--- /dev/null
+++ b/lib/domains/com/univ-catho-sjd.txt
@@ -0,0 +1 @@
+Institut universitaire Saint Jerome de Douala
diff --git a/lib/domains/com/up-esi.txt b/lib/domains/com/up-esi.txt
new file mode 100644
index 0000000000..ac23a16c08
--- /dev/null
+++ b/lib/domains/com/up-esi.txt
@@ -0,0 +1 @@
+UP-ESI
diff --git a/lib/domains/com/vtsd.txt b/lib/domains/com/vtsd.txt
new file mode 100644
index 0000000000..5dc5f5b695
--- /dev/null
+++ b/lib/domains/com/vtsd.txt
@@ -0,0 +1 @@
+Vernon Township School District
diff --git a/lib/domains/us/oh/k12/wb.txt b/lib/domains/com/wbbroncos.txt
similarity index 50%
rename from lib/domains/us/oh/k12/wb.txt
rename to lib/domains/com/wbbroncos.txt
index 4bb8b3f96d..e7a4d06e63 100644
--- a/lib/domains/us/oh/k12/wb.txt
+++ b/lib/domains/com/wbbroncos.txt
@@ -1,2 +1 @@
 Western Brown High School
-Mount Orab Middle School
diff --git a/lib/domains/com/wernethschool.txt b/lib/domains/com/wernethschool.txt
new file mode 100644
index 0000000000..9ff03a8832
--- /dev/null
+++ b/lib/domains/com/wernethschool.txt
@@ -0,0 +1 @@
+Werneth High School
diff --git a/lib/domains/cr/ac/ucentral.txt b/lib/domains/cr/ac/ucentral.txt
deleted file mode 100644
index 491e3c98e3..0000000000
--- a/lib/domains/cr/ac/ucentral.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Central
diff --git a/lib/domains/cr/ac/ufederada.txt b/lib/domains/cr/ac/ufederada.txt
deleted file mode 100644
index 714d682d58..0000000000
--- a/lib/domains/cr/ac/ufederada.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Federada de Costa Rica
diff --git a/lib/domains/cr/ac/uicr.txt b/lib/domains/cr/ac/uicr.txt
deleted file mode 100644
index 56befcd370..0000000000
--- a/lib/domains/cr/ac/uicr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Interamericana de Costa Rica
diff --git a/lib/domains/cr/ac/unidis.txt b/lib/domains/cr/ac/unidis.txt
deleted file mode 100644
index cc236566f1..0000000000
--- a/lib/domains/cr/ac/unidis.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad del Diseño
diff --git a/lib/domains/cr/or/terapia.txt b/lib/domains/cr/or/terapia.txt
deleted file mode 100644
index 8eea8fdf02..0000000000
--- a/lib/domains/cr/or/terapia.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Santa Paula
diff --git a/lib/domains/cr/sjdlc.txt b/lib/domains/cr/sjdlc.txt
deleted file mode 100644
index 230b3d0547..0000000000
--- a/lib/domains/cr/sjdlc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad San Juan De La Cruz
diff --git a/lib/domains/cu/umcc.txt b/lib/domains/cu/umcc.txt
deleted file mode 100644
index 42c856eac3..0000000000
--- a/lib/domains/cu/umcc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad de Matanzas Camilo Cienfuegos
diff --git a/lib/domains/cz/cichnovabrno.txt b/lib/domains/cz/cichnovabrno.txt
new file mode 100644
index 0000000000..2dd3aa0f8a
--- /dev/null
+++ b/lib/domains/cz/cichnovabrno.txt
@@ -0,0 +1 @@
+High School of informatics, postal services and finance Brno, funded organization
diff --git a/lib/domains/cz/frengp.txt b/lib/domains/cz/frengp.txt
new file mode 100644
index 0000000000..d790a45769
--- /dev/null
+++ b/lib/domains/cz/frengp.txt
@@ -0,0 +1 @@
+Gymnázium a Střední průmyslová škola elektrotechniky a informatiky, Frenštát pod Radhoštěm, příspěvková organizace
diff --git a/lib/domains/cz/ggg.txt b/lib/domains/cz/ggg.txt
new file mode 100644
index 0000000000..05c64a676c
--- /dev/null
+++ b/lib/domains/cz/ggg.txt
@@ -0,0 +1 @@
+Gymnázium, Praha 8, Ústavní 400
diff --git a/lib/domains/cz/mpu-prague.txt b/lib/domains/cz/mpu-prague.txt
deleted file mode 100644
index 9afaffff08..0000000000
--- a/lib/domains/cz/mpu-prague.txt
+++ /dev/null
@@ -1 +0,0 @@
-Prague International University
diff --git a/lib/domains/cz/opava/mgo.txt b/lib/domains/cz/opava/mgo.txt
new file mode 100644
index 0000000000..d35ce0d096
--- /dev/null
+++ b/lib/domains/cz/opava/mgo.txt
@@ -0,0 +1 @@
+Mendelovo gymnazium Opava
diff --git a/lib/domains/cz/spselit.txt b/lib/domains/cz/spselit.txt
new file mode 100644
index 0000000000..5bc7d218c2
--- /dev/null
+++ b/lib/domains/cz/spselit.txt
@@ -0,0 +1 @@
+Střední průmyslová škola elektrotechniky a informačních technologií
diff --git a/lib/domains/cz/tiffinprague.txt b/lib/domains/cz/tiffinprague.txt
deleted file mode 100644
index 487dbc51ff..0000000000
--- a/lib/domains/cz/tiffinprague.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tiffin University Prague
diff --git a/lib/domains/cz/uzlabina.txt b/lib/domains/cz/uzlabina.txt
new file mode 100644
index 0000000000..bad037c01e
--- /dev/null
+++ b/lib/domains/cz/uzlabina.txt
@@ -0,0 +1 @@
+SPŠE v Úžlabině
diff --git a/lib/domains/cz/vspp.txt b/lib/domains/cz/vspp.txt
new file mode 100644
index 0000000000..71a8656614
--- /dev/null
+++ b/lib/domains/cz/vspp.txt
@@ -0,0 +1 @@
+University of Education business and law
diff --git a/lib/domains/de/Birklehof.txt b/lib/domains/de/Birklehof.txt
new file mode 100644
index 0000000000..0522a9f3cd
--- /dev/null
+++ b/lib/domains/de/Birklehof.txt
@@ -0,0 +1 @@
+Schule Birklehof e.V. Hinterzarten
diff --git a/lib/domains/de/asg-huerth.txt b/lib/domains/de/asg-huerth.txt
new file mode 100644
index 0000000000..79ed68fd30
--- /dev/null
+++ b/lib/domains/de/asg-huerth.txt
@@ -0,0 +1 @@
+Albert-Schweitzer-Gymnasium Hürth
diff --git a/lib/domains/de/ass-vs.txt b/lib/domains/de/ass-vs.txt
new file mode 100644
index 0000000000..80d1426387
--- /dev/null
+++ b/lib/domains/de/ass-vs.txt
@@ -0,0 +1 @@
+Albert-Schweitzer-Schule
\ No newline at end of file
diff --git a/lib/domains/de/bbs2wob.txt b/lib/domains/de/bbs2wob.txt
new file mode 100644
index 0000000000..cc3f0d31fe
--- /dev/null
+++ b/lib/domains/de/bbs2wob.txt
@@ -0,0 +1 @@
+Berufsbildende Schulen 2 Wolfsburg
diff --git a/lib/domains/de/bccn-berlin.txt b/lib/domains/de/bccn-berlin.txt
new file mode 100644
index 0000000000..48bf10ad93
--- /dev/null
+++ b/lib/domains/de/bccn-berlin.txt
@@ -0,0 +1 @@
+BERNSTEIN CENTER FOR COMPUTATIONAL NEUROSCIENCE, BERLIN
diff --git a/lib/domains/de/berufskolleg-rheine.txt b/lib/domains/de/berufskolleg-rheine.txt
new file mode 100644
index 0000000000..0631d9ad58
--- /dev/null
+++ b/lib/domains/de/berufskolleg-rheine.txt
@@ -0,0 +1 @@
+Berufskolleg Rheine des Kreises Steinfurt
diff --git a/lib/domains/de/bildung-lsa/gym-muentzer.txt b/lib/domains/de/bildung-lsa/gym-muentzer.txt
new file mode 100644
index 0000000000..63087c8ebb
--- /dev/null
+++ b/lib/domains/de/bildung-lsa/gym-muentzer.txt
@@ -0,0 +1 @@
+GIEBICHENSTEIN-GYMNASIUM "THOMAS MÜNTZER" HALLE
diff --git a/lib/domains/de/bk-opladen.txt b/lib/domains/de/bk-opladen.txt
index 055765612e..17e6c21fd5 100644
--- a/lib/domains/de/bk-opladen.txt
+++ b/lib/domains/de/bk-opladen.txt
@@ -1,9 +1 @@
-www.bk-opladen.de
-
-Berufskolleg Opladen
-
-Berufskolleg
-des Zweckverbandes der Berufsbildenden Schulen Opladen
-
-Schule der Sekundarstufe II mit Beruflichem Gymnasium
-Wirtschaftsgymnasium, Technisches Gymnasium und Berufliches Gymnasium für Gesundheit, Erziehung und Soziales
+Berufskolleg Opladen
\ No newline at end of file
diff --git a/lib/domains/de/bs-korbach.txt b/lib/domains/de/bs-korbach.txt
new file mode 100644
index 0000000000..df808c9adf
--- /dev/null
+++ b/lib/domains/de/bs-korbach.txt
@@ -0,0 +1 @@
+Berufliche Schulen des Landkreises Waldeck-Frankenberg in Korbach und Bad Arolsen AöR
diff --git a/lib/domains/de/bs1-kempten.txt b/lib/domains/de/bs1-kempten.txt
new file mode 100644
index 0000000000..e925d75f51
--- /dev/null
+++ b/lib/domains/de/bs1-kempten.txt
@@ -0,0 +1 @@
+Staatliche Berufsschule I Kempten
diff --git a/lib/domains/de/burggymnasium-altena.txt b/lib/domains/de/burggymnasium-altena.txt
new file mode 100644
index 0000000000..fe3da66a9b
--- /dev/null
+++ b/lib/domains/de/burggymnasium-altena.txt
@@ -0,0 +1 @@
+Burggymnasium Altena
diff --git a/lib/domains/de/cato-achim.txt b/lib/domains/de/cato-achim.txt
new file mode 100644
index 0000000000..7e78b2873a
--- /dev/null
+++ b/lib/domains/de/cato-achim.txt
@@ -0,0 +1 @@
+Cato Bontjes van Beek-Gymnasium
diff --git a/lib/domains/de/dbb-detmold.txt b/lib/domains/de/dbb-detmold.txt
new file mode 100644
index 0000000000..abace3b89b
--- /dev/null
+++ b/lib/domains/de/dbb-detmold.txt
@@ -0,0 +1 @@
+Dietrich-Bonhoeffer-Berufskolleg des Kreises Lippe in Detmold (dbb)
\ No newline at end of file
diff --git a/lib/domains/de/dbb-lippe.txt b/lib/domains/de/dbb-lippe.txt
new file mode 100644
index 0000000000..abace3b89b
--- /dev/null
+++ b/lib/domains/de/dbb-lippe.txt
@@ -0,0 +1 @@
+Dietrich-Bonhoeffer-Berufskolleg des Kreises Lippe in Detmold (dbb)
\ No newline at end of file
diff --git a/lib/domains/de/dhsh.txt b/lib/domains/de/dhsh.txt
new file mode 100644
index 0000000000..bd5a39506e
--- /dev/null
+++ b/lib/domains/de/dhsh.txt
@@ -0,0 +1 @@
+Berufsakademie Schleswig-Holstein
diff --git a/lib/domains/de/fham.txt b/lib/domains/de/fham.txt
new file mode 100644
index 0000000000..1b9433d680
--- /dev/null
+++ b/lib/domains/de/fham.txt
@@ -0,0 +1,2 @@
+Hochschule für angewandtes Management - Ismaning/München
+University of Applied Management - Ismaning/Munich
\ No newline at end of file
diff --git a/lib/domains/de/fham/edu.txt b/lib/domains/de/fham/edu.txt
new file mode 100644
index 0000000000..72a2e43de1
--- /dev/null
+++ b/lib/domains/de/fham/edu.txt
@@ -0,0 +1,2 @@
+Hochschule für angewandtes Management - Ismaning/München
+University of Applied Management - Ismaning/Munich
diff --git a/lib/domains/de/fmg-brk.txt b/lib/domains/de/fmg-brk.txt
new file mode 100644
index 0000000000..33874986ed
--- /dev/null
+++ b/lib/domains/de/fmg-brk.txt
@@ -0,0 +1 @@
+Franz-Miltenberger-Gymnasium
diff --git a/lib/domains/de/freie-schule-anne-sophie.txt b/lib/domains/de/freie-schule-anne-sophie.txt
new file mode 100644
index 0000000000..554391a7e5
--- /dev/null
+++ b/lib/domains/de/freie-schule-anne-sophie.txt
@@ -0,0 +1 @@
+Freie Schule Anne-Sophie
diff --git a/lib/domains/de/fs.txt b/lib/domains/de/fs.txt
new file mode 100644
index 0000000000..317b36879d
--- /dev/null
+++ b/lib/domains/de/fs.txt
@@ -0,0 +1 @@
+Frankfurt School of Finance and Management
diff --git a/lib/domains/de/adv-boeblingen.txt b/lib/domains/de/gds2.txt
similarity index 100%
rename from lib/domains/de/adv-boeblingen.txt
rename to lib/domains/de/gds2.txt
diff --git a/lib/domains/de/grimmels.txt b/lib/domains/de/grimmels.txt
new file mode 100644
index 0000000000..0cbb1e0339
--- /dev/null
+++ b/lib/domains/de/grimmels.txt
@@ -0,0 +1,5 @@
+Name: Grimmelshausen Gymnasium Gelnhausen
+Website: http://grimmels.de/wordpress/
+Computer science course: http://grimmels.de/wordpress/qualifikationsphase/ (Proof that is it offered as intensive course: On the site jump to: E > Kursangebot des GGG > Leistungsfächerangebot > 
+	Aufgabenfeld III > Informatik )
+Email proof: http://grimmels.de/wordpress/kontakte/
diff --git a/lib/domains/de/gymnasium-essen-werden.txt b/lib/domains/de/gymnasium-essen-werden.txt
new file mode 100644
index 0000000000..294cb60250
--- /dev/null
+++ b/lib/domains/de/gymnasium-essen-werden.txt
@@ -0,0 +1 @@
+Gymnasium Essen-Werden
diff --git a/lib/domains/de/gymnasium-hohenschwangau.txt b/lib/domains/de/gymnasium-hohenschwangau.txt
new file mode 100644
index 0000000000..02a84f9c2e
--- /dev/null
+++ b/lib/domains/de/gymnasium-hohenschwangau.txt
@@ -0,0 +1 @@
+Staatliches Gymnasium mit Internat Hohenschwangau
diff --git a/lib/domains/de/gymolching.txt b/lib/domains/de/gymolching.txt
new file mode 100644
index 0000000000..41697ac0bd
--- /dev/null
+++ b/lib/domains/de/gymolching.txt
@@ -0,0 +1 @@
+Gymnasium Olching
diff --git a/lib/domains/de/gywem.txt b/lib/domains/de/gywem.txt
new file mode 100644
index 0000000000..9feb90ed85
--- /dev/null
+++ b/lib/domains/de/gywem.txt
@@ -0,0 +1 @@
+Gymnasium Wesermünde
diff --git a/lib/domains/de/hamburg/bsb.txt b/lib/domains/de/hamburg/bsb.txt
new file mode 100644
index 0000000000..54d9930e9f
--- /dev/null
+++ b/lib/domains/de/hamburg/bsb.txt
@@ -0,0 +1,4 @@
+Name: Immanuel Kant Gymnasium
+Website: https://immanuel-kant-gymnasium.de
+It-Course ( On Site 13) : http://download.immanuel-kant-gymnasium.de/WPU-Brosch%C3%BCre%202015%20Jg%209.pdf
+E-Mail Proof: https://immanuel-kant-gymnasium.de/index.php/impressum-footer
diff --git a/lib/domains/de/helmholtz-gymnasium.txt b/lib/domains/de/helmholtz-gymnasium.txt
new file mode 100644
index 0000000000..bf5757ab7e
--- /dev/null
+++ b/lib/domains/de/helmholtz-gymnasium.txt
@@ -0,0 +1 @@
+Helmholtz-Gymnasium Essen
diff --git a/lib/domains/de/hfmt-koeln.txt b/lib/domains/de/hfmt-koeln.txt
new file mode 100644
index 0000000000..09cba7c127
--- /dev/null
+++ b/lib/domains/de/hfmt-koeln.txt
@@ -0,0 +1 @@
+Hochschule für Musik und Tanz Köln
diff --git a/lib/domains/de/hfpv-hessen.txt b/lib/domains/de/hfpv-hessen.txt
new file mode 100644
index 0000000000..61838fece7
--- /dev/null
+++ b/lib/domains/de/hfpv-hessen.txt
@@ -0,0 +1,2 @@
+Hessian University of Applied Sciences for Police and Public Administration
+Hessische Hochschule für Polizei und Verwaltung
diff --git a/lib/domains/de/hrsaaf.txt b/lib/domains/de/hrsaaf.txt
new file mode 100644
index 0000000000..b58bf55933
--- /dev/null
+++ b/lib/domains/de/hrsaaf.txt
@@ -0,0 +1 @@
+Schule Altes Amt Friedeburg
diff --git a/lib/domains/de/hs-aalen.txt b/lib/domains/de/hs-aalen.txt
new file mode 100644
index 0000000000..b0b2d1bd98
--- /dev/null
+++ b/lib/domains/de/hs-aalen.txt
@@ -0,0 +1 @@
+Hochschule Aalen
diff --git a/lib/domains/de/hs-kempten.txt b/lib/domains/de/hs-kempten.txt
index 5f22352b75..d626910fef 100644
--- a/lib/domains/de/hs-kempten.txt
+++ b/lib/domains/de/hs-kempten.txt
@@ -1 +1,2 @@
-Fachhochschule Kempten, Hochschule für Technik und Wirtschaft
+Hochschule für angewandte Wissenschaften Kempten
+University of Applied Sciences Kempten
diff --git a/lib/domains/de/htw-aalen.txt b/lib/domains/de/htw-aalen.txt
deleted file mode 100644
index b0b2d1bd98..0000000000
--- a/lib/domains/de/htw-aalen.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hochschule Aalen
diff --git a/lib/domains/de/htw-aalen.txt b/lib/domains/de/htw-aalen.txt
new file mode 120000
index 0000000000..82efe24a88
--- /dev/null
+++ b/lib/domains/de/htw-aalen.txt
@@ -0,0 +1 @@
+hs-aalen.txt
\ No newline at end of file
diff --git a/lib/domains/de/iserv-gis.txt b/lib/domains/de/iserv-gis.txt
new file mode 100644
index 0000000000..68add796a8
--- /dev/null
+++ b/lib/domains/de/iserv-gis.txt
@@ -0,0 +1 @@
+Gymnasium im Schloss Wolfenbüttel
diff --git a/lib/domains/de/jsg-karlstadt.txt b/lib/domains/de/jsg-karlstadt.txt
new file mode 100644
index 0000000000..c55cbf1032
--- /dev/null
+++ b/lib/domains/de/jsg-karlstadt.txt
@@ -0,0 +1 @@
+Johann-Schöner-Gymnasium Karlstadt
diff --git a/lib/domains/de/jws-rv.txt b/lib/domains/de/jws-rv.txt
new file mode 100644
index 0000000000..709ef3d020
--- /dev/null
+++ b/lib/domains/de/jws-rv.txt
@@ -0,0 +1 @@
+Josef-Wilhelm-Schule Ravensburg
diff --git a/lib/domains/de/kbs-nordhorn.txt b/lib/domains/de/kbs-nordhorn.txt
new file mode 100644
index 0000000000..1dc6e08560
--- /dev/null
+++ b/lib/domains/de/kbs-nordhorn.txt
@@ -0,0 +1 @@
+Kaufmännische Berufsbildende Schulen Nordhorn (KBS)
diff --git a/lib/domains/de/kinzig-schule/schueler.txt b/lib/domains/de/kinzig-schule/schueler.txt
new file mode 100644
index 0000000000..0e7973ec08
--- /dev/null
+++ b/lib/domains/de/kinzig-schule/schueler.txt
@@ -0,0 +1 @@
+Berufliche Schulen des Main-Kinzig-Kreises
diff --git a/lib/domains/de/leibniz-fh.txt b/lib/domains/de/leibniz-fh.txt
new file mode 100644
index 0000000000..e5f5c8e30f
--- /dev/null
+++ b/lib/domains/de/leibniz-fh.txt
@@ -0,0 +1 @@
+Leibniz Fachhochschule
diff --git a/lib/domains/de/lernsax/gsg-loebau.txt b/lib/domains/de/lernsax/gsg-loebau.txt
new file mode 100644
index 0000000000..fd42e930c1
--- /dev/null
+++ b/lib/domains/de/lernsax/gsg-loebau.txt
@@ -0,0 +1 @@
+Geschwister-Scholl-Gymnasium Löbau
diff --git a/lib/domains/de/lgbk.txt b/lib/domains/de/lgbk.txt
new file mode 100644
index 0000000000..0d2da72a3c
--- /dev/null
+++ b/lib/domains/de/lgbk.txt
@@ -0,0 +1 @@
+Lessing Gymnasium | Berufskolleg
\ No newline at end of file
diff --git a/lib/domains/de/lo-net2/by/gd.txt b/lib/domains/de/lo-net2/by/gd.txt
new file mode 100644
index 0000000000..81a0947a05
--- /dev/null
+++ b/lib/domains/de/lo-net2/by/gd.txt
@@ -0,0 +1 @@
+Schmuttertal-Gymnasium Diedorf
diff --git a/lib/domains/de/marienschule-bielefeld.txt b/lib/domains/de/marienschule-bielefeld.txt
new file mode 100644
index 0000000000..54a5b9ef21
--- /dev/null
+++ b/lib/domains/de/marienschule-bielefeld.txt
@@ -0,0 +1 @@
+Marienschule Bielefeld
\ No newline at end of file
diff --git a/lib/domains/de/mh-freiburg.txt b/lib/domains/de/mh-freiburg.txt
new file mode 100644
index 0000000000..b7b3aeaa24
--- /dev/null
+++ b/lib/domains/de/mh-freiburg.txt
@@ -0,0 +1 @@
+Hochschule für Musik Freiburg
diff --git a/lib/domains/de/mpg/mpiwg-berlin.txt b/lib/domains/de/mpg/mpiwg-berlin.txt
new file mode 100644
index 0000000000..f7112d94b5
--- /dev/null
+++ b/lib/domains/de/mpg/mpiwg-berlin.txt
@@ -0,0 +1 @@
+Max Planck Institute for the History of Science
diff --git a/lib/domains/de/musin/muenchen/fosbos-technik.txt b/lib/domains/de/musin/muenchen/fosbos-technik.txt
new file mode 100644
index 0000000000..c14833edc7
--- /dev/null
+++ b/lib/domains/de/musin/muenchen/fosbos-technik.txt
@@ -0,0 +1 @@
+Staatliche Fachoberschule und Berufsoberschule München - Ausbildungsrichtungen: Technik / Agrarwirtschaft, Bio- und Umwelttechnologie
\ No newline at end of file
diff --git a/lib/domains/de/oszimt.txt b/lib/domains/de/oszimt.txt
new file mode 100644
index 0000000000..44652ccdda
--- /dev/null
+++ b/lib/domains/de/oszimt.txt
@@ -0,0 +1 @@
+Oberstufenzentrum Informations- und Medizintechnik
\ No newline at end of file
diff --git a/lib/domains/de/rhs-bs.txt b/lib/domains/de/rhs-bs.txt
new file mode 100644
index 0000000000..d49a3f9620
--- /dev/null
+++ b/lib/domains/de/rhs-bs.txt
@@ -0,0 +1 @@
+Ricarda-Huch-Schule Braunschweig
diff --git a/lib/domains/de/schulbistum/gsma.txt b/lib/domains/de/schulbistum/gsma.txt
new file mode 100644
index 0000000000..5d0afde26f
--- /dev/null
+++ b/lib/domains/de/schulbistum/gsma.txt
@@ -0,0 +1,4 @@
+St. Michael Gymnasium Ahlen
+
+Website: http://www.gymnasium-sankt-michael.de/
+Proof of long-term IT course: http://www.gymnasium-sankt-michael.de/unterricht/informatik/index.html
\ No newline at end of file
diff --git a/lib/domains/de/siegtal-gymnasium.txt b/lib/domains/de/siegtal-gymnasium.txt
new file mode 100644
index 0000000000..4e45bf5d0f
--- /dev/null
+++ b/lib/domains/de/siegtal-gymnasium.txt
@@ -0,0 +1 @@
+Siegtal-Gymnasium Eitorf
diff --git a/lib/domains/de/spranger-hamm.txt b/lib/domains/de/spranger-hamm.txt
new file mode 100644
index 0000000000..6b30ed5eb9
--- /dev/null
+++ b/lib/domains/de/spranger-hamm.txt
@@ -0,0 +1 @@
+Eduard Spranger Berufskolleg Hamm www.esb-hamm.de
diff --git a/lib/domains/de/stresemanngymnasium.txt b/lib/domains/de/stresemanngymnasium.txt
new file mode 100644
index 0000000000..a066682e6d
--- /dev/null
+++ b/lib/domains/de/stresemanngymnasium.txt
@@ -0,0 +1 @@
+Gustav Stresemann Gymnasium
diff --git a/lib/domains/de/sz-deg/edu.txt b/lib/domains/de/sz-deg/edu.txt
new file mode 100644
index 0000000000..71ed38cb0b
--- /dev/null
+++ b/lib/domains/de/sz-deg/edu.txt
@@ -0,0 +1 @@
+Robert-Koch-Gymnasium Deggendorf
\ No newline at end of file
diff --git a/lib/domains/de/th-luebeck.txt b/lib/domains/de/th-luebeck.txt
new file mode 100644
index 0000000000..c1870e4cc4
--- /dev/null
+++ b/lib/domains/de/th-luebeck.txt
@@ -0,0 +1 @@
+TH Lübeck
diff --git a/lib/domains/de/uni-goettingen/stud.txt b/lib/domains/de/uni-goettingen/stud.txt
new file mode 100644
index 0000000000..4f88601c0f
--- /dev/null
+++ b/lib/domains/de/uni-goettingen/stud.txt
@@ -0,0 +1 @@
+Georg-August-Universität Göttingen
diff --git a/lib/domains/de/wilhelm-busch-gymnasium.txt b/lib/domains/de/wilhelm-busch-gymnasium.txt
new file mode 100644
index 0000000000..f34b77b7e3
--- /dev/null
+++ b/lib/domains/de/wilhelm-busch-gymnasium.txt
@@ -0,0 +1 @@
+Wilhelm Busch Gymnasium Stadthagen
diff --git a/lib/domains/de/wrs-lueneburg.txt b/lib/domains/de/wrs-lueneburg.txt
new file mode 100644
index 0000000000..31c3db8976
--- /dev/null
+++ b/lib/domains/de/wrs-lueneburg.txt
@@ -0,0 +1 @@
+Wilhelm Raabe Schule
diff --git a/lib/domains/de/zgk-konstanz.txt b/lib/domains/de/zgk-konstanz.txt
new file mode 100644
index 0000000000..f5475c220c
--- /dev/null
+++ b/lib/domains/de/zgk-konstanz.txt
@@ -0,0 +1 @@
+Zeppelin-Gewerbeschule Konstanz
diff --git a/lib/domains/dk/dmjx.txt b/lib/domains/dk/dmjx.txt
new file mode 100644
index 0000000000..262b5d53e6
--- /dev/null
+++ b/lib/domains/dk/dmjx.txt
@@ -0,0 +1 @@
+Danish School of Media and Journalism
diff --git a/lib/domains/dk/dmjx/mail.txt b/lib/domains/dk/dmjx/mail.txt
new file mode 100644
index 0000000000..1d085a232d
--- /dev/null
+++ b/lib/domains/dk/dmjx/mail.txt
@@ -0,0 +1 @@
+Danmarks Medie- og Journalisthøjskole / Danish School of Media and Journalism
diff --git a/lib/domains/dk/hansenberg.txt b/lib/domains/dk/hansenberg.txt
new file mode 100644
index 0000000000..c82d02d5e1
--- /dev/null
+++ b/lib/domains/dk/hansenberg.txt
@@ -0,0 +1 @@
+Hansenberg
diff --git a/lib/domains/dk/sydfynsfrifagskole.txt b/lib/domains/dk/sydfynsfrifagskole.txt
new file mode 100644
index 0000000000..acb42d4907
--- /dev/null
+++ b/lib/domains/dk/sydfynsfrifagskole.txt
@@ -0,0 +1 @@
+Sydfyns Fri Fagskole
diff --git a/lib/domains/do/edu/unev-rd.txt b/lib/domains/do/edu/unev-rd.txt
deleted file mode 100644
index 6761f37880..0000000000
--- a/lib/domains/do/edu/unev-rd.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Universidad Nacional Evangélica
-Universidad Nacional Evangélica
diff --git a/lib/domains/do/edu/unica.txt b/lib/domains/do/edu/unica.txt
deleted file mode 100644
index 599bf24d55..0000000000
--- a/lib/domains/do/edu/unica.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Universidad Interamericana
-Universidad Interamericana
diff --git a/lib/domains/dz/cu-elbayadh.txt b/lib/domains/dz/cu-elbayadh.txt
new file mode 100644
index 0000000000..f0d9a218e9
--- /dev/null
+++ b/lib/domains/dz/cu-elbayadh.txt
@@ -0,0 +1,3 @@
+University Center Nour Bachir El-Bayadh
+Centre Universitaire Nour Bachir El-Bayadh
+المركز الجامعي نور البشير البيض
diff --git a/lib/domains/dz/enp-oran.txt b/lib/domains/dz/enp-oran.txt
deleted file mode 100644
index 675762b070..0000000000
--- a/lib/domains/dz/enp-oran.txt
+++ /dev/null
@@ -1 +0,0 @@
-ecole nationale polytechnique d'oran Maurice Audin
diff --git a/lib/domains/dz/ouargla-univ.txt b/lib/domains/dz/ouargla-univ.txt
deleted file mode 100644
index bbb2f7bb9a..0000000000
--- a/lib/domains/dz/ouargla-univ.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université de Ouargla
diff --git a/lib/domains/dz/univ-oran1.txt b/lib/domains/dz/univ-oran1.txt
new file mode 100644
index 0000000000..28f9d19c8e
--- /dev/null
+++ b/lib/domains/dz/univ-oran1.txt
@@ -0,0 +1 @@
+Université d'Oran 1 Ahmed Ben Bella
diff --git a/lib/domains/ec/edu/brookdale.txt b/lib/domains/ec/edu/brookdale.txt
deleted file mode 100644
index 21c99b8023..0000000000
--- a/lib/domains/ec/edu/brookdale.txt
+++ /dev/null
@@ -1 +0,0 @@
-Brookdale Community College
diff --git a/lib/domains/ec/edu/ucaazo.txt b/lib/domains/ec/edu/ucaazo.txt
deleted file mode 100644
index 5cd68ca6dc..0000000000
--- a/lib/domains/ec/edu/ucaazo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Catolica de Azogues
diff --git a/lib/domains/ec/edu/ucentral.txt b/lib/domains/ec/edu/ucentral.txt
deleted file mode 100644
index dcdfd127a1..0000000000
--- a/lib/domains/ec/edu/ucentral.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Central del Ecuador
diff --git a/lib/domains/ec/edu/uct.txt b/lib/domains/ec/edu/uct.txt
deleted file mode 100644
index 823efe6502..0000000000
--- a/lib/domains/ec/edu/uct.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad de Especialidades Turísticas 
diff --git a/lib/domains/ec/edu/unita.txt b/lib/domains/ec/edu/unita.txt
deleted file mode 100644
index 46da7964c3..0000000000
--- a/lib/domains/ec/edu/unita.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Tecnológica América
diff --git a/lib/domains/ec/edu/utsam.txt b/lib/domains/ec/edu/utsam.txt
deleted file mode 100644
index 981783dd19..0000000000
--- a/lib/domains/ec/edu/utsam.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Tecnológica San Antonio de Machala
diff --git a/lib/domains/ec/uisrael.txt b/lib/domains/ec/uisrael.txt
deleted file mode 100644
index c676253984..0000000000
--- a/lib/domains/ec/uisrael.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Tecnologica Israel
diff --git a/lib/domains/edu/DBU.txt b/lib/domains/edu/DBU.txt
new file mode 100644
index 0000000000..9a788fc751
--- /dev/null
+++ b/lib/domains/edu/DBU.txt
@@ -0,0 +1 @@
+Dallas Baptist University
diff --git a/lib/domains/edu/Oaklandcc b/lib/domains/edu/Oaklandcc
new file mode 100644
index 0000000000..2b4fcf7efd
--- /dev/null
+++ b/lib/domains/edu/Oaklandcc
@@ -0,0 +1 @@
+oaklandcc.txt
diff --git a/lib/domains/edu/SanJac/stu.txt b/lib/domains/edu/SanJac/stu.txt
new file mode 100644
index 0000000000..b2f3b33855
--- /dev/null
+++ b/lib/domains/edu/SanJac/stu.txt
@@ -0,0 +1 @@
+San Jacinto College
diff --git a/lib/domains/edu/aku.txt b/lib/domains/edu/aku.txt
index 0edbf3bbb6..5355c0b496 100644
--- a/lib/domains/edu/aku.txt
+++ b/lib/domains/edu/aku.txt
@@ -1,5 +1 @@
-Aga Khan University
-Aga Khan University
-Aga Khan University
-Aga Khan University
-Aga Khan University
+Aga Khan University
\ No newline at end of file
diff --git a/lib/domains/edu/amity.txt b/lib/domains/edu/amity.txt
new file mode 100644
index 0000000000..594baf8626
--- /dev/null
+++ b/lib/domains/edu/amity.txt
@@ -0,0 +1 @@
+Amity university
diff --git a/lib/domains/edu/angelina.txt b/lib/domains/edu/angelina.txt
new file mode 100644
index 0000000000..4f10649913
--- /dev/null
+++ b/lib/domains/edu/angelina.txt
@@ -0,0 +1 @@
+Angelina College
diff --git a/lib/domains/edu/aspp.txt b/lib/domains/edu/aspp.txt
deleted file mode 100644
index 5798ec8719..0000000000
--- a/lib/domains/edu/aspp.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Georgia School of Professional Psychology
-Illinois School of Professional Psychology - Chicago Campus
-Illinois School of Professional Psychology - Meadows Campus
-Minnesota School of Professional Psychology
diff --git a/lib/domains/edu/athabasca.txt b/lib/domains/edu/athabasca.txt
new file mode 100644
index 0000000000..c2852f42ed
--- /dev/null
+++ b/lib/domains/edu/athabasca.txt
@@ -0,0 +1 @@
+Athabasca University
diff --git a/lib/domains/edu/bath.txt b/lib/domains/edu/bath.txt
new file mode 100644
index 0000000000..5ee5e2ac01
--- /dev/null
+++ b/lib/domains/edu/bath.txt
@@ -0,0 +1,4 @@
+University of Bath
+official url: http://www.bath.ac.uk/
+long-term IT related course: http://www.bath.ac.uk/courses/undergraduate-2018/computer-science/
+recognition of of domain: http://www.bath.ac.uk/alumni/services/bathmail/index.html
diff --git a/lib/domains/edu/bellevuecollege.txt b/lib/domains/edu/bellevuecollege.txt
new file mode 100644
index 0000000000..f448553d10
--- /dev/null
+++ b/lib/domains/edu/bellevuecollege.txt
@@ -0,0 +1 @@
+bellevuecollege.edu
diff --git a/lib/domains/edu/bergen b/lib/domains/edu/bergen
new file mode 100644
index 0000000000..49c15b5520
--- /dev/null
+++ b/lib/domains/edu/bergen
@@ -0,0 +1,2 @@
+Bergen Community College
+@me.bergen.edu
diff --git a/lib/domains/edu/bergen.txt b/lib/domains/edu/bergen.txt
new file mode 100644
index 0000000000..49c15b5520
--- /dev/null
+++ b/lib/domains/edu/bergen.txt
@@ -0,0 +1,2 @@
+Bergen Community College
+@me.bergen.edu
diff --git a/lib/domains/edu/bpcc.txt b/lib/domains/edu/bpcc.txt
new file mode 100644
index 0000000000..99112b340e
--- /dev/null
+++ b/lib/domains/edu/bpcc.txt
@@ -0,0 +1 @@
+Bossier Parish Community College
diff --git a/lib/domains/edu/bucks.txt b/lib/domains/edu/bucks.txt
new file mode 100644
index 0000000000..166427a087
--- /dev/null
+++ b/lib/domains/edu/bucks.txt
@@ -0,0 +1 @@
+Bucks County Community College
\ No newline at end of file
diff --git a/lib/domains/edu/campbellsville.txt b/lib/domains/edu/campbellsville.txt
new file mode 100644
index 0000000000..320cc8929b
--- /dev/null
+++ b/lib/domains/edu/campbellsville.txt
@@ -0,0 +1 @@
+Campbellsville University
diff --git a/lib/domains/edu/capellauniversity.txt b/lib/domains/edu/capellauniversity.txt
new file mode 100644
index 0000000000..fcbe5d4f19
--- /dev/null
+++ b/lib/domains/edu/capellauniversity.txt
@@ -0,0 +1 @@
+Capella University
diff --git a/lib/domains/edu/cwru.txt b/lib/domains/edu/case.txt
similarity index 100%
rename from lib/domains/edu/cwru.txt
rename to lib/domains/edu/case.txt
diff --git a/lib/domains/edu/cayuga-cc.txt b/lib/domains/edu/cayuga-cc.txt
new file mode 100644
index 0000000000..b611c2620e
--- /dev/null
+++ b/lib/domains/edu/cayuga-cc.txt
@@ -0,0 +1 @@
+Cayuga Community College
\ No newline at end of file
diff --git a/lib/domains/edu/cccd.txt b/lib/domains/edu/cccd.txt
new file mode 100644
index 0000000000..0772d90916
--- /dev/null
+++ b/lib/domains/edu/cccd.txt
@@ -0,0 +1,4 @@
+Orange Coast College
+Coastline Community College
+Golden West College
+.group
diff --git a/lib/domains/edu/cccs.txt b/lib/domains/edu/cccs.txt
new file mode 100644
index 0000000000..954fafe95a
--- /dev/null
+++ b/lib/domains/edu/cccs.txt
@@ -0,0 +1,3 @@
+Colorado Community College System
+Arapahoe Community College
+.group
diff --git a/lib/domains/edu/ccp.txt b/lib/domains/edu/ccp.txt
new file mode 100644
index 0000000000..d47f54a57d
--- /dev/null
+++ b/lib/domains/edu/ccp.txt
@@ -0,0 +1,2 @@
+Community College of Philadelphia
+www.ccp.edu
diff --git a/lib/domains/edu/ccsf.txt b/lib/domains/edu/ccsf.txt
new file mode 100644
index 0000000000..58a3c4e4cb
--- /dev/null
+++ b/lib/domains/edu/ccsf.txt
@@ -0,0 +1 @@
+City College of San Francisco
\ No newline at end of file
diff --git a/lib/domains/edu/centralpenn.txt b/lib/domains/edu/centralpenn.txt
new file mode 100644
index 0000000000..6934faff15
--- /dev/null
+++ b/lib/domains/edu/centralpenn.txt
@@ -0,0 +1 @@
+Central Penn College
diff --git a/lib/domains/edu/cnm.txt b/lib/domains/edu/cnm.txt
new file mode 100644
index 0000000000..b7e8b61070
--- /dev/null
+++ b/lib/domains/edu/cnm.txt
@@ -0,0 +1 @@
+Central New Mexico Community College
diff --git a/lib/domains/edu/cranbrook.txt b/lib/domains/edu/cranbrook.txt
new file mode 100644
index 0000000000..d4feb1bc23
--- /dev/null
+++ b/lib/domains/edu/cranbrook.txt
@@ -0,0 +1 @@
+Cranbrook Schools
diff --git a/lib/domains/edu/cuaa.txt b/lib/domains/edu/cuaa.txt
new file mode 100644
index 0000000000..5a84d8547a
--- /dev/null
+++ b/lib/domains/edu/cuaa.txt
@@ -0,0 +1 @@
+Concordia University Ann Arbor
\ No newline at end of file
diff --git a/lib/domains/edu/dcccd.txt b/lib/domains/edu/dcccd.txt
new file mode 100644
index 0000000000..44cb3b9c1a
--- /dev/null
+++ b/lib/domains/edu/dcccd.txt
@@ -0,0 +1 @@
+Dallas County Community College District
diff --git a/lib/domains/edu/dgu.txt b/lib/domains/edu/dgu.txt
new file mode 100644
index 0000000000..89d316f366
--- /dev/null
+++ b/lib/domains/edu/dgu.txt
@@ -0,0 +1 @@
+Dongguk University
diff --git a/lib/domains/edu/digipen.txt b/lib/domains/edu/digipen.txt
new file mode 100644
index 0000000000..bdf355661d
--- /dev/null
+++ b/lib/domains/edu/digipen.txt
@@ -0,0 +1 @@
+DigiPen Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/edu/dmacc.txt b/lib/domains/edu/dmacc.txt
new file mode 100644
index 0000000000..9e7fccff16
--- /dev/null
+++ b/lib/domains/edu/dmacc.txt
@@ -0,0 +1 @@
+Des Moines Area Community College
diff --git a/lib/domains/edu/dongguk.txt b/lib/domains/edu/dongguk.txt
new file mode 100644
index 0000000000..89d316f366
--- /dev/null
+++ b/lib/domains/edu/dongguk.txt
@@ -0,0 +1 @@
+Dongguk University
diff --git a/lib/domains/edu/dupage.txt b/lib/domains/edu/dupage.txt
new file mode 100644
index 0000000000..127e92aded
--- /dev/null
+++ b/lib/domains/edu/dupage.txt
@@ -0,0 +1 @@
+College of DuPage
diff --git a/lib/domains/edu/epcc.txt b/lib/domains/edu/epcc.txt
new file mode 100644
index 0000000000..b2f4f423a3
--- /dev/null
+++ b/lib/domains/edu/epcc.txt
@@ -0,0 +1 @@
+El Paso Community College
diff --git a/lib/domains/edu/eurasia.txt b/lib/domains/edu/eurasia.txt
new file mode 100644
index 0000000000..9e64d76281
--- /dev/null
+++ b/lib/domains/edu/eurasia.txt
@@ -0,0 +1 @@
+Xi'an Eurasia University
\ No newline at end of file
diff --git a/lib/domains/edu/fsw/bucs.txt b/lib/domains/edu/fsw/bucs.txt
new file mode 100644
index 0000000000..af556f95d2
--- /dev/null
+++ b/lib/domains/edu/fsw/bucs.txt
@@ -0,0 +1 @@
+Florida Southwestern State College
diff --git a/lib/domains/edu/gcu.txt b/lib/domains/edu/gcu.txt
new file mode 100644
index 0000000000..ff14eb018c
--- /dev/null
+++ b/lib/domains/edu/gcu.txt
@@ -0,0 +1 @@
+Grand Canyon University
diff --git a/lib/domains/edu/georgetown.txt b/lib/domains/edu/georgetown.txt
new file mode 100644
index 0000000000..6bb3899813
--- /dev/null
+++ b/lib/domains/edu/georgetown.txt
@@ -0,0 +1 @@
+Georgetown University
diff --git a/lib/domains/edu/gnomon.txt b/lib/domains/edu/gnomon.txt
new file mode 100644
index 0000000000..78979f05b4
--- /dev/null
+++ b/lib/domains/edu/gnomon.txt
@@ -0,0 +1 @@
+Gnomon - School of VFX & animation for film and games
diff --git a/lib/domains/edu/grcc.txt b/lib/domains/edu/grcc.txt
new file mode 100644
index 0000000000..68cc3d06ac
--- /dev/null
+++ b/lib/domains/edu/grcc.txt
@@ -0,0 +1 @@
+Grand Rapids Community College
diff --git a/lib/domains/edu/handong.txt b/lib/domains/edu/handong.txt
new file mode 100644
index 0000000000..b9cfb350a9
--- /dev/null
+++ b/lib/domains/edu/handong.txt
@@ -0,0 +1 @@
+Handong Global University
diff --git a/lib/domains/edu/hccfl/hawkmail.txt b/lib/domains/edu/hccfl/hawkmail.txt
new file mode 100644
index 0000000000..8b2cfbacad
--- /dev/null
+++ b/lib/domains/edu/hccfl/hawkmail.txt
@@ -0,0 +1 @@
+Hillsborough Community College
diff --git a/lib/domains/edu/highline.txt b/lib/domains/edu/highline.txt
new file mode 100644
index 0000000000..7f3dc37b06
--- /dev/null
+++ b/lib/domains/edu/highline.txt
@@ -0,0 +1,2 @@
+Highline College
+
diff --git a/lib/domains/edu/hm.txt b/lib/domains/edu/hm.txt
new file mode 100644
index 0000000000..06338e420c
--- /dev/null
+++ b/lib/domains/edu/hm.txt
@@ -0,0 +1,2 @@
+Hochschule Munchen
+University of applied science Munich
\ No newline at end of file
diff --git a/lib/domains/edu/inha.txt b/lib/domains/edu/inha.txt
new file mode 100644
index 0000000000..b5633b1f55
--- /dev/null
+++ b/lib/domains/edu/inha.txt
@@ -0,0 +1 @@
+INHA University
diff --git a/lib/domains/edu/ip-formation.txt b/lib/domains/edu/ip-formation.txt
new file mode 100644
index 0000000000..5a0306555f
--- /dev/null
+++ b/lib/domains/edu/ip-formation.txt
@@ -0,0 +1 @@
+ecole ipssi
diff --git a/lib/domains/edu/itu.txt b/lib/domains/edu/itu.txt
new file mode 100644
index 0000000000..e8a4ec7f4b
--- /dev/null
+++ b/lib/domains/edu/itu.txt
@@ -0,0 +1 @@
+International Technology Institute
diff --git a/lib/domains/edu/ius.txt b/lib/domains/edu/ius.txt
new file mode 100644
index 0000000000..8ccf9fef24
--- /dev/null
+++ b/lib/domains/edu/ius.txt
@@ -0,0 +1 @@
+Indiana University Southeast
diff --git a/lib/domains/edu/iut-dhaka.txt b/lib/domains/edu/iut-dhaka.txt
new file mode 100644
index 0000000000..4de69f713a
--- /dev/null
+++ b/lib/domains/edu/iut-dhaka.txt
@@ -0,0 +1 @@
+Islamic University of Technology
diff --git a/lib/domains/edu/ivc.txt b/lib/domains/edu/ivc.txt
new file mode 100644
index 0000000000..4dccc8408c
--- /dev/null
+++ b/lib/domains/edu/ivc.txt
@@ -0,0 +1 @@
+Irvine Valley College
diff --git a/lib/domains/edu/kctcs.txt b/lib/domains/edu/kctcs.txt
new file mode 100644
index 0000000000..7c8132c78f
Binary files /dev/null and b/lib/domains/edu/kctcs.txt differ
diff --git a/lib/domains/edu/lanecc.txt b/lib/domains/edu/lanecc.txt
new file mode 100644
index 0000000000..bc027c1123
--- /dev/null
+++ b/lib/domains/edu/lanecc.txt
@@ -0,0 +1 @@
+Lane Community College
\ No newline at end of file
diff --git a/lib/domains/edu/lonestar.txt b/lib/domains/edu/lonestar.txt
new file mode 100644
index 0000000000..adbdc336bb
--- /dev/null
+++ b/lib/domains/edu/lonestar.txt
@@ -0,0 +1 @@
+Lone star Community College
diff --git a/lib/domains/edu/losrios.txt b/lib/domains/edu/losrios.txt
new file mode 100644
index 0000000000..c5c7a6f371
--- /dev/null
+++ b/lib/domains/edu/losrios.txt
@@ -0,0 +1,8 @@
+Los Rios Community College District
+=======
+American River College
+Cosumnes River College
+Folsom Lake College
+Sacramento City College
+.group
+
diff --git a/lib/domains/edu/madisoncollege.txt b/lib/domains/edu/madisoncollege.txt
new file mode 100644
index 0000000000..f070e2fbbc
--- /dev/null
+++ b/lib/domains/edu/madisoncollege.txt
@@ -0,0 +1 @@
+Madison Area Technical College
diff --git a/lib/domains/edu/manipal.txt b/lib/domains/edu/manipal.txt
new file mode 100644
index 0000000000..1c815e3c83
--- /dev/null
+++ b/lib/domains/edu/manipal.txt
@@ -0,0 +1 @@
+Manipal Academy of Higher Education
diff --git a/lib/domains/edu/mansfield.txt b/lib/domains/edu/mansfield.txt
new file mode 100644
index 0000000000..8c3e1a8040
--- /dev/null
+++ b/lib/domains/edu/mansfield.txt
@@ -0,0 +1 @@
+Mansfield University of Pennsylvania
diff --git a/lib/domains/edu/maricopa.txt b/lib/domains/edu/maricopa.txt
new file mode 100644
index 0000000000..34bb8bfe28
--- /dev/null
+++ b/lib/domains/edu/maricopa.txt
@@ -0,0 +1 @@
+Maricopa Community Colleges
diff --git a/lib/domains/edu/mccneb.txt b/lib/domains/edu/mccneb.txt
new file mode 100644
index 0000000000..d1f11e33ed
--- /dev/null
+++ b/lib/domains/edu/mccneb.txt
@@ -0,0 +1 @@
+Metropolitan Community College
diff --git a/lib/domains/edu/mdanderson.txt b/lib/domains/edu/mdanderson.txt
new file mode 100644
index 0000000000..7e8fd78f26
--- /dev/null
+++ b/lib/domains/edu/mdanderson.txt
@@ -0,0 +1 @@
+University of Texas - MDAnderson Cancer Center
diff --git a/lib/domains/edu/mhcc.txt b/lib/domains/edu/mhcc.txt
new file mode 100644
index 0000000000..35a0776177
--- /dev/null
+++ b/lib/domains/edu/mhcc.txt
@@ -0,0 +1 @@
+Mt. Hood Community College
diff --git a/lib/domains/edu/missouriwestern.txt b/lib/domains/edu/missouriwestern.txt
new file mode 100644
index 0000000000..fe35bf9c21
--- /dev/null
+++ b/lib/domains/edu/missouriwestern.txt
@@ -0,0 +1 @@
+Missouri Western State University
diff --git a/lib/domains/edu/mnsu.txt b/lib/domains/edu/mnsu.txt
new file mode 100644
index 0000000000..85998ec760
--- /dev/null
+++ b/lib/domains/edu/mnsu.txt
@@ -0,0 +1 @@
+Minnesota State University, Mankato
\ No newline at end of file
diff --git a/lib/domains/edu/monash.txt b/lib/domains/edu/monash.txt
new file mode 100644
index 0000000000..f02121f828
--- /dev/null
+++ b/lib/domains/edu/monash.txt
@@ -0,0 +1 @@
+Monash University
diff --git a/lib/domains/edu/mssu.txt b/lib/domains/edu/mssu.txt
new file mode 100644
index 0000000000..77c808c38b
--- /dev/null
+++ b/lib/domains/edu/mssu.txt
@@ -0,0 +1 @@
+Missouri Southern State University
diff --git a/lib/domains/edu/muhlenberg.txt b/lib/domains/edu/muhlenberg.txt
new file mode 100644
index 0000000000..de9dc5de23
--- /dev/null
+++ b/lib/domains/edu/muhlenberg.txt
@@ -0,0 +1 @@
+Muhlenberg College
diff --git a/lib/domains/edu/national.txt b/lib/domains/edu/national.txt
index e0faa4a98d..282ea2ce36 100644
--- a/lib/domains/edu/national.txt
+++ b/lib/domains/edu/national.txt
@@ -1,7 +1 @@
-National American University, Colorado Springs
-National American University, Denver
-National American University, Roseville
-National American University, Kansas City
-National American University, Albuquerque
-National American University
-National American University, Sioux Falls
+National American University
\ No newline at end of file
diff --git a/lib/domains/edu/navarrocollege.txt b/lib/domains/edu/navarrocollege.txt
new file mode 100644
index 0000000000..8f01c1cf7a
--- /dev/null
+++ b/lib/domains/edu/navarrocollege.txt
@@ -0,0 +1,2 @@
+Navarro College
+https://www.navarrocollege.edu/academics/computer-information-technology/
diff --git a/lib/domains/edu/ncc.txt b/lib/domains/edu/ncc.txt
new file mode 100644
index 0000000000..76623111fc
--- /dev/null
+++ b/lib/domains/edu/ncc.txt
@@ -0,0 +1 @@
+Nassau Community College
diff --git a/lib/domains/edu/nitt.txt b/lib/domains/edu/nitt.txt
new file mode 100644
index 0000000000..f53297ad1e
--- /dev/null
+++ b/lib/domains/edu/nitt.txt
@@ -0,0 +1 @@
+National Institute of Technology, Tiruchirappalli
diff --git a/lib/domains/edu/nodak.txt b/lib/domains/edu/nodak.txt
index 29c893b337..aebfcdaa72 100644
--- a/lib/domains/edu/nodak.txt
+++ b/lib/domains/edu/nodak.txt
@@ -1,7 +1,7 @@
+University of North Dakota
 Dickinson State University
 Mayville State University
 Minot State University
 North Dakota State University
 Tri-College University
-University of North Dakota
 Valley City State University
diff --git a/lib/domains/edu/northampton.txt b/lib/domains/edu/northampton.txt
new file mode 100644
index 0000000000..6dc35ea684
--- /dev/null
+++ b/lib/domains/edu/northampton.txt
@@ -0,0 +1 @@
+Northampton Community College
diff --git a/lib/domains/edu/northampton/spartan.txt b/lib/domains/edu/northampton/spartan.txt
new file mode 100644
index 0000000000..6dc35ea684
--- /dev/null
+++ b/lib/domains/edu/northampton/spartan.txt
@@ -0,0 +1 @@
+Northampton Community College
diff --git a/lib/domains/edu/nscc.txt b/lib/domains/edu/nscc.txt
new file mode 100644
index 0000000000..c40fdabb8c
--- /dev/null
+++ b/lib/domains/edu/nscc.txt
@@ -0,0 +1,3 @@
+Nashville State Community College
+https://www.nscc.edu
+https://www.nscc.edu/academics/degrees-certificates/computer-information-technology-a-a-s
diff --git a/lib/domains/edu/nwacc.txt b/lib/domains/edu/nwacc.txt
new file mode 100644
index 0000000000..8d906f8bf8
--- /dev/null
+++ b/lib/domains/edu/nwacc.txt
@@ -0,0 +1 @@
+Northwest Arkansas Community College
diff --git a/lib/domains/edu/oaklandcc.txt b/lib/domains/edu/oaklandcc.txt
new file mode 100644
index 0000000000..2b4fcf7efd
--- /dev/null
+++ b/lib/domains/edu/oaklandcc.txt
@@ -0,0 +1 @@
+oaklandcc.txt
diff --git a/lib/domains/edu/ohlone/student.txt b/lib/domains/edu/ohlone/student.txt
new file mode 100644
index 0000000000..9ef00c7332
--- /dev/null
+++ b/lib/domains/edu/ohlone/student.txt
@@ -0,0 +1 @@
+Ohlone College
\ No newline at end of file
diff --git a/lib/domains/edu/olin.txt b/lib/domains/edu/olin.txt
new file mode 100644
index 0000000000..191009bda7
--- /dev/null
+++ b/lib/domains/edu/olin.txt
@@ -0,0 +1 @@
+Olin College of Engineering
diff --git a/lib/domains/edu/oregonstate.txt b/lib/domains/edu/oregonstate.txt
new file mode 100644
index 0000000000..98b6720265
--- /dev/null
+++ b/lib/domains/edu/oregonstate.txt
@@ -0,0 +1 @@
+Oregon State University
diff --git a/lib/domains/edu/osu.txt b/lib/domains/edu/osu.txt
new file mode 100644
index 0000000000..8acff1b74f
--- /dev/null
+++ b/lib/domains/edu/osu.txt
@@ -0,0 +1 @@
+The Ohio State University
diff --git a/lib/domains/edu/palermo.txt b/lib/domains/edu/palermo.txt
new file mode 100644
index 0000000000..bf19ae53e7
--- /dev/null
+++ b/lib/domains/edu/palermo.txt
@@ -0,0 +1 @@
+Universidad de Palermo
diff --git a/lib/domains/edu/psu.txt b/lib/domains/edu/psu.txt
index 34b1febaf8..b70b8f23e0 100644
--- a/lib/domains/edu/psu.txt
+++ b/lib/domains/edu/psu.txt
@@ -1,11 +1,2 @@
 Pennsylvania State University
-Pennsylvania State University - Abington
-Pennsylvania State University - Altoona
-Pennsylvania State University at Erie - Behrend College
-Pennsylvania State University at Harrisburg - The Capital College
-Pennsylvania State University - Berks-Lehigh Valley College
-Pennsylvania State University Delaware County
-Pennsylvania State University Great Valley
-Pennsylvania State University - Lehigh Valley
-Pennsylvania State University - Milton S.Hershey Medical Center
-Pennsylvania State University - Schuylkill
+Pennsylvania State University, campuses: Abington, Altoona, Erie, Harrisburg, Delaware County, Great Valley, Lehigh Valley, Schuylkill
\ No newline at end of file
diff --git a/lib/domains/edu/rmu/mail.txt b/lib/domains/edu/rmu/mail.txt
new file mode 100644
index 0000000000..67b7875032
--- /dev/null
+++ b/lib/domains/edu/rmu/mail.txt
@@ -0,0 +1 @@
+Robert Morris University
\ No newline at end of file
diff --git a/lib/domains/edu/saddleback.txt b/lib/domains/edu/saddleback.txt
new file mode 100644
index 0000000000..8104aed640
--- /dev/null
+++ b/lib/domains/edu/saddleback.txt
@@ -0,0 +1 @@
+Saddleback College
diff --git a/lib/domains/edu/saeinstitute.txt b/lib/domains/edu/saeinstitute.txt
new file mode 100644
index 0000000000..fafda498bd
--- /dev/null
+++ b/lib/domains/edu/saeinstitute.txt
@@ -0,0 +1 @@
+SAE Athens
diff --git a/lib/domains/edu/sage.txt b/lib/domains/edu/sage.txt
index 69ce52b1a2..ed58c59a81 100644
--- a/lib/domains/edu/sage.txt
+++ b/lib/domains/edu/sage.txt
@@ -1,2 +1 @@
-Russel Sage College
-Sage Graduate School
+The Sage Colleges
diff --git a/lib/domains/edu/sbccd.txt b/lib/domains/edu/sbccd.txt
new file mode 100644
index 0000000000..baecc8a596
--- /dev/null
+++ b/lib/domains/edu/sbccd.txt
@@ -0,0 +1 @@
+San Bernardino Community College
diff --git a/lib/domains/edu/scit.txt b/lib/domains/edu/scit.txt
new file mode 100644
index 0000000000..30570e84f8
--- /dev/null
+++ b/lib/domains/edu/scit.txt
@@ -0,0 +1 @@
+https://www.scit.edu/
diff --git a/lib/domains/edu/scranton.txt b/lib/domains/edu/scranton.txt
new file mode 100644
index 0000000000..2a8e774ecf
--- /dev/null
+++ b/lib/domains/edu/scranton.txt
@@ -0,0 +1 @@
+University of Scranton
diff --git a/lib/domains/edu/seattlecentral-college.txt b/lib/domains/edu/seattlecentral-college.txt
new file mode 100644
index 0000000000..8aa5a7e4ca
--- /dev/null
+++ b/lib/domains/edu/seattlecentral-college.txt
@@ -0,0 +1,2 @@
+Seattle Central College
+https://seattlecentral.edu
diff --git a/lib/domains/edu/sfcollege.txt b/lib/domains/edu/sfcollege.txt
new file mode 100644
index 0000000000..f14911d0f6
--- /dev/null
+++ b/lib/domains/edu/sfcollege.txt
@@ -0,0 +1 @@
+Santa Fe College
diff --git a/lib/domains/edu/skku.txt b/lib/domains/edu/skku.txt
new file mode 100644
index 0000000000..28d8360c75
--- /dev/null
+++ b/lib/domains/edu/skku.txt
@@ -0,0 +1 @@
+SungKyunKwan University
diff --git a/lib/domains/edu/smc/student.txt b/lib/domains/edu/smc/student.txt
new file mode 100644
index 0000000000..11edb5675e
--- /dev/null
+++ b/lib/domains/edu/smc/student.txt
@@ -0,0 +1 @@
+Santa Monica College
diff --git a/lib/domains/edu/snhu.txt b/lib/domains/edu/snhu.txt
new file mode 100644
index 0000000000..b24d76a553
--- /dev/null
+++ b/lib/domains/edu/snhu.txt
@@ -0,0 +1 @@
+Southern New Hampshire University
\ No newline at end of file
diff --git a/lib/domains/edu/solano/students.txt b/lib/domains/edu/solano/students.txt
new file mode 100644
index 0000000000..b27b5bc38b
--- /dev/null
+++ b/lib/domains/edu/solano/students.txt
@@ -0,0 +1 @@
+Solano Community College
\ No newline at end of file
diff --git a/lib/domains/edu/south.txt b/lib/domains/edu/south.txt
new file mode 100644
index 0000000000..b281596072
--- /dev/null
+++ b/lib/domains/edu/south.txt
@@ -0,0 +1,2 @@
+South University
+southuniversity.edu
\ No newline at end of file
diff --git a/lib/domains/edu/southeastmn.txt b/lib/domains/edu/southeastmn.txt
new file mode 100644
index 0000000000..db43be9792
--- /dev/null
+++ b/lib/domains/edu/southeastmn.txt
@@ -0,0 +1 @@
+Minnesota State College Southeast
diff --git a/lib/domains/edu/spcollege/live.txt b/lib/domains/edu/spcollege/live.txt
new file mode 100644
index 0000000000..9c5d98faff
--- /dev/null
+++ b/lib/domains/edu/spcollege/live.txt
@@ -0,0 +1 @@
+St. Petersburg College
diff --git a/lib/domains/edu/stevens.txt b/lib/domains/edu/stevens.txt
new file mode 100644
index 0000000000..f1c476ca74
--- /dev/null
+++ b/lib/domains/edu/stevens.txt
@@ -0,0 +1 @@
+Stevens Institute of Technology
diff --git a/lib/domains/edu/stikom.txt b/lib/domains/edu/stikom.txt
new file mode 100644
index 0000000000..7a8f536fdb
--- /dev/null
+++ b/lib/domains/edu/stikom.txt
@@ -0,0 +1 @@
+Institut Bisnis dan Informatika Stikom Surabaya
diff --git a/lib/domains/edu/sunybroome/acad.txt b/lib/domains/edu/sunybroome/acad.txt
new file mode 100644
index 0000000000..07da2c539f
--- /dev/null
+++ b/lib/domains/edu/sunybroome/acad.txt
@@ -0,0 +1 @@
+SUNY Broome Community College
diff --git a/lib/domains/edu/sunysuffolk/mail.txt b/lib/domains/edu/sunysuffolk/mail.txt
new file mode 100644
index 0000000000..267345c333
--- /dev/null
+++ b/lib/domains/edu/sunysuffolk/mail.txt
@@ -0,0 +1 @@
+The University of New York Suffolk County Community College
diff --git a/lib/domains/edu/tccd.txt b/lib/domains/edu/tccd.txt
new file mode 100644
index 0000000000..fe50b3833e
--- /dev/null
+++ b/lib/domains/edu/tccd.txt
@@ -0,0 +1 @@
+Tarrant County College
diff --git a/lib/domains/edu/thapar.txt b/lib/domains/edu/thapar.txt
new file mode 100644
index 0000000000..89f51d7150
--- /dev/null
+++ b/lib/domains/edu/thapar.txt
@@ -0,0 +1 @@
+Thapar Institute of Engineering & Technology
diff --git a/lib/domains/edu/txstate.txt b/lib/domains/edu/txstate.txt
new file mode 100644
index 0000000000..927a147645
--- /dev/null
+++ b/lib/domains/edu/txstate.txt
@@ -0,0 +1 @@
+Texas State University
\ No newline at end of file
diff --git a/lib/domains/edu/uandresbello.txt b/lib/domains/edu/uandresbello.txt
new file mode 100644
index 0000000000..dbff1aaf5b
--- /dev/null
+++ b/lib/domains/edu/uandresbello.txt
@@ -0,0 +1,2 @@
+Universidad Andres Bello
+UNAB
diff --git a/lib/domains/edu/udg.txt b/lib/domains/edu/udg.txt
new file mode 100644
index 0000000000..7b1caad2b5
--- /dev/null
+++ b/lib/domains/edu/udg.txt
@@ -0,0 +1,2 @@
+Universitat de Girona
+University of Girona
diff --git a/lib/domains/edu/ufm.txt b/lib/domains/edu/ufm.txt
new file mode 100644
index 0000000000..f7323f0dfb
--- /dev/null
+++ b/lib/domains/edu/ufm.txt
@@ -0,0 +1 @@
+Universidad Francisco Marroquin
diff --git a/lib/domains/edu/umassd.txt b/lib/domains/edu/umassd.txt
new file mode 100644
index 0000000000..1edce0a862
--- /dev/null
+++ b/lib/domains/edu/umassd.txt
@@ -0,0 +1 @@
+University of Massachusetts (Dartmouth)
diff --git a/lib/domains/edu/uml.txt b/lib/domains/edu/uml.txt
new file mode 100644
index 0000000000..5475267b74
--- /dev/null
+++ b/lib/domains/edu/uml.txt
@@ -0,0 +1 @@
+University of Massachusetts Lowell
diff --git a/lib/domains/edu/uoc.txt b/lib/domains/edu/uoc.txt
new file mode 100644
index 0000000000..10c8e9069e
--- /dev/null
+++ b/lib/domains/edu/uoc.txt
@@ -0,0 +1 @@
+Universitat Oberta de Catalunya
diff --git a/lib/domains/edu/uopeople.txt b/lib/domains/edu/uopeople.txt
new file mode 100644
index 0000000000..6f2c5bc08b
--- /dev/null
+++ b/lib/domains/edu/uopeople.txt
@@ -0,0 +1 @@
+University of the People
diff --git a/lib/domains/edu/upf.txt b/lib/domains/edu/upf.txt
new file mode 100644
index 0000000000..134c42d180
--- /dev/null
+++ b/lib/domains/edu/upf.txt
@@ -0,0 +1 @@
+Universitat Pompeu Fabra
diff --git a/lib/domains/edu/utrgv.txt b/lib/domains/edu/utrgv.txt
new file mode 100644
index 0000000000..b5487c1455
--- /dev/null
+++ b/lib/domains/edu/utrgv.txt
@@ -0,0 +1 @@
+University of Texas at Rio Grande Valley
diff --git a/lib/domains/edu/uvu.txt b/lib/domains/edu/uvu.txt
new file mode 100644
index 0000000000..eb55e59be5
--- /dev/null
+++ b/lib/domains/edu/uvu.txt
@@ -0,0 +1 @@
+Utah Valley University
diff --git a/lib/domains/edu/uw.txt b/lib/domains/edu/uw.txt
new file mode 100644
index 0000000000..bf6146e40b
--- /dev/null
+++ b/lib/domains/edu/uw.txt
@@ -0,0 +1 @@
+University of Washington
diff --git a/lib/domains/edu/vips.txt b/lib/domains/edu/vips.txt
new file mode 100644
index 0000000000..1870352ca0
--- /dev/null
+++ b/lib/domains/edu/vips.txt
@@ -0,0 +1 @@
+Vivekananda Institute of Professional Studies
diff --git a/lib/domains/edu/wcs.txt b/lib/domains/edu/wcs.txt
new file mode 100644
index 0000000000..e10e6ebbe3
--- /dev/null
+++ b/lib/domains/edu/wcs.txt
@@ -0,0 +1,2 @@
+Williamson County School District
+.group
diff --git a/lib/domains/edu/wisc.txt b/lib/domains/edu/wisc.txt
index 9948686562..f1c903e5bb 100644
--- a/lib/domains/edu/wisc.txt
+++ b/lib/domains/edu/wisc.txt
@@ -1 +1 @@
-University of Wisconsin - Madison
+University of Wisconsin�Madison
diff --git a/lib/domains/edu/wit.txt b/lib/domains/edu/wit.txt
new file mode 100644
index 0000000000..c2762c387c
--- /dev/null
+++ b/lib/domains/edu/wit.txt
@@ -0,0 +1 @@
+Wentworth Institute of Technology
diff --git a/lib/domains/edu/wm/email.txt b/lib/domains/edu/wm/email.txt
new file mode 100644
index 0000000000..2db6fa00c0
--- /dev/null
+++ b/lib/domains/edu/wm/email.txt
@@ -0,0 +1 @@
+College of William and Mary
diff --git a/lib/domains/edu/worwic.txt b/lib/domains/edu/worwic.txt
new file mode 100644
index 0000000000..fbe0ff6d85
--- /dev/null
+++ b/lib/domains/edu/worwic.txt
@@ -0,0 +1 @@
+Wor-Wic Community College
diff --git a/lib/domains/edu/wpi.txt b/lib/domains/edu/wpi.txt
new file mode 100644
index 0000000000..26ed32a091
--- /dev/null
+++ b/lib/domains/edu/wpi.txt
@@ -0,0 +1 @@
+Worcester Polytechnic Institute
diff --git a/lib/domains/education/crescent.txt b/lib/domains/education/crescent.txt
new file mode 100644
index 0000000000..22927c3e3d
--- /dev/null
+++ b/lib/domains/education/crescent.txt
@@ -0,0 +1 @@
+B.S.ABDUR RAHMAN CRESCENT INSTITUTE OF SCIENCE & TECHNOLOGY
\ No newline at end of file
diff --git a/lib/domains/education/msg-landau.txt b/lib/domains/education/msg-landau.txt
new file mode 100644
index 0000000000..e8dc7a2fcc
--- /dev/null
+++ b/lib/domains/education/msg-landau.txt
@@ -0,0 +1 @@
+Max-Slevogt-Gymnasium
diff --git a/lib/domains/ee/taltech.txt b/lib/domains/ee/taltech.txt
new file mode 100755
index 0000000000..356c083c91
--- /dev/null
+++ b/lib/domains/ee/taltech.txt
@@ -0,0 +1 @@
+TalTech
diff --git a/lib/domains/er/edu/uoa.txt b/lib/domains/er/edu/uoa.txt
deleted file mode 100644
index cef9100008..0000000000
--- a/lib/domains/er/edu/uoa.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Asmara
diff --git a/lib/domains/es/acarballeira.txt b/lib/domains/es/acarballeira.txt
new file mode 100644
index 0000000000..a99661bc29
--- /dev/null
+++ b/lib/domains/es/acarballeira.txt
@@ -0,0 +1 @@
+CIFP A Carballeira
diff --git a/lib/domains/es/alumni-eae.txt b/lib/domains/es/alumni-eae.txt
new file mode 100644
index 0000000000..0d812c4621
--- /dev/null
+++ b/lib/domains/es/alumni-eae.txt
@@ -0,0 +1 @@
+EAE Business School
diff --git a/lib/domains/es/cifplalaboral/aula.txt b/lib/domains/es/cifplalaboral/aula.txt
new file mode 100644
index 0000000000..2760c6604e
--- /dev/null
+++ b/lib/domains/es/cifplalaboral/aula.txt
@@ -0,0 +1 @@
+Centro Integral de Formacion Profesional La Laboral
diff --git a/lib/domains/es/edu/iuse.txt b/lib/domains/es/edu/iuse.txt
deleted file mode 100644
index 3eb3ee47c1..0000000000
--- a/lib/domains/es/edu/iuse.txt
+++ /dev/null
@@ -1 +0,0 @@
-International University of Southern Europe
diff --git a/lib/domains/es/ieslavereda.txt b/lib/domains/es/ieslavereda.txt
new file mode 100644
index 0000000000..3533a2e2f4
--- /dev/null
+++ b/lib/domains/es/ieslavereda.txt
@@ -0,0 +1 @@
+IES La Vereda
diff --git a/lib/domains/es/iesoleana.txt b/lib/domains/es/iesoleana.txt
new file mode 100644
index 0000000000..c89d958132
--- /dev/null
+++ b/lib/domains/es/iesoleana.txt
@@ -0,0 +1 @@
+IES Oleana
\ No newline at end of file
diff --git a/lib/domains/es/iestrassierra.txt b/lib/domains/es/iestrassierra.txt
deleted file mode 100644
index 2f1a4e3453..0000000000
--- a/lib/domains/es/iestrassierra.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-IES Trassierra (Córdoba, Spain)
-www.iestrassierra.com
diff --git a/lib/domains/es/iesvegademijas.txt b/lib/domains/es/iesvegademijas.txt
new file mode 100644
index 0000000000..24afd72b6d
--- /dev/null
+++ b/lib/domains/es/iesvegademijas.txt
@@ -0,0 +1 @@
+IES Vega de Mijas (Málaga)
diff --git a/lib/domains/eu/akademiasztuki.txt b/lib/domains/eu/akademiasztuki.txt
new file mode 100644
index 0000000000..7ad2a968c5
--- /dev/null
+++ b/lib/domains/eu/akademiasztuki.txt
@@ -0,0 +1,2 @@
+Akademia Sztuki w Szczecinie
+Academy of Art in Szczecin
diff --git a/lib/domains/eu/bbs-papenburg.txt b/lib/domains/eu/bbs-papenburg.txt
new file mode 100644
index 0000000000..98346f9990
--- /dev/null
+++ b/lib/domains/eu/bbs-papenburg.txt
@@ -0,0 +1 @@
+BBS Papenburg
diff --git a/lib/domains/eu/bbsam.txt b/lib/domains/eu/bbsam.txt
new file mode 100644
index 0000000000..645229f1a0
--- /dev/null
+++ b/lib/domains/eu/bbsam.txt
@@ -0,0 +1 @@
+Berufsbildende Schulen am Museumsdorf Cloppenburg
diff --git a/lib/domains/eu/bottyan.txt b/lib/domains/eu/bottyan.txt
new file mode 100644
index 0000000000..233048b26e
--- /dev/null
+++ b/lib/domains/eu/bottyan.txt
@@ -0,0 +1 @@
+Bottyán János Szakgimnázium
diff --git a/lib/domains/eu/educa-sos.txt b/lib/domains/eu/educa-sos.txt
new file mode 100644
index 0000000000..7c906de33f
--- /dev/null
+++ b/lib/domains/eu/educa-sos.txt
@@ -0,0 +1 @@
+EDUCA SOS s.r.o. private high school
\ No newline at end of file
diff --git a/lib/domains/eu/epfc.txt b/lib/domains/eu/epfc.txt
new file mode 100644
index 0000000000..6380189105
--- /dev/null
+++ b/lib/domains/eu/epfc.txt
@@ -0,0 +1 @@
+EPFC - Ecole de Promotion et de Formation Continue
\ No newline at end of file
diff --git a/lib/domains/eu/imc-krems.txt b/lib/domains/eu/imc-krems.txt
new file mode 100644
index 0000000000..68c444aee4
--- /dev/null
+++ b/lib/domains/eu/imc-krems.txt
@@ -0,0 +1 @@
+FH University of Applied Sciences Krems
diff --git a/lib/domains/eu/kgs-leeste.txt b/lib/domains/eu/kgs-leeste.txt
new file mode 100644
index 0000000000..b911d7563c
--- /dev/null
+++ b/lib/domains/eu/kgs-leeste.txt
@@ -0,0 +1 @@
+Kooperative Gesamtschule Leeste
\ No newline at end of file
diff --git a/lib/domains/eu/kgshemmingen.txt b/lib/domains/eu/kgshemmingen.txt
new file mode 100644
index 0000000000..821c70a91c
--- /dev/null
+++ b/lib/domains/eu/kgshemmingen.txt
@@ -0,0 +1 @@
+KGS Hemmingen
diff --git a/lib/domains/eu/kwr-hannover.txt b/lib/domains/eu/kwr-hannover.txt
new file mode 100644
index 0000000000..925b06750a
--- /dev/null
+++ b/lib/domains/eu/kwr-hannover.txt
@@ -0,0 +1 @@
+Kaiser- Wilhelm und Ratsgymnasium
diff --git a/lib/domains/eu/liceolussana.txt b/lib/domains/eu/liceolussana.txt
new file mode 100644
index 0000000000..b28265ea43
--- /dev/null
+++ b/lib/domains/eu/liceolussana.txt
@@ -0,0 +1 @@
+Liceo Scientifico Statale F. Lussana
diff --git a/lib/domains/eu/nvna.txt b/lib/domains/eu/nvna.txt
new file mode 100644
index 0000000000..670d605a73
--- /dev/null
+++ b/lib/domains/eu/nvna.txt
@@ -0,0 +1 @@
+Nikola Vaptsarov Naval Academy - Bulgarian Maritime University
diff --git a/lib/domains/eu/obs-sottrum.txt b/lib/domains/eu/obs-sottrum.txt
new file mode 100644
index 0000000000..1bb82d4a59
--- /dev/null
+++ b/lib/domains/eu/obs-sottrum.txt
@@ -0,0 +1 @@
+Oberschule An der Wieste Sottrum
diff --git a/lib/domains/eu/rmbk.txt b/lib/domains/eu/rmbk.txt
new file mode 100644
index 0000000000..982c2ed5f8
--- /dev/null
+++ b/lib/domains/eu/rmbk.txt
@@ -0,0 +1,2 @@
+Rhein Maas Berufskolleg
+http://rmbk.de/
diff --git a/lib/domains/eu/spsjm.txt b/lib/domains/eu/spsjm.txt
new file mode 100644
index 0000000000..76aba1d081
--- /dev/null
+++ b/lib/domains/eu/spsjm.txt
@@ -0,0 +1 @@
+Stredná priemyselná škola Jozefa Murgaša, Banská Bystrica
diff --git a/lib/domains/eu/steinbart-gym.txt b/lib/domains/eu/steinbart-gym.txt
new file mode 100644
index 0000000000..bb5d25ae92
--- /dev/null
+++ b/lib/domains/eu/steinbart-gym.txt
@@ -0,0 +1 @@
+Steinbart Gymnasium Duisburg
diff --git a/lib/domains/eu/stud.vassboskovice.txt b/lib/domains/eu/stud.vassboskovice.txt
deleted file mode 100644
index 5f078881b2..0000000000
--- a/lib/domains/eu/stud.vassboskovice.txt
+++ /dev/null
@@ -1 +0,0 @@
-Vyšší odborná škola ekonomická a zdravotnická a Střední škola Boskovice, Hybešova 53
diff --git a/lib/domains/eu/teb-eu.txt b/lib/domains/eu/teb-eu.txt
new file mode 100644
index 0000000000..7ea16c246d
--- /dev/null
+++ b/lib/domains/eu/teb-eu.txt
@@ -0,0 +1 @@
+Thomas-Eßer-Berufskolleg Euskirchen
diff --git a/lib/domains/eu/tismbree.txt b/lib/domains/eu/tismbree.txt
new file mode 100644
index 0000000000..cafede721f
--- /dev/null
+++ b/lib/domains/eu/tismbree.txt
@@ -0,0 +1 @@
+TISM Bree
diff --git a/lib/domains/eu/yschools.txt b/lib/domains/eu/yschools.txt
new file mode 100644
index 0000000000..67ed80f65a
--- /dev/null
+++ b/lib/domains/eu/yschools.txt
@@ -0,0 +1 @@
+Yschools
\ No newline at end of file
diff --git a/lib/domains/fi/jedu.txt b/lib/domains/fi/jedu.txt
new file mode 100644
index 0000000000..bdf67f6550
--- /dev/null
+++ b/lib/domains/fi/jedu.txt
@@ -0,0 +1 @@
+Vocational school of Oulainen
diff --git a/lib/domains/fi/kotka/edu.txt b/lib/domains/fi/kotka/edu.txt
new file mode 100644
index 0000000000..20fd6bc33c
--- /dev/null
+++ b/lib/domains/fi/kotka/edu.txt
@@ -0,0 +1 @@
+All schools in the city of Kotka, Finland
diff --git a/lib/domains/fi/lao/edu.txt b/lib/domains/fi/lao/edu.txt
new file mode 100644
index 0000000000..f71acef7d0
--- /dev/null
+++ b/lib/domains/fi/lao/edu.txt
@@ -0,0 +1 @@
+State-run vocational schools in Lapland
diff --git a/lib/domains/fi/loimaa/edu.txt b/lib/domains/fi/loimaa/edu.txt
new file mode 100644
index 0000000000..f3f123c522
--- /dev/null
+++ b/lib/domains/fi/loimaa/edu.txt
@@ -0,0 +1 @@
+Schools in and near Loimaa,Finland
diff --git a/lib/domains/fi/lyk.txt b/lib/domains/fi/lyk.txt
new file mode 100644
index 0000000000..fbf9db3cb3
--- /dev/null
+++ b/lib/domains/fi/lyk.txt
@@ -0,0 +1 @@
+Lahden Yhteiskoulu
diff --git a/lib/domains/fi/novia/edu.txt b/lib/domains/fi/novia/edu.txt
new file mode 100644
index 0000000000..2eea14622e
--- /dev/null
+++ b/lib/domains/fi/novia/edu.txt
@@ -0,0 +1 @@
+Novia University of Applied Sciences
\ No newline at end of file
diff --git a/lib/domains/fi/redu.txt b/lib/domains/fi/redu.txt
new file mode 100644
index 0000000000..f71acef7d0
--- /dev/null
+++ b/lib/domains/fi/redu.txt
@@ -0,0 +1 @@
+State-run vocational schools in Lapland
diff --git a/lib/domains/fi/roiedu.txt b/lib/domains/fi/roiedu.txt
new file mode 100644
index 0000000000..5fc8881b77
--- /dev/null
+++ b/lib/domains/fi/roiedu.txt
@@ -0,0 +1 @@
+State-run schools of Rovaniemi
diff --git a/lib/domains/fr/asso/ict-toulouse.txt b/lib/domains/fr/asso/ict-toulouse.txt
deleted file mode 100644
index c1cd1f2571..0000000000
--- a/lib/domains/fr/asso/ict-toulouse.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institut Catholique de Toulouse
diff --git a/lib/domains/fr/bts-lachartreuse.txt b/lib/domains/fr/bts-lachartreuse.txt
index ca4bf8ff13..648d244ee9 100644
--- a/lib/domains/fr/bts-lachartreuse.txt
+++ b/lib/domains/fr/bts-lachartreuse.txt
@@ -1 +1 @@
-La chartreuse paradis
+Étudiants en BTS au pôle la chartreuse
diff --git a/lib/domains/fr/cci/sudformation.txt b/lib/domains/fr/cci/sudformation.txt
new file mode 100644
index 0000000000..bda24b9ea7
--- /dev/null
+++ b/lib/domains/fr/cci/sudformation.txt
@@ -0,0 +1 @@
+CCI Sud Formation
diff --git a/lib/domains/fr/ccicampus.txt b/lib/domains/fr/ccicampus.txt
new file mode 100644
index 0000000000..7c498ee931
--- /dev/null
+++ b/lib/domains/fr/ccicampus.txt
@@ -0,0 +1,6 @@
+-Chambre de Commerce et d'Industrie Colmar
+-Called aswell ccicampus
+-Mail are formatted like : studentId@ccicampus.fr
+
+Official website of the school:
+http://www.ccicampus.fr/
diff --git a/lib/domains/fr/cfa-insta.txt b/lib/domains/fr/cfa-insta.txt
new file mode 100644
index 0000000000..5c946cdff4
--- /dev/null
+++ b/lib/domains/fr/cfa-insta.txt
@@ -0,0 +1 @@
+Centre de formation d'apprenties Insta
diff --git a/lib/domains/fr/cnam-ara.txt b/lib/domains/fr/cnam-ara.txt
new file mode 100644
index 0000000000..c0a351af7e
--- /dev/null
+++ b/lib/domains/fr/cnam-ara.txt
@@ -0,0 +1 @@
+Conservatoire National des Arts et Métiers - Auvergne Rhône-Alpes
\ No newline at end of file
diff --git a/lib/domains/fr/collegekarr.txt b/lib/domains/fr/collegekarr.txt
new file mode 100644
index 0000000000..c432d13fff
--- /dev/null
+++ b/lib/domains/fr/collegekarr.txt
@@ -0,0 +1 @@
+Collège Alphonse Karr
diff --git a/lib/domains/fr/ecv-digital.txt b/lib/domains/fr/ecv-digital.txt
deleted file mode 100644
index d3c5199323..0000000000
--- a/lib/domains/fr/ecv-digital.txt
+++ /dev/null
@@ -1 +0,0 @@
-ECV Digital
\ No newline at end of file
diff --git a/lib/domains/fr/eerie.txt b/lib/domains/fr/eerie.txt
deleted file mode 100644
index 4cfb8a4a9d..0000000000
--- a/lib/domains/fr/eerie.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole pour les Etudes et la Recherche en Informatique et Electronique
diff --git a/lib/domains/fr/enitac.txt b/lib/domains/fr/enitac.txt
deleted file mode 100644
index 12e7237b89..0000000000
--- a/lib/domains/fr/enitac.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole Nationale d'Ingénieurs des Travaux Agricoles de Clermont-Ferrand
diff --git a/lib/domains/fr/ens-paris-saclay.txt b/lib/domains/fr/ens-paris-saclay.txt
new file mode 100644
index 0000000000..f68b12e5f4
--- /dev/null
+++ b/lib/domains/fr/ens-paris-saclay.txt
@@ -0,0 +1 @@
+ENS Paris-Saclay
diff --git a/lib/domains/fr/ensieta.txt b/lib/domains/fr/ensieta.txt
deleted file mode 100644
index befa4c30a4..0000000000
--- a/lib/domains/fr/ensieta.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole Nationale Supérieur des Ingénieur des Etudes et Techniques d'Armement
diff --git a/lib/domains/fr/ensitm.txt b/lib/domains/fr/ensitm.txt
deleted file mode 100644
index 9f0b46d293..0000000000
--- a/lib/domains/fr/ensitm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole Nationale Supérieure des Industries Textiles de Mulhouse
diff --git a/lib/domains/fr/esc-marseille.txt b/lib/domains/fr/esc-marseille.txt
deleted file mode 100644
index e726152516..0000000000
--- a/lib/domains/fr/esc-marseille.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole Supérieure de Commerce de Marseille-Provence
diff --git a/lib/domains/fr/esc-normandie.txt b/lib/domains/fr/esc-normandie.txt
deleted file mode 100644
index 907016669e..0000000000
--- a/lib/domains/fr/esc-normandie.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole Supérieure de Commerce de Le Havre/Caen
diff --git a/lib/domains/fr/etud-ices.txt b/lib/domains/fr/etud-ices.txt
new file mode 100644
index 0000000000..3f4a994034
--- /dev/null
+++ b/lib/domains/fr/etud-ices.txt
@@ -0,0 +1,2 @@
+https://ices.fr/
+Institut Catholique d'Études Supérieures
diff --git a/lib/domains/fr/ices.txt b/lib/domains/fr/ices.txt
new file mode 100644
index 0000000000..3f4a994034
--- /dev/null
+++ b/lib/domains/fr/ices.txt
@@ -0,0 +1,2 @@
+https://ices.fr/
+Institut Catholique d'Études Supérieures
diff --git a/lib/domains/fr/imie-caen.txt b/lib/domains/fr/imie-caen.txt
deleted file mode 100644
index bc530c6db5..0000000000
--- a/lib/domains/fr/imie-caen.txt
+++ /dev/null
@@ -1 +0,0 @@
-IMIE : Ecole de la Filière Numérique
diff --git a/lib/domains/fr/imie-laval.txt b/lib/domains/fr/imie-laval.txt
deleted file mode 100644
index bc530c6db5..0000000000
--- a/lib/domains/fr/imie-laval.txt
+++ /dev/null
@@ -1 +0,0 @@
-IMIE : Ecole de la Filière Numérique
diff --git a/lib/domains/fr/imie-lemans.txt b/lib/domains/fr/imie-lemans.txt
deleted file mode 100644
index bc530c6db5..0000000000
--- a/lib/domains/fr/imie-lemans.txt
+++ /dev/null
@@ -1 +0,0 @@
-IMIE : Ecole de la Filière Numérique
diff --git a/lib/domains/fr/imt-atlantique.txt b/lib/domains/fr/imt-atlantique.txt
new file mode 100644
index 0000000000..a9d694cf36
--- /dev/null
+++ b/lib/domains/fr/imt-atlantique.txt
@@ -0,0 +1 @@
+IMT Atlantique Bretagne-Pays de la Loire École Mines-Télécom
diff --git a/lib/domains/fr/institutdegenech.txt b/lib/domains/fr/institutdegenech.txt
new file mode 100644
index 0000000000..62f1bcbd1f
--- /dev/null
+++ b/lib/domains/fr/institutdegenech.txt
@@ -0,0 +1 @@
+Institut de Genech
diff --git a/lib/domains/fr/ipag.txt b/lib/domains/fr/ipag.txt
new file mode 100644
index 0000000000..b3b42bcbb2
--- /dev/null
+++ b/lib/domains/fr/ipag.txt
@@ -0,0 +1 @@
+IPAG business school - Paris, Nice, France
diff --git a/lib/domains/fr/ireste.txt b/lib/domains/fr/ireste.txt
deleted file mode 100644
index 199ff783d8..0000000000
--- a/lib/domains/fr/ireste.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institut de Recherche et d'Enseignement Supérieur aux Techniques de l'électronique
diff --git a/lib/domains/fr/isab.txt b/lib/domains/fr/isab.txt
deleted file mode 100644
index 0df0b831ce..0000000000
--- a/lib/domains/fr/isab.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institut Supérieur Agricole de Beauvais
diff --git a/lib/domains/fr/ismra.txt b/lib/domains/fr/ismra.txt
deleted file mode 100644
index 4b2d13c818..0000000000
--- a/lib/domains/fr/ismra.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institut des Sciences de la Matière et du Rayonnement
diff --git a/lib/domains/fr/itecboisfleury.txt b/lib/domains/fr/itecboisfleury.txt
new file mode 100644
index 0000000000..7e4b64f1b6
--- /dev/null
+++ b/lib/domains/fr/itecboisfleury.txt
@@ -0,0 +1 @@
+Lycée ItecBoisfleury
diff --git a/lib/domains/fr/le-campus-numerique.txt b/lib/domains/fr/le-campus-numerique.txt
new file mode 100644
index 0000000000..4d7a2a5080
--- /dev/null
+++ b/lib/domains/fr/le-campus-numerique.txt
@@ -0,0 +1 @@
+Le Campus Numérique
\ No newline at end of file
diff --git a/lib/domains/fr/lmdsio.txt b/lib/domains/fr/lmdsio.txt
new file mode 100644
index 0000000000..4746b9b64d
--- /dev/null
+++ b/lib/domains/fr/lmdsio.txt
@@ -0,0 +1 @@
+Lycée La Martinière Duchère de Lyon
diff --git a/lib/domains/fr/lyceedelasalle.txt b/lib/domains/fr/lyceedelasalle.txt
new file mode 100644
index 0000000000..2f7822955d
--- /dev/null
+++ b/lib/domains/fr/lyceedelasalle.txt
@@ -0,0 +1 @@
+lycee de La Salle
diff --git a/lib/domains/fr/lyceesudmedoc.txt b/lib/domains/fr/lyceesudmedoc.txt
new file mode 100644
index 0000000000..e5a2e82fab
--- /dev/null
+++ b/lib/domains/fr/lyceesudmedoc.txt
@@ -0,0 +1 @@
+Lycée Sud Médoc
diff --git a/lib/domains/fr/msw-lachartreuse.txt b/lib/domains/fr/msw-lachartreuse.txt
new file mode 100644
index 0000000000..6565ebc9c8
--- /dev/null
+++ b/lib/domains/fr/msw-lachartreuse.txt
@@ -0,0 +1 @@
+Étudiants en BAC+3 MSW au pôle la chartreuse
diff --git a/lib/domains/fr/netocentre b/lib/domains/fr/netocentre.txt
similarity index 100%
rename from lib/domains/fr/netocentre
rename to lib/domains/fr/netocentre.txt
diff --git a/lib/domains/fr/normandiewebschool.txt b/lib/domains/fr/normandiewebschool.txt
new file mode 100644
index 0000000000..f6251bafe8
--- /dev/null
+++ b/lib/domains/fr/normandiewebschool.txt
@@ -0,0 +1 @@
+Normandie Web School
diff --git a/lib/domains/fr/pole-lachartreuse.txt b/lib/domains/fr/pole-lachartreuse.txt
new file mode 100644
index 0000000000..acd24898e2
--- /dev/null
+++ b/lib/domains/fr/pole-lachartreuse.txt
@@ -0,0 +1 @@
+Professeurs au pôle la chartreuse
diff --git a/lib/domains/fr/rouenbs.txt b/lib/domains/fr/rouenbs.txt
new file mode 100644
index 0000000000..daaf9157c4
--- /dev/null
+++ b/lib/domains/fr/rouenbs.txt
@@ -0,0 +1,2 @@
+Rouen Business School
+Ecole Supérieure de Commerce de Rouen
diff --git a/lib/domains/fr/sorbonne-universite.txt b/lib/domains/fr/sorbonne-universite.txt
new file mode 100644
index 0000000000..81863105d8
--- /dev/null
+++ b/lib/domains/fr/sorbonne-universite.txt
@@ -0,0 +1,2 @@
+Université de la Sorbonne
+https://www.sorbonne-universite.fr/
diff --git a/lib/domains/fr/univ-lille.txt b/lib/domains/fr/univ-lille.txt
new file mode 100644
index 0000000000..9173a8e1c8
--- /dev/null
+++ b/lib/domains/fr/univ-lille.txt
@@ -0,0 +1 @@
+Université de Lille
diff --git a/lib/domains/fr/univ-st-etienne/etu.txt b/lib/domains/fr/univ-st-etienne/etu.txt
new file mode 100644
index 0000000000..3672b2c689
--- /dev/null
+++ b/lib/domains/fr/univ-st-etienne/etu.txt
@@ -0,0 +1 @@
+Université Jean Monnet
diff --git a/lib/domains/fr/uphf.txt b/lib/domains/fr/uphf.txt
new file mode 100644
index 0000000000..7cbc4f99a6
--- /dev/null
+++ b/lib/domains/fr/uphf.txt
@@ -0,0 +1 @@
+Université Polytechnique des Hauts de France
diff --git a/lib/domains/fr/uphf/etu.txt b/lib/domains/fr/uphf/etu.txt
new file mode 100644
index 0000000000..7cbc4f99a6
--- /dev/null
+++ b/lib/domains/fr/uphf/etu.txt
@@ -0,0 +1 @@
+Université Polytechnique des Hauts de France
diff --git a/lib/domains/fr/yncrea/isen-ouest.txt b/lib/domains/fr/yncrea/isen-ouest.txt
new file mode 100644
index 0000000000..50ac2d9ad0
--- /dev/null
+++ b/lib/domains/fr/yncrea/isen-ouest.txt
@@ -0,0 +1 @@
+Institut supérieur de l'électronique et du numérique Yncrea Ouest
diff --git a/lib/domains/fr/yschools.txt b/lib/domains/fr/yschools.txt
new file mode 100644
index 0000000000..67ed80f65a
--- /dev/null
+++ b/lib/domains/fr/yschools.txt
@@ -0,0 +1 @@
+Yschools
\ No newline at end of file
diff --git a/lib/domains/gm/unigambia.txt b/lib/domains/gm/unigambia.txt
deleted file mode 100644
index 7ccad27ec3..0000000000
--- a/lib/domains/gm/unigambia.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of the Gambia
diff --git a/lib/domains/gr/edu/amcstudent.txt b/lib/domains/gr/edu/amcstudent.txt
new file mode 100644
index 0000000000..05a15c83a6
--- /dev/null
+++ b/lib/domains/gr/edu/amcstudent.txt
@@ -0,0 +1,2 @@
+Μητροπολιτικό Κολλέγιο
+AMC - Metropolitan College
diff --git a/lib/domains/gr/edu/uion.txt b/lib/domains/gr/edu/uion.txt
deleted file mode 100644
index 4e396a5252..0000000000
--- a/lib/domains/gr/edu/uion.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ionian University Corfu
diff --git a/lib/domains/gr/teiste.txt b/lib/domains/gr/teiste.txt
new file mode 100644
index 0000000000..d8a9aaa08c
--- /dev/null
+++ b/lib/domains/gr/teiste.txt
@@ -0,0 +1 @@
+Technological Education Institute of Sterea Ellada
diff --git a/lib/domains/hamburg/bs-citynord.txt b/lib/domains/hamburg/bs-citynord.txt
new file mode 100644
index 0000000000..01cb501c88
--- /dev/null
+++ b/lib/domains/hamburg/bs-citynord.txt
@@ -0,0 +1,7 @@
+Berufliche Schule City Nord
+Homepage: https://www.bs28.hamburg/
+ContactSite: https://www.bs28.hamburg/kontakt/impressum.html
+Adress: Tessenowweg 3 22297 Hamburg Germany
+School Mail Example: example@bs-citynord.hamburg
+Reason for the Mail: School is using an Prowim/FirstClass https://www.prowim.de/login
+You can see contact Mail on the Homepage as a Proof At the Top on the right
diff --git a/lib/domains/hk/edu/lkpfc.txt b/lib/domains/hk/edu/lkpfc.txt
new file mode 100644
index 0000000000..6bac3c1504
--- /dev/null
+++ b/lib/domains/hk/edu/lkpfc.txt
@@ -0,0 +1 @@
+NLSI Lui Kwok Pat Fong College
diff --git a/lib/domains/hk/eduhk.txt b/lib/domains/hk/eduhk.txt
new file mode 100644
index 0000000000..2ae9fd625a
--- /dev/null
+++ b/lib/domains/hk/eduhk.txt
@@ -0,0 +1 @@
+The Education University of Hong Kong
diff --git a/lib/domains/hr/aspira.txt b/lib/domains/hr/aspira.txt
new file mode 100644
index 0000000000..bc6c1e1381
--- /dev/null
+++ b/lib/domains/hr/aspira.txt
@@ -0,0 +1 @@
+Visoka škola Aspira
diff --git a/lib/domains/hr/ferit.txt b/lib/domains/hr/ferit.txt
new file mode 100644
index 0000000000..cc2fed5a09
--- /dev/null
+++ b/lib/domains/hr/ferit.txt
@@ -0,0 +1 @@
+University of Osijek Faculty of Electrical Engineering
diff --git a/lib/domains/hr/ffst.txt b/lib/domains/hr/ffst.txt
new file mode 100644
index 0000000000..44083caa53
--- /dev/null
+++ b/lib/domains/hr/ffst.txt
@@ -0,0 +1 @@
+Faculty of Humanities and Social Sciences, University of Split
diff --git a/lib/domains/hr/pravos.txt b/lib/domains/hr/pravos.txt
new file mode 100644
index 0000000000..1f377d7bcb
--- /dev/null
+++ b/lib/domains/hr/pravos.txt
@@ -0,0 +1 @@
+University of Osijek Faculty of Law
diff --git a/lib/domains/hr/vsmti.txt b/lib/domains/hr/vsmti.txt
new file mode 100644
index 0000000000..4b6ce45110
--- /dev/null
+++ b/lib/domains/hr/vsmti.txt
@@ -0,0 +1 @@
+Virovitica College
diff --git a/lib/domains/hu/lauder.txt b/lib/domains/hu/lauder.txt
new file mode 100644
index 0000000000..a1759e795d
--- /dev/null
+++ b/lib/domains/hu/lauder.txt
@@ -0,0 +1 @@
+Lauder Javne Jewish school
diff --git a/lib/domains/hu/pataky.txt b/lib/domains/hu/pataky.txt
new file mode 100644
index 0000000000..81318670ab
--- /dev/null
+++ b/lib/domains/hu/pataky.txt
@@ -0,0 +1,2 @@
+Budapesti Műszaki Szakképző Centrum Pataky István Híradásipari és Informatikai Szakgimnáziuma
+ 
diff --git a/lib/domains/hu/szjgdebrecen.txt b/lib/domains/hu/szjgdebrecen.txt
new file mode 100644
index 0000000000..2592e0375d
--- /dev/null
+++ b/lib/domains/hu/szjgdebrecen.txt
@@ -0,0 +1 @@
+Szent József Általános Iskola, Gimnázium, Szakgimnázium és Kollégium
diff --git a/lib/domains/hu/uni-sopron.txt b/lib/domains/hu/uni-sopron.txt
new file mode 100644
index 0000000000..14652948ad
--- /dev/null
+++ b/lib/domains/hu/uni-sopron.txt
@@ -0,0 +1 @@
+University of Sopron
diff --git a/lib/domains/id/ac/akakom.txt b/lib/domains/id/ac/akakom.txt
new file mode 100644
index 0000000000..5b17dd3a19
--- /dev/null
+++ b/lib/domains/id/ac/akakom.txt
@@ -0,0 +1 @@
+STMIK Akakom Yogyakarta
diff --git a/lib/domains/id/ac/aknsumenep.txt b/lib/domains/id/ac/aknsumenep.txt
new file mode 100644
index 0000000000..1626b677c9
--- /dev/null
+++ b/lib/domains/id/ac/aknsumenep.txt
@@ -0,0 +1 @@
+Akademi Komunitas Negeri Sumenep
\ No newline at end of file
diff --git a/lib/domains/id/ac/binadarma.txt b/lib/domains/id/ac/binadarma.txt
new file mode 100644
index 0000000000..90dd474b2f
--- /dev/null
+++ b/lib/domains/id/ac/binadarma.txt
@@ -0,0 +1 @@
+Universitas Bina Darma
\ No newline at end of file
diff --git a/lib/domains/id/ac/budiluhur.txt b/lib/domains/id/ac/budiluhur.txt
new file mode 100644
index 0000000000..f9ce4c6b1b
--- /dev/null
+++ b/lib/domains/id/ac/budiluhur.txt
@@ -0,0 +1 @@
+Universitas Budi Luhur
diff --git a/lib/domains/id/ac/del.txt b/lib/domains/id/ac/del.txt
new file mode 100644
index 0000000000..14e117cf52
--- /dev/null
+++ b/lib/domains/id/ac/del.txt
@@ -0,0 +1 @@
+Institut Teknologi Del
diff --git a/lib/domains/id/ac/ithb.txt b/lib/domains/id/ac/ithb.txt
new file mode 100644
index 0000000000..e3d19398c6
--- /dev/null
+++ b/lib/domains/id/ac/ithb.txt
@@ -0,0 +1 @@
+Institut Teknologi Harapan Bangsa
\ No newline at end of file
diff --git a/lib/domains/id/ac/mikroskil.txt b/lib/domains/id/ac/mikroskil.txt
new file mode 100644
index 0000000000..a9f0af0bb0
--- /dev/null
+++ b/lib/domains/id/ac/mikroskil.txt
@@ -0,0 +1 @@
+STMIK - STIE Mikroskil
\ No newline at end of file
diff --git a/lib/domains/id/ac/president.txt b/lib/domains/id/ac/president.txt
new file mode 100644
index 0000000000..1c0a4f0981
--- /dev/null
+++ b/lib/domains/id/ac/president.txt
@@ -0,0 +1 @@
+President University
diff --git a/lib/domains/id/ac/sbm-itb.txt b/lib/domains/id/ac/sbm-itb.txt
new file mode 100644
index 0000000000..056ecb24ac
--- /dev/null
+++ b/lib/domains/id/ac/sbm-itb.txt
@@ -0,0 +1 @@
+School of Business and Management - Institut Teknologi Bandung
diff --git a/lib/domains/id/ac/stimednp.txt b/lib/domains/id/ac/stimednp.txt
new file mode 100644
index 0000000000..362b8a90f3
--- /dev/null
+++ b/lib/domains/id/ac/stimednp.txt
@@ -0,0 +1 @@
+STIMED Nusa Palapa
diff --git a/lib/domains/id/ac/surya.txt b/lib/domains/id/ac/surya.txt
new file mode 100644
index 0000000000..7867a5714d
--- /dev/null
+++ b/lib/domains/id/ac/surya.txt
@@ -0,0 +1 @@
+Universitas Surya
diff --git a/lib/domains/id/ac/uda.txt b/lib/domains/id/ac/uda.txt
deleted file mode 100644
index 9fe22220af..0000000000
--- a/lib/domains/id/ac/uda.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universitas Darma Agung
diff --git a/lib/domains/id/ac/uin-alauddin.txt b/lib/domains/id/ac/uin-alauddin.txt
new file mode 100644
index 0000000000..fb7664a9c4
--- /dev/null
+++ b/lib/domains/id/ac/uin-alauddin.txt
@@ -0,0 +1 @@
+Universitas Islam Alauddin
diff --git a/lib/domains/id/ac/uin-suska.txt b/lib/domains/id/ac/uin-suska.txt
new file mode 100644
index 0000000000..78c4f929e2
--- /dev/null
+++ b/lib/domains/id/ac/uin-suska.txt
@@ -0,0 +1 @@
+Universitas Islam Negeri Sultan Syarif Kasim Riau
diff --git a/lib/domains/id/ac/ump.txt b/lib/domains/id/ac/ump.txt
new file mode 100644
index 0000000000..bb8fe474e2
--- /dev/null
+++ b/lib/domains/id/ac/ump.txt
@@ -0,0 +1 @@
+Universitas Muhammadiyah Purwokerto
diff --git a/lib/domains/id/ac/uncen.txt b/lib/domains/id/ac/uncen.txt
deleted file mode 100644
index 84de202d9a..0000000000
--- a/lib/domains/id/ac/uncen.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universitas Cenderawasih
diff --git a/lib/domains/id/ac/unicen.txt b/lib/domains/id/ac/unicen.txt
deleted file mode 100644
index 84de202d9a..0000000000
--- a/lib/domains/id/ac/unicen.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universitas Cenderawasih
diff --git a/lib/domains/id/ac/upi.txt b/lib/domains/id/ac/upi.txt
deleted file mode 100644
index 3687c551c2..0000000000
--- a/lib/domains/id/ac/upi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universitas Pendidikan Indonesia
diff --git a/lib/domains/id/ac/utidar.txt b/lib/domains/id/ac/utidar.txt
deleted file mode 100644
index 51d792748c..0000000000
--- a/lib/domains/id/ac/utidar.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universitas Tidar Magelang
diff --git a/lib/domains/id/or/bisedu.txt b/lib/domains/id/or/bisedu.txt
new file mode 100644
index 0000000000..42773f9d5f
--- /dev/null
+++ b/lib/domains/id/or/bisedu.txt
@@ -0,0 +1 @@
+Bandung Independent School
diff --git a/lib/domains/id/or/jisedu.txt b/lib/domains/id/or/jisedu.txt
new file mode 100644
index 0000000000..3ebbbae57a
--- /dev/null
+++ b/lib/domains/id/or/jisedu.txt
@@ -0,0 +1 @@
+Jakarta Intercultural School
\ No newline at end of file
diff --git a/lib/domains/ie/cbcg.txt b/lib/domains/ie/cbcg.txt
new file mode 100644
index 0000000000..bb9e9a937a
--- /dev/null
+++ b/lib/domains/ie/cbcg.txt
@@ -0,0 +1 @@
+Coláite Bhaile Chláir
diff --git a/lib/domains/ie/cct.txt b/lib/domains/ie/cct.txt
new file mode 100644
index 0000000000..e89002fdb3
--- /dev/null
+++ b/lib/domains/ie/cct.txt
@@ -0,0 +1 @@
+CCT College Dublin
diff --git a/lib/domains/ie/stmc.txt b/lib/domains/ie/stmc.txt
new file mode 100644
index 0000000000..e2c823b720
--- /dev/null
+++ b/lib/domains/ie/stmc.txt
@@ -0,0 +1,2 @@
+St. Michael's College
+www.stmc.ie
diff --git a/lib/domains/il/ac/ash-college.txt b/lib/domains/il/ac/ash-college.txt
deleted file mode 100644
index dc6eba46b6..0000000000
--- a/lib/domains/il/ac/ash-college.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ashkelon Academic College
diff --git a/lib/domains/il/ac/technion/campus.txt b/lib/domains/il/ac/technion/campus.txt
new file mode 100644
index 0000000000..6d1605888d
--- /dev/null
+++ b/lib/domains/il/ac/technion/campus.txt
@@ -0,0 +1,3 @@
+Russell Berrie Nanotechnology Institute
+Technion - Israel Institute of Technology
+Official Website - https://www.technion.ac.il/
diff --git a/lib/domains/il/org/ort/ebin.txt b/lib/domains/il/org/ort/ebin.txt
new file mode 100644
index 0000000000..feceff5505
--- /dev/null
+++ b/lib/domains/il/org/ort/ebin.txt
@@ -0,0 +1 @@
+Ort Ebin High School
diff --git a/lib/domains/in/ac/bbit.txt b/lib/domains/in/ac/bbit.txt
new file mode 100644
index 0000000000..d0cd1335b6
--- /dev/null
+++ b/lib/domains/in/ac/bbit.txt
@@ -0,0 +1 @@
+Bhailalbhai & Bhikhabhai Institute of Technology - BBIT, Vallabh Vidya Nagar, Anand, Gujarat
diff --git a/lib/domains/in/ac/charusat.txt b/lib/domains/in/ac/charusat.txt
new file mode 100644
index 0000000000..e494b64958
--- /dev/null
+++ b/lib/domains/in/ac/charusat.txt
@@ -0,0 +1 @@
+Charotar University Of Science And Technology
\ No newline at end of file
diff --git a/lib/domains/in/ac/ganpatuniversity.txt b/lib/domains/in/ac/ganpatuniversity.txt
new file mode 100644
index 0000000000..cc8856c60f
--- /dev/null
+++ b/lib/domains/in/ac/ganpatuniversity.txt
@@ -0,0 +1 @@
+Ganpat University, Mehsana, Gujarat
diff --git a/lib/domains/in/ac/gauhati.txt b/lib/domains/in/ac/gauhati.txt
new file mode 100644
index 0000000000..aa8456ab4c
--- /dev/null
+++ b/lib/domains/in/ac/gauhati.txt
@@ -0,0 +1 @@
+Gauhati University, Guwahati, Assam
diff --git a/lib/domains/in/ac/gecdahod.txt b/lib/domains/in/ac/gecdahod.txt
deleted file mode 100644
index 586618037a..0000000000
--- a/lib/domains/in/ac/gecdahod.txt
+++ /dev/null
@@ -1 +0,0 @@
-Government Engineering College Dahod
diff --git a/lib/domains/in/ac/iare.txt b/lib/domains/in/ac/iare.txt
new file mode 100644
index 0000000000..d1c158a2cd
--- /dev/null
+++ b/lib/domains/in/ac/iare.txt
@@ -0,0 +1 @@
+Institute of Aeronautical Engineering, Hyderabad
diff --git a/lib/domains/in/ac/iima.txt b/lib/domains/in/ac/iima.txt
new file mode 100644
index 0000000000..8dc0fce8ff
--- /dev/null
+++ b/lib/domains/in/ac/iima.txt
@@ -0,0 +1 @@
+Indian Institute of Management Ahmedabad
diff --git a/lib/domains/in/ac/knit.txt b/lib/domains/in/ac/knit.txt
new file mode 100644
index 0000000000..4f934224fa
--- /dev/null
+++ b/lib/domains/in/ac/knit.txt
@@ -0,0 +1 @@
+KNIT Sultanpur
diff --git a/lib/domains/in/ac/myamu.txt b/lib/domains/in/ac/myamu.txt
new file mode 100644
index 0000000000..31f3182e63
--- /dev/null
+++ b/lib/domains/in/ac/myamu.txt
@@ -0,0 +1 @@
+Aligarh Muslim University, Aligarh
diff --git a/lib/domains/in/ac/smvdu.txt b/lib/domains/in/ac/smvdu.txt
new file mode 100644
index 0000000000..6985a0105b
--- /dev/null
+++ b/lib/domains/in/ac/smvdu.txt
@@ -0,0 +1 @@
+Shri Mata Vaishno Devi University
\ No newline at end of file
diff --git a/lib/domains/in/ac/utu.txt b/lib/domains/in/ac/utu.txt
new file mode 100644
index 0000000000..30c70d83a5
--- /dev/null
+++ b/lib/domains/in/ac/utu.txt
@@ -0,0 +1 @@
+Uka Tarsadia University
diff --git a/lib/domains/in/ac/velsuniv.txt b/lib/domains/in/ac/velsuniv.txt
new file mode 100644
index 0000000000..2ea60a7e78
--- /dev/null
+++ b/lib/domains/in/ac/velsuniv.txt
@@ -0,0 +1,3 @@
+Vels Institute of Science, Technology & Advanced Studies(VISTAS)
+Vels University
+velsuniv.ac.in
diff --git a/lib/domains/in/ac/vnsgu.txt b/lib/domains/in/ac/vnsgu.txt
new file mode 100644
index 0000000000..140b1f9f81
--- /dev/null
+++ b/lib/domains/in/ac/vnsgu.txt
@@ -0,0 +1 @@
+Veer Narmad South Gujarat University
diff --git a/lib/domains/in/adhiyamaan.txt b/lib/domains/in/adhiyamaan.txt
new file mode 100644
index 0000000000..cc53a0dcbb
--- /dev/null
+++ b/lib/domains/in/adhiyamaan.txt
@@ -0,0 +1 @@
+Adhiyamaan College of Engineering
diff --git a/lib/domains/in/ajce.txt b/lib/domains/in/ajce.txt
new file mode 100644
index 0000000000..8277afce05
--- /dev/null
+++ b/lib/domains/in/ajce.txt
@@ -0,0 +1 @@
+Amal Jyothi College of Engineering, Kanjirappally
diff --git a/lib/domains/in/bmsit.txt b/lib/domains/in/bmsit.txt
new file mode 100644
index 0000000000..eedb4b847a
--- /dev/null
+++ b/lib/domains/in/bmsit.txt
@@ -0,0 +1 @@
+BMS Institute of Technology and Management, Bengaluru
diff --git a/lib/domains/in/campusuvce.txt b/lib/domains/in/campusuvce.txt
new file mode 100644
index 0000000000..d29384ca88
--- /dev/null
+++ b/lib/domains/in/campusuvce.txt
@@ -0,0 +1 @@
+Univerity Visvesvaraya College of Engineering
diff --git a/lib/domains/in/co/ggct.txt b/lib/domains/in/co/ggct.txt
new file mode 100644
index 0000000000..b379e6be44
--- /dev/null
+++ b/lib/domains/in/co/ggct.txt
@@ -0,0 +1 @@
+Gyan Gang College of Technology
diff --git a/lib/domains/in/ctuniversity.txt b/lib/domains/in/ctuniversity.txt
new file mode 100644
index 0000000000..6f393ca751
--- /dev/null
+++ b/lib/domains/in/ctuniversity.txt
@@ -0,0 +1 @@
+Chandigarh Technical University
diff --git a/lib/domains/in/edu/charusat.txt b/lib/domains/in/edu/charusat.txt
new file mode 100644
index 0000000000..e494b64958
--- /dev/null
+++ b/lib/domains/in/edu/charusat.txt
@@ -0,0 +1 @@
+Charotar University Of Science And Technology
\ No newline at end of file
diff --git a/lib/domains/in/edu/svvv.txt b/lib/domains/in/edu/svvv.txt
new file mode 100644
index 0000000000..83be1f63c1
--- /dev/null
+++ b/lib/domains/in/edu/svvv.txt
@@ -0,0 +1,2 @@
+Shri Vaishnav Vidyapeeth Vishwavidyalaya, Indore
+Shri Vaishnav Institute of Technology and Science, Indore
diff --git a/lib/domains/in/iiits.txt b/lib/domains/in/iiits.txt
index c2eed803ca..aeb0ef169e 100644
--- a/lib/domains/in/iiits.txt
+++ b/lib/domains/in/iiits.txt
@@ -1 +1,2 @@
-Indian Institute of Information Technology, Sri City
\ No newline at end of file
+Indian Institute of Information Technology, Sri City
+Indian Institute of Information Technology, Bangalore
diff --git a/lib/domains/in/indusuniversity/iict.txt b/lib/domains/in/indusuniversity/iict.txt
new file mode 100644
index 0000000000..68b47acd2c
--- /dev/null
+++ b/lib/domains/in/indusuniversity/iict.txt
@@ -0,0 +1 @@
+Institute of Information & Communication Technology, Ahmedabad
\ No newline at end of file
diff --git a/lib/domains/in/jadavpuruniversity.txt b/lib/domains/in/jadavpuruniversity.txt
new file mode 100644
index 0000000000..0f8156dfa6
--- /dev/null
+++ b/lib/domains/in/jadavpuruniversity.txt
@@ -0,0 +1 @@
+Jadavpur University
diff --git a/lib/domains/in/mcet.txt b/lib/domains/in/mcet.txt
new file mode 100644
index 0000000000..316aeabfd7
--- /dev/null
+++ b/lib/domains/in/mcet.txt
@@ -0,0 +1 @@
+Dr.Mahalingam College of Engineering and Technology, Pollachi.
diff --git a/lib/domains/in/org/sce.txt b/lib/domains/in/org/sce.txt
new file mode 100644
index 0000000000..d623392018
--- /dev/null
+++ b/lib/domains/in/org/sce.txt
@@ -0,0 +1 @@
+Shivalik College of Engineering Dehradun
diff --git a/lib/domains/in/puibm.txt b/lib/domains/in/puibm.txt
new file mode 100644
index 0000000000..ef747e6f08
--- /dev/null
+++ b/lib/domains/in/puibm.txt
@@ -0,0 +1 @@
+IBM-Innovation Centre for Education, People's University, Bhopal (MP)
diff --git a/lib/domains/in/sdmit.txt b/lib/domains/in/sdmit.txt
new file mode 100644
index 0000000000..f614fff646
--- /dev/null
+++ b/lib/domains/in/sdmit.txt
@@ -0,0 +1,2 @@
+Sri Dharmasthala Manjunatheshwara Institute of Technology
+SDM Institute of Technology
diff --git a/lib/domains/in/sode-edu.txt b/lib/domains/in/sode-edu.txt
new file mode 100644
index 0000000000..d8d8f55c8c
--- /dev/null
+++ b/lib/domains/in/sode-edu.txt
@@ -0,0 +1 @@
+Shri Madhwa Vadiraja Institute of Technology and Management
diff --git a/lib/domains/in/sscasc.txt b/lib/domains/in/sscasc.txt
deleted file mode 100644
index 0c5ce81d9d..0000000000
--- a/lib/domains/in/sscasc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sree Siddaganga College of Arts Science and Commerce
diff --git a/lib/domains/info/gymsob.txt b/lib/domains/info/gymsob.txt
new file mode 100644
index 0000000000..61e9555a07
--- /dev/null
+++ b/lib/domains/info/gymsob.txt
@@ -0,0 +1 @@
+Gymnasium Schrobenhausen
diff --git a/lib/domains/info/whsg.txt b/lib/domains/info/whsg.txt
new file mode 100644
index 0000000000..ec0209a0d7
--- /dev/null
+++ b/lib/domains/info/whsg.txt
@@ -0,0 +1 @@
+Westcliff Highschool for Girls
diff --git a/lib/domains/iq/edu/soran.txt b/lib/domains/iq/edu/soran.txt
new file mode 100644
index 0000000000..0e40807adf
--- /dev/null
+++ b/lib/domains/iq/edu/soran.txt
@@ -0,0 +1 @@
+Soran University
\ No newline at end of file
diff --git a/lib/domains/iq/edu/spu.txt b/lib/domains/iq/edu/spu.txt
new file mode 100644
index 0000000000..2a2cae1800
--- /dev/null
+++ b/lib/domains/iq/edu/spu.txt
@@ -0,0 +1 @@
+Sulaimaniya Polytechnic University
\ No newline at end of file
diff --git a/lib/domains/iq/edu/univsul.txt b/lib/domains/iq/edu/univsul.txt
new file mode 100644
index 0000000000..08fc3ae0d2
--- /dev/null
+++ b/lib/domains/iq/edu/univsul.txt
@@ -0,0 +1 @@
+University of Sulaimani
\ No newline at end of file
diff --git a/lib/domains/ir/ac/sbu.txt b/lib/domains/ir/ac/sbu.txt
index d5ce239d0a..4bd6ddc481 100644
--- a/lib/domains/ir/ac/sbu.txt
+++ b/lib/domains/ir/ac/sbu.txt
@@ -1 +1 @@
-Shaheed Beheshti University
+Shahid Beheshti University
diff --git a/lib/domains/ir/ac/sbu/mail.txt b/lib/domains/ir/ac/sbu/mail.txt
deleted file mode 100644
index 4bd6ddc481..0000000000
--- a/lib/domains/ir/ac/sbu/mail.txt
+++ /dev/null
@@ -1 +0,0 @@
-Shahid Beheshti University
diff --git a/lib/domains/ir/ac/sharif.txt b/lib/domains/ir/ac/sharif.txt
deleted file mode 100644
index a4eafdf78e..0000000000
--- a/lib/domains/ir/ac/sharif.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sharif University of Technology
diff --git a/lib/domains/it/fermielearning.txt b/lib/domains/it/fermielearning.txt
new file mode 100644
index 0000000000..bca8682fd3
--- /dev/null
+++ b/lib/domains/it/fermielearning.txt
@@ -0,0 +1,2 @@
+Istituto Tecnico Tecnologico Enrico Fermi
+ Enrico Fermi Technological Technological Institute
diff --git a/lib/domains/it/gov/iisgiorgimilano.txt b/lib/domains/it/gov/iisgiorgimilano.txt
new file mode 100644
index 0000000000..ebb638c725
--- /dev/null
+++ b/lib/domains/it/gov/iisgiorgimilano.txt
@@ -0,0 +1 @@
+"IIS Giovanni Giorgi Milano" High School - http://iisgiorgimilano.gov.it/
diff --git a/lib/domains/it/gov/itiszuccante.txt b/lib/domains/it/gov/itiszuccante.txt
new file mode 100644
index 0000000000..c81b9e96ae
--- /dev/null
+++ b/lib/domains/it/gov/itiszuccante.txt
@@ -0,0 +1 @@
+ITIS Carlo Zuccante
\ No newline at end of file
diff --git a/lib/domains/it/gov/paciolo-dannunzio.txt b/lib/domains/it/gov/paciolo-dannunzio.txt
new file mode 100644
index 0000000000..f74d2ac971
--- /dev/null
+++ b/lib/domains/it/gov/paciolo-dannunzio.txt
@@ -0,0 +1 @@
+IISS Paciolo D'Annunzio - http://www.paciolo-dannunzio.gov.it
diff --git a/lib/domains/it/gov/racchettidavinci.txt b/lib/domains/it/gov/racchettidavinci.txt
new file mode 100644
index 0000000000..d141612228
--- /dev/null
+++ b/lib/domains/it/gov/racchettidavinci.txt
@@ -0,0 +1 @@
+"Liceo Racchetti da Vinci"  https://www.racchettidavinci.gov.it
diff --git a/lib/domains/it/iaad.txt b/lib/domains/it/iaad.txt
new file mode 100644
index 0000000000..229b3f44ed
--- /dev/null
+++ b/lib/domains/it/iaad.txt
@@ -0,0 +1 @@
+Istituto d'Arte Applicata e Design
diff --git a/lib/domains/it/istruzioneer/paciunzio.txt b/lib/domains/it/istruzioneer/paciunzio.txt
new file mode 100644
index 0000000000..60ea3f36ea
--- /dev/null
+++ b/lib/domains/it/istruzioneer/paciunzio.txt
@@ -0,0 +1 @@
+Domain of IISS Paciolo Dannunzio | e-mail example: <last_name>.<first_name>@paciunzio.istruzioneer.it
diff --git a/lib/domains/it/mcurie.txt b/lib/domains/it/mcurie.txt
new file mode 100644
index 0000000000..eb9a244ca0
--- /dev/null
+++ b/lib/domains/it/mcurie.txt
@@ -0,0 +1,6 @@
+Istituto di Istruzione Secondaria Superiore "Marie Curie", Via Togliatti 5, 47039 Savignano sul Rubicone (FC)
+Institutional mail : fois001002@istruzione.it
+Institutional code : FOIS001002
+Official website: https://www.mcurie.gov.it/
+URL of courses with IT: https://www.mcurie.gov.it/quadro-orario-liceo.html (The second table)
+PDF about official email domain for students: https://www.mcurie.gov.it/component/k2/item/download/3351_a9700b4d7736f885529319f0c15520e0.html
diff --git a/lib/domains/it/pr/itis.txt b/lib/domains/it/pr/itis.txt
new file mode 100644
index 0000000000..7589ac4c2c
--- /dev/null
+++ b/lib/domains/it/pr/itis.txt
@@ -0,0 +1 @@
+ITIS Leonardo da Vinci
diff --git a/lib/domains/it/snets.txt b/lib/domains/it/snets.txt
new file mode 100644
index 0000000000..e41b3a25a2
--- /dev/null
+++ b/lib/domains/it/snets.txt
@@ -0,0 +1 @@
+Schulnetz Südtirol
diff --git a/lib/domains/it/suedtirol/schule.txt b/lib/domains/it/suedtirol/schule.txt
new file mode 100644
index 0000000000..3541b01052
--- /dev/null
+++ b/lib/domains/it/suedtirol/schule.txt
@@ -0,0 +1 @@
+Oberschulzentrum J. Ph. Fallmerayer
\ No newline at end of file
diff --git a/lib/domains/it/tn/artigianelli.txt b/lib/domains/it/tn/artigianelli.txt
new file mode 100644
index 0000000000..cbe55c4b49
--- /dev/null
+++ b/lib/domains/it/tn/artigianelli.txt
@@ -0,0 +1 @@
+Istituto Pavoniano Artigianelli
diff --git a/lib/domains/it/tn/buonarroti.txt b/lib/domains/it/tn/buonarroti.txt
new file mode 100644
index 0000000000..9560bcd2ac
--- /dev/null
+++ b/lib/domains/it/tn/buonarroti.txt
@@ -0,0 +1 @@
+Istituto Tecnico Tecnologico Buonarroti-Pozzo
diff --git a/lib/domains/jo/edu/alzaytoonah.txt b/lib/domains/jo/edu/alzaytoonah.txt
deleted file mode 100644
index 1da7ef6130..0000000000
--- a/lib/domains/jo/edu/alzaytoonah.txt
+++ /dev/null
@@ -1 +0,0 @@
-Al-Zaytoonah University
diff --git a/lib/domains/jo/edu/isra.txt b/lib/domains/jo/edu/isra.txt
deleted file mode 100644
index 527a079407..0000000000
--- a/lib/domains/jo/edu/isra.txt
+++ /dev/null
@@ -1 +0,0 @@
-Al-Isra University
diff --git a/lib/domains/jo/edu/jerashun.txt b/lib/domains/jo/edu/jerashun.txt
deleted file mode 100644
index d8c83fbc2b..0000000000
--- a/lib/domains/jo/edu/jerashun.txt
+++ /dev/null
@@ -1 +0,0 @@
-Jerash Private University
diff --git a/lib/domains/jo/edu/nyit.txt b/lib/domains/jo/edu/nyit.txt
deleted file mode 100644
index d4beaf5649..0000000000
--- a/lib/domains/jo/edu/nyit.txt
+++ /dev/null
@@ -1 +0,0 @@
-New York Institute of Technology
diff --git a/lib/domains/jp/ac/harada-gakuen/ca.txt b/lib/domains/jp/ac/harada-gakuen/ca.txt
new file mode 100644
index 0000000000..61332dca3b
--- /dev/null
+++ b/lib/domains/jp/ac/harada-gakuen/ca.txt
@@ -0,0 +1 @@
+Kagoshima Career Design College
diff --git a/lib/domains/jp/ac/shibaura-it.txt b/lib/domains/jp/ac/shibaura-it.txt
new file mode 100644
index 0000000000..021ff8c653
--- /dev/null
+++ b/lib/domains/jp/ac/shibaura-it.txt
@@ -0,0 +1 @@
+Shibaura Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/jp/ac/kanagawa-u.txt b/lib/domains/jp/jindai.txt
similarity index 100%
rename from lib/domains/jp/ac/kanagawa-u.txt
rename to lib/domains/jp/jindai.txt
diff --git a/lib/domains/jp/kadai.txt b/lib/domains/jp/kadai.txt
new file mode 100644
index 0000000000..9ba82cee05
--- /dev/null
+++ b/lib/domains/jp/kadai.txt
@@ -0,0 +1 @@
+Kagoshima University
diff --git a/lib/domains/jp/kansaigaidai.txt b/lib/domains/jp/kansaigaidai.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/lib/domains/jp/kansaigaidai.txt
@@ -0,0 +1 @@
+
diff --git a/lib/domains/jp/kosen-ac/kumamoto.txt b/lib/domains/jp/kosen-ac/kumamoto.txt
new file mode 100644
index 0000000000..5e42416bcf
--- /dev/null
+++ b/lib/domains/jp/kosen-ac/kumamoto.txt
@@ -0,0 +1,4 @@
+National Institute of Technology, Kumamoto College
+
+- http://www.kumamoto-nct.ac.jp/ (Homepage)
+- @g.kumamoto-nct.ac.jp and @kumamoto.kosen-ac.jp (Student's email address)
diff --git a/lib/domains/jp/kosen-ac/kurume.txt b/lib/domains/jp/kosen-ac/kurume.txt
new file mode 100644
index 0000000000..1193f86223
--- /dev/null
+++ b/lib/domains/jp/kosen-ac/kurume.txt
@@ -0,0 +1 @@
+National Institute of Technology, Kurume College
\ No newline at end of file
diff --git a/lib/domains/jp/kosen-ac/niihama.txt b/lib/domains/jp/kosen-ac/niihama.txt
new file mode 100644
index 0000000000..6fbe4205af
--- /dev/null
+++ b/lib/domains/jp/kosen-ac/niihama.txt
@@ -0,0 +1 @@
+National Institute of Technology, Niihama College
diff --git a/lib/domains/jp/kosen-ac/numazu.txt b/lib/domains/jp/kosen-ac/numazu.txt
new file mode 100644
index 0000000000..dcc9baceb4
--- /dev/null
+++ b/lib/domains/jp/kosen-ac/numazu.txt
@@ -0,0 +1 @@
+National Institute of Technology, Numazu College
diff --git a/lib/domains/jp/kosen-ac/tsuyama.txt b/lib/domains/jp/kosen-ac/tsuyama.txt
new file mode 100644
index 0000000000..a854dcdccb
--- /dev/null
+++ b/lib/domains/jp/kosen-ac/tsuyama.txt
@@ -0,0 +1 @@
+National Institute of Technology, Tsuyama College
diff --git a/lib/domains/ke/ac/iu.txt b/lib/domains/ke/ac/iu.txt
deleted file mode 100644
index 3e066da174..0000000000
--- a/lib/domains/ke/ac/iu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Inoorero University
diff --git a/lib/domains/ke/ac/mombasapoly.txt b/lib/domains/ke/ac/mombasapoly.txt
deleted file mode 100644
index 975b6fa7a2..0000000000
--- a/lib/domains/ke/ac/mombasapoly.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mombasa Polytechnic
diff --git a/lib/domains/kg/edu/ami.txt b/lib/domains/kg/edu/ami.txt
deleted file mode 100644
index 3c6e75827a..0000000000
--- a/lib/domains/kg/edu/ami.txt
+++ /dev/null
@@ -1 +0,0 @@
-Asian Medical Institute
diff --git a/lib/domains/kg/edu/ksnu.txt b/lib/domains/kg/edu/ksnu.txt
deleted file mode 100644
index 593c221da3..0000000000
--- a/lib/domains/kg/edu/ksnu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kyrgyz State National University
diff --git a/lib/domains/kg/edu/kspu.txt b/lib/domains/kg/edu/kspu.txt
deleted file mode 100644
index 185034c0f4..0000000000
--- a/lib/domains/kg/edu/kspu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Arabaev Kyrgyz State Pedagogical University
diff --git a/lib/domains/kn/edu/iugrad.txt b/lib/domains/kn/edu/iugrad.txt
deleted file mode 100644
index bdc9cbb21b..0000000000
--- a/lib/domains/kn/edu/iugrad.txt
+++ /dev/null
@@ -1 +0,0 @@
-International University for Graduate Studies
diff --git a/lib/domains/kr/ac/cheju-e.txt b/lib/domains/kr/ac/cheju-e.txt
deleted file mode 100644
index 6324166f6c..0000000000
--- a/lib/domains/kr/ac/cheju-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Cheju National University of Education
diff --git a/lib/domains/kr/ac/chinju-e.txt b/lib/domains/kr/ac/chinju-e.txt
deleted file mode 100644
index 7f41889779..0000000000
--- a/lib/domains/kr/ac/chinju-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chinju National University of Education
diff --git a/lib/domains/kr/ac/chinju.txt b/lib/domains/kr/ac/chinju.txt
deleted file mode 100644
index 61dff29d45..0000000000
--- a/lib/domains/kr/ac/chinju.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chinju National University
diff --git a/lib/domains/kr/ac/chonju-e.txt b/lib/domains/kr/ac/chonju-e.txt
deleted file mode 100644
index d70912c482..0000000000
--- a/lib/domains/kr/ac/chonju-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chonju National University of Education
diff --git a/lib/domains/kr/ac/chungju.txt b/lib/domains/kr/ac/chungju.txt
deleted file mode 100644
index 2635e3b850..0000000000
--- a/lib/domains/kr/ac/chungju.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chung-Ju National University
diff --git a/lib/domains/kr/ac/cnue-e.txt b/lib/domains/kr/ac/cnue-e.txt
deleted file mode 100644
index 0c9743a524..0000000000
--- a/lib/domains/kr/ac/cnue-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chunchon National University of Education
diff --git a/lib/domains/kr/ac/daebul.txt b/lib/domains/kr/ac/daebul.txt
deleted file mode 100644
index e50768c7f7..0000000000
--- a/lib/domains/kr/ac/daebul.txt
+++ /dev/null
@@ -1 +0,0 @@
-Daebul University
diff --git a/lib/domains/kr/ac/inchon-e.txt b/lib/domains/kr/ac/inchon-e.txt
deleted file mode 100644
index 2bd839a165..0000000000
--- a/lib/domains/kr/ac/inchon-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Inchon National University of Education
diff --git a/lib/domains/kr/ac/kimpo.txt b/lib/domains/kr/ac/kimpo.txt
new file mode 100644
index 0000000000..48a8105bcf
--- /dev/null
+++ b/lib/domains/kr/ac/kimpo.txt
@@ -0,0 +1 @@
+Kimpo University
\ No newline at end of file
diff --git a/lib/domains/kr/ac/kwandong.txt b/lib/domains/kr/ac/kwandong.txt
deleted file mode 100644
index 99fe1c0a16..0000000000
--- a/lib/domains/kr/ac/kwandong.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kwan Dong University
diff --git a/lib/domains/kr/ac/kwangju-e.txt b/lib/domains/kr/ac/kwangju-e.txt
deleted file mode 100644
index 5aa81bec58..0000000000
--- a/lib/domains/kr/ac/kwangju-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kwangju National University of Education
diff --git a/lib/domains/kr/ac/kyongju.txt b/lib/domains/kr/ac/kyongju.txt
deleted file mode 100644
index dd40770a19..0000000000
--- a/lib/domains/kr/ac/kyongju.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Kongju National University
-Kyongju University
diff --git a/lib/domains/kr/ac/kyungil.txt b/lib/domains/kr/ac/kyungil.txt
deleted file mode 100644
index a2e4977352..0000000000
--- a/lib/domains/kr/ac/kyungil.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kyungil University
diff --git a/lib/domains/kr/ac/miryang.txt b/lib/domains/kr/ac/miryang.txt
deleted file mode 100644
index bea43835b5..0000000000
--- a/lib/domains/kr/ac/miryang.txt
+++ /dev/null
@@ -1 +0,0 @@
-Miryang National University
diff --git a/lib/domains/kr/ac/ptuniv.txt b/lib/domains/kr/ac/ptuniv.txt
deleted file mode 100644
index 5bc67dde30..0000000000
--- a/lib/domains/kr/ac/ptuniv.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pyongtaek University 
diff --git a/lib/domains/kr/ac/pusan-e.txt b/lib/domains/kr/ac/pusan-e.txt
deleted file mode 100644
index 8a4646d94b..0000000000
--- a/lib/domains/kr/ac/pusan-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pusan National University of Education
diff --git a/lib/domains/kr/ac/pwc.txt b/lib/domains/kr/ac/pwc.txt
deleted file mode 100644
index 2eeb317889..0000000000
--- a/lib/domains/kr/ac/pwc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pusan Women's University
diff --git a/lib/domains/kr/ac/samchok.txt b/lib/domains/kr/ac/samchok.txt
deleted file mode 100644
index 0b08f3f0ac..0000000000
--- a/lib/domains/kr/ac/samchok.txt
+++ /dev/null
@@ -1 +0,0 @@
-Samchok National University
diff --git a/lib/domains/kr/ac/seoul-e.txt b/lib/domains/kr/ac/seoul-e.txt
deleted file mode 100644
index 23ce26b790..0000000000
--- a/lib/domains/kr/ac/seoul-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Seoul National University of Education
diff --git a/lib/domains/kr/ac/skhu.txt b/lib/domains/kr/ac/skhu.txt
new file mode 100644
index 0000000000..09acd7f9fa
--- /dev/null
+++ b/lib/domains/kr/ac/skhu.txt
@@ -0,0 +1 @@
+SungKongHoe University
diff --git a/lib/domains/kr/ac/taegu-e.txt b/lib/domains/kr/ac/taegu-e.txt
deleted file mode 100644
index ed9ba5df1e..0000000000
--- a/lib/domains/kr/ac/taegu-e.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taegu National University of Education
diff --git a/lib/domains/kr/ac/taejon.txt b/lib/domains/kr/ac/taejon.txt
deleted file mode 100644
index 46337c7d4f..0000000000
--- a/lib/domains/kr/ac/taejon.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taejon University
diff --git a/lib/domains/kr/ac/taeshin.txt b/lib/domains/kr/ac/taeshin.txt
deleted file mode 100644
index 695c54c39e..0000000000
--- a/lib/domains/kr/ac/taeshin.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taeshin Christian University
diff --git a/lib/domains/kr/ac/tit.txt b/lib/domains/kr/ac/tit.txt
deleted file mode 100644
index 37a06d005d..0000000000
--- a/lib/domains/kr/ac/tit.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tongmyung University of Information Technology
diff --git a/lib/domains/kr/ac/tnut.txt b/lib/domains/kr/ac/tnut.txt
deleted file mode 100644
index 9a63635055..0000000000
--- a/lib/domains/kr/ac/tnut.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taejon National University of Technology
diff --git a/lib/domains/kr/ac/yosu.txt b/lib/domains/kr/ac/yosu.txt
deleted file mode 100644
index d2f8c37f26..0000000000
--- a/lib/domains/kr/ac/yosu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Yosu National University
diff --git a/lib/domains/kr/dsu.txt b/lib/domains/kr/dsu.txt
new file mode 100644
index 0000000000..67aa4f7886
--- /dev/null
+++ b/lib/domains/kr/dsu.txt
@@ -0,0 +1 @@
+dongshin university
diff --git a/lib/domains/kr/kiu.txt b/lib/domains/kr/kiu.txt
new file mode 100644
index 0000000000..6ee317dbe7
--- /dev/null
+++ b/lib/domains/kr/kiu.txt
@@ -0,0 +1 @@
+Kyungill University
diff --git a/lib/domains/kr/liveuou.txt b/lib/domains/kr/liveuou.txt
new file mode 100644
index 0000000000..19d7ab0ce1
--- /dev/null
+++ b/lib/domains/kr/liveuou.txt
@@ -0,0 +1 @@
+Ulsan University
\ No newline at end of file
diff --git a/lib/domains/krd/edu/dpu.txt b/lib/domains/krd/edu/dpu.txt
new file mode 100644
index 0000000000..34ac1e5b47
--- /dev/null
+++ b/lib/domains/krd/edu/dpu.txt
@@ -0,0 +1 @@
+Duhok Polytechnic University
\ No newline at end of file
diff --git a/lib/domains/krd/edu/hmu.txt b/lib/domains/krd/edu/hmu.txt
new file mode 100644
index 0000000000..eb5f5fd465
--- /dev/null
+++ b/lib/domains/krd/edu/hmu.txt
@@ -0,0 +1 @@
+Hawler Medical University
\ No newline at end of file
diff --git a/lib/domains/krd/edu/su.txt b/lib/domains/krd/edu/su.txt
index e69de29bb2..6666c4a725 100644
--- a/lib/domains/krd/edu/su.txt
+++ b/lib/domains/krd/edu/su.txt
@@ -0,0 +1 @@
+Salahaddin University
diff --git a/lib/domains/krd/edu/ukh.txt b/lib/domains/krd/edu/ukh.txt
new file mode 100644
index 0000000000..79e7af2c0a
--- /dev/null
+++ b/lib/domains/krd/edu/ukh.txt
@@ -0,0 +1 @@
+University of Kurdistan Hawler
\ No newline at end of file
diff --git a/lib/domains/krd/edu/uor.txt b/lib/domains/krd/edu/uor.txt
new file mode 100644
index 0000000000..f4f8c9e9f4
--- /dev/null
+++ b/lib/domains/krd/edu/uor.txt
@@ -0,0 +1 @@
+University of Raparin
\ No newline at end of file
diff --git a/lib/domains/kw/edu/kmbs.txt b/lib/domains/kw/edu/kmbs.txt
deleted file mode 100644
index e6387322ad..0000000000
--- a/lib/domains/kw/edu/kmbs.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kuwait Maastricht Business School
diff --git a/lib/domains/kz/aktsu.txt b/lib/domains/kz/aktsu.txt
deleted file mode 100644
index 67b33c66e7..0000000000
--- a/lib/domains/kz/aktsu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Aktau State University
diff --git a/lib/domains/kz/atyrauuniv.txt b/lib/domains/kz/atyrauuniv.txt
deleted file mode 100644
index 3226cffa2e..0000000000
--- a/lib/domains/kz/atyrauuniv.txt
+++ /dev/null
@@ -1 +0,0 @@
-Atyrau State University
diff --git a/lib/domains/kz/edu/kkat.txt b/lib/domains/kz/edu/kkat.txt
new file mode 100644
index 0000000000..f73e06dd01
--- /dev/null
+++ b/lib/domains/kz/edu/kkat.txt
@@ -0,0 +1 @@
+Kostanay College of Automobile Transport
diff --git a/lib/domains/kz/pau.txt b/lib/domains/kz/pau.txt
deleted file mode 100644
index e6c147c82a..0000000000
--- a/lib/domains/kz/pau.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pavlodar University
diff --git a/lib/domains/kz/turan-edu.txt b/lib/domains/kz/turan-edu.txt
new file mode 100644
index 0000000000..05ae5280cd
--- /dev/null
+++ b/lib/domains/kz/turan-edu.txt
@@ -0,0 +1 @@
+Turan University
diff --git a/lib/domains/kz/turkistan.txt b/lib/domains/kz/turkistan.txt
deleted file mode 100644
index c6b80d15a9..0000000000
--- a/lib/domains/kz/turkistan.txt
+++ /dev/null
@@ -1 +0,0 @@
-International Kazakh-Turkish University
diff --git a/lib/domains/la/edu/simt.txt b/lib/domains/la/edu/simt.txt
deleted file mode 100644
index dbaa614745..0000000000
--- a/lib/domains/la/edu/simt.txt
+++ /dev/null
@@ -1 +0,0 @@
-Soutsaka Institute of management and Technology
diff --git a/lib/domains/lk/esoft.txt b/lib/domains/lk/esoft.txt
new file mode 100644
index 0000000000..32258fe6d1
--- /dev/null
+++ b/lib/domains/lk/esoft.txt
@@ -0,0 +1 @@
+ESOFT Metro Campus
diff --git a/lib/domains/lk/lnbti.txt b/lib/domains/lk/lnbti.txt
new file mode 100644
index 0000000000..bc35a60d9f
--- /dev/null
+++ b/lib/domains/lk/lnbti.txt
@@ -0,0 +1 @@
+Lanka Nipon BizTech Institute
diff --git a/lib/domains/lk/ousl.txt b/lib/domains/lk/ousl.txt
new file mode 100644
index 0000000000..cb52b33a02
--- /dev/null
+++ b/lib/domains/lk/ousl.txt
@@ -0,0 +1 @@
+Open University of Sri Lanka
diff --git a/lib/domains/lt/kitm.txt b/lib/domains/lt/kitm.txt
new file mode 100644
index 0000000000..01003f62aa
--- /dev/null
+++ b/lib/domains/lt/kitm.txt
@@ -0,0 +1 @@
+Kaunas information technology school
diff --git a/lib/domains/lt/klpvm.txt b/lib/domains/lt/klpvm.txt
new file mode 100644
index 0000000000..df328fdbe5
--- /dev/null
+++ b/lib/domains/lt/klpvm.txt
@@ -0,0 +1 @@
+Klaipeda service and business school
diff --git a/lib/domains/lt/maxplanck.txt b/lib/domains/lt/maxplanck.txt
deleted file mode 100644
index b374be80ad..0000000000
--- a/lib/domains/lt/maxplanck.txt
+++ /dev/null
@@ -1 +0,0 @@
-I.T.I.S. Max Planck
diff --git a/lib/domains/lu/btsgp.txt b/lib/domains/lu/btsgp.txt
new file mode 100644
index 0000000000..de52562502
--- /dev/null
+++ b/lib/domains/lu/btsgp.txt
@@ -0,0 +1 @@
+Lycee des Arts et Metiers
diff --git a/lib/domains/ma/ac/edhec.txt b/lib/domains/ma/ac/edhec.txt
deleted file mode 100644
index a93931e5ab..0000000000
--- a/lib/domains/ma/ac/edhec.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole des Hautes Etudes en Gestion Informatique et Communication
diff --git a/lib/domains/ma/ac/rectorat-uh2c.txt b/lib/domains/ma/ac/rectorat-uh2c.txt
deleted file mode 100644
index 7c3074632e..0000000000
--- a/lib/domains/ma/ac/rectorat-uh2c.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Hassan II - Aïn Chock
diff --git a/lib/domains/ma/ac/rumi.txt b/lib/domains/ma/ac/rumi.txt
deleted file mode 100644
index ccba95972b..0000000000
--- a/lib/domains/ma/ac/rumi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Moulay Ismail Meknès
diff --git a/lib/domains/ma/ac/uh1.txt b/lib/domains/ma/ac/uh1.txt
deleted file mode 100644
index 855796e8e6..0000000000
--- a/lib/domains/ma/ac/uh1.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Hassan Ier - Settat
diff --git a/lib/domains/ma/ac/uh2m.txt b/lib/domains/ma/ac/uh2m.txt
deleted file mode 100644
index f5faeddfd7..0000000000
--- a/lib/domains/ma/ac/uh2m.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Hassan II - Mohammadia
diff --git a/lib/domains/ma/e-polytechnique.txt b/lib/domains/ma/e-polytechnique.txt
new file mode 100644
index 0000000000..d75b7d15a9
--- /dev/null
+++ b/lib/domains/ma/e-polytechnique.txt
@@ -0,0 +1 @@
+Ecole Polytechnqiue Universiapolis Agdir 
diff --git a/lib/domains/ma/mundiapolis.txt b/lib/domains/ma/mundiapolis.txt
new file mode 100644
index 0000000000..f05336667e
--- /dev/null
+++ b/lib/domains/ma/mundiapolis.txt
@@ -0,0 +1 @@
+Mundiapolis University
diff --git a/lib/domains/ma/net/suptelecom.txt b/lib/domains/ma/net/suptelecom.txt
deleted file mode 100644
index a0c9544df6..0000000000
--- a/lib/domains/ma/net/suptelecom.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ecole Superieure des Télécommunications
diff --git a/lib/domains/ma/uca/cadi.txt b/lib/domains/ma/uca/cadi.txt
deleted file mode 100644
index 97a891fdc5..0000000000
--- a/lib/domains/ma/uca/cadi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Cadi Ayyad
diff --git a/lib/domains/md/utm/ia.txt b/lib/domains/md/utm/ia.txt
new file mode 100644
index 0000000000..60e3f6dc42
--- /dev/null
+++ b/lib/domains/md/utm/ia.txt
@@ -0,0 +1,2 @@
+Universitatea Tehnica din Republica Moldova
+Technical University from Republic of Moldova
diff --git a/lib/domains/mk/edu/nyus.txt b/lib/domains/mk/edu/nyus.txt
deleted file mode 100644
index 8271ee9aea..0000000000
--- a/lib/domains/mk/edu/nyus.txt
+++ /dev/null
@@ -1 +0,0 @@
-New York University In Skopje
diff --git a/lib/domains/mn/hsum-ac.txt b/lib/domains/mn/hsum-ac.txt
deleted file mode 100644
index ba4429e198..0000000000
--- a/lib/domains/mn/hsum-ac.txt
+++ /dev/null
@@ -1 +0,0 @@
-Health sciences University of Mongolia
diff --git a/lib/domains/mn/nuds.txt b/lib/domains/mn/nuds.txt
deleted file mode 100644
index 3d8164b79b..0000000000
--- a/lib/domains/mn/nuds.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Social Sciences
diff --git a/lib/domains/ms/usat.txt b/lib/domains/ms/usat.txt
deleted file mode 100644
index b16ebec6ae..0000000000
--- a/lib/domains/ms/usat.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Science, Arts and Technology
diff --git a/lib/domains/mx/cio.txt b/lib/domains/mx/cio.txt
new file mode 100644
index 0000000000..d551f9a891
--- /dev/null
+++ b/lib/domains/mx/cio.txt
@@ -0,0 +1 @@
+Centro de Investigaciones en Óptica
diff --git a/lib/domains/mx/com/umma.txt b/lib/domains/mx/com/umma.txt
new file mode 100644
index 0000000000..35e39033d8
--- /dev/null
+++ b/lib/domains/mx/com/umma.txt
@@ -0,0 +1,2 @@
+Universidad Mundo Maya
+Universidad Mundo Maya, México
diff --git a/lib/domains/mx/edu/ittepic.txt b/lib/domains/mx/edu/ittepic.txt
new file mode 100644
index 0000000000..73c6b2d414
--- /dev/null
+++ b/lib/domains/mx/edu/ittepic.txt
@@ -0,0 +1,2 @@
+Instituto Tecnológico de Tepic
+Instituto Tecnológico de Tepic
diff --git a/lib/domains/mx/edu/universidadmundomaya.txt b/lib/domains/mx/edu/universidadmundomaya.txt
new file mode 100644
index 0000000000..230853a531
--- /dev/null
+++ b/lib/domains/mx/edu/universidadmundomaya.txt
@@ -0,0 +1,2 @@
+Universidad Mundo Maya
+Universidad Mundo Maya
diff --git a/lib/domains/mx/ifp.txt b/lib/domains/mx/ifp.txt
new file mode 100644
index 0000000000..0dd0c80a3b
--- /dev/null
+++ b/lib/domains/mx/ifp.txt
@@ -0,0 +1,3 @@
+Instituto Francisco Possenti
+Instituto Francisco Possenti
+
diff --git a/lib/domains/mx/tecnm.txt b/lib/domains/mx/tecnm.txt
new file mode 100644
index 0000000000..c6838ed571
--- /dev/null
+++ b/lib/domains/mx/tecnm.txt
@@ -0,0 +1,2 @@
+Tecnológico Nacional de México (TecNM)
+National Institute of Technology of Mexico
diff --git a/lib/domains/mx/tecnm/nlaredo.txt b/lib/domains/mx/tecnm/nlaredo.txt
new file mode 100644
index 0000000000..c44c50a244
--- /dev/null
+++ b/lib/domains/mx/tecnm/nlaredo.txt
@@ -0,0 +1 @@
+Instituto Tecnlogico de Nuevo Laredo
diff --git a/lib/domains/mx/tecnm/piedad.txt b/lib/domains/mx/tecnm/piedad.txt
new file mode 100644
index 0000000000..3d66405989
--- /dev/null
+++ b/lib/domains/mx/tecnm/piedad.txt
@@ -0,0 +1 @@
+Instituto Tecnologico de La Piedad
diff --git a/lib/domains/mx/uaa/correo.txt b/lib/domains/mx/uaa/correo.txt
new file mode 100644
index 0000000000..c9e8595eb9
--- /dev/null
+++ b/lib/domains/mx/uaa/correo.txt
@@ -0,0 +1 @@
+Universidad Autónoma de Aguascalientes
diff --git a/lib/domains/mx/unadmexico/nube.txt b/lib/domains/mx/unadmexico/nube.txt
new file mode 100644
index 0000000000..08f3e5f0a3
--- /dev/null
+++ b/lib/domains/mx/unadmexico/nube.txt
@@ -0,0 +1 @@
+Universidad Abierta y a Distancia de México
diff --git a/lib/domains/mx/utcancun.txt b/lib/domains/mx/utcancun.txt
new file mode 100644
index 0000000000..13e3bbbf1c
--- /dev/null
+++ b/lib/domains/mx/utcancun.txt
@@ -0,0 +1,6 @@
+Crear la Universidad Tecnológica de Cancún 
+url de la universidad: 
+http://utcancun.edu.mx
+
+Dominio de correo: 
+@ utcancun.mx
diff --git a/lib/domains/my/edu/acms.txt b/lib/domains/my/edu/acms.txt
deleted file mode 100644
index 376f4c4365..0000000000
--- a/lib/domains/my/edu/acms.txt
+++ /dev/null
@@ -1 +0,0 @@
-Allianze College of Medical Sciences (ACMS)
diff --git a/lib/domains/my/edu/bmi.txt b/lib/domains/my/edu/bmi.txt
deleted file mode 100644
index 945c89cb42..0000000000
--- a/lib/domains/my/edu/bmi.txt
+++ /dev/null
@@ -1 +0,0 @@
-British Malaysian Institute
diff --git a/lib/domains/my/edu/i4p.txt b/lib/domains/my/edu/i4p.txt
deleted file mode 100644
index f2760af7c2..0000000000
--- a/lib/domains/my/edu/i4p.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Penang
diff --git a/lib/domains/my/edu/ipbmm.txt b/lib/domains/my/edu/ipbmm.txt
deleted file mode 100644
index bfc23ba2cf..0000000000
--- a/lib/domains/my/edu/ipbmm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Malay Language
diff --git a/lib/domains/my/edu/ipgmkdri.txt b/lib/domains/my/edu/ipgmkdri.txt
deleted file mode 100644
index 7719260d36..0000000000
--- a/lib/domains/my/edu/ipgmkdri.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Dato' Razali Ismail 
diff --git a/lib/domains/my/edu/ipgperlis.txt b/lib/domains/my/edu/ipgperlis.txt
deleted file mode 100644
index fccc74da4f..0000000000
--- a/lib/domains/my/edu/ipgperlis.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Perlis
diff --git a/lib/domains/my/edu/ipip.txt b/lib/domains/my/edu/ipip.txt
deleted file mode 100644
index d18f27cf58..0000000000
--- a/lib/domains/my/edu/ipip.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Ipoh
diff --git a/lib/domains/my/edu/ippm.txt b/lib/domains/my/edu/ippm.txt
deleted file mode 100644
index b8ea475cd0..0000000000
--- a/lib/domains/my/edu/ippm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Melaka 
diff --git a/lib/domains/my/edu/iprm.txt b/lib/domains/my/edu/iprm.txt
deleted file mode 100644
index 4ccc13ba92..0000000000
--- a/lib/domains/my/edu/iprm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Raja Melewar
diff --git a/lib/domains/my/edu/ipsmiri.txt b/lib/domains/my/edu/ipsmiri.txt
deleted file mode 100644
index 19d4d8c0e7..0000000000
--- a/lib/domains/my/edu/ipsmiri.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Sarawak
diff --git a/lib/domains/my/edu/iptaa.txt b/lib/domains/my/edu/iptaa.txt
deleted file mode 100644
index b79c09a0e9..0000000000
--- a/lib/domains/my/edu/iptaa.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Tengku Ampuan Afzan
diff --git a/lib/domains/my/edu/iptb.txt b/lib/domains/my/edu/iptb.txt
deleted file mode 100644
index ac3a04eae6..0000000000
--- a/lib/domains/my/edu/iptb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Tuanku Bainun
diff --git a/lib/domains/my/edu/ipteknik.txt b/lib/domains/my/edu/ipteknik.txt
deleted file mode 100644
index aef4eafeb5..0000000000
--- a/lib/domains/my/edu/ipteknik.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Teachers Education, Technical Education 
diff --git a/lib/domains/my/edu/iucn.txt b/lib/domains/my/edu/iucn.txt
deleted file mode 100644
index aca0882b8c..0000000000
--- a/lib/domains/my/edu/iucn.txt
+++ /dev/null
@@ -1 +0,0 @@
-International University College of Nursing (IUCN)
diff --git a/lib/domains/my/edu/kliuc.txt b/lib/domains/my/edu/kliuc.txt
deleted file mode 100644
index edf68f4450..0000000000
--- a/lib/domains/my/edu/kliuc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kuala Lumpur Infrastructure University College
diff --git a/lib/domains/my/edu/kolejshahputra.txt b/lib/domains/my/edu/kolejshahputra.txt
deleted file mode 100644
index 50c2fc31af..0000000000
--- a/lib/domains/my/edu/kolejshahputra.txt
+++ /dev/null
@@ -1 +0,0 @@
-Shahputra College
diff --git a/lib/domains/my/edu/piup.txt b/lib/domains/my/edu/piup.txt
deleted file mode 100644
index f3f384ef97..0000000000
--- a/lib/domains/my/edu/piup.txt
+++ /dev/null
@@ -1 +0,0 @@
-Primier International University Perak
diff --git a/lib/domains/my/edu/pkksabah.txt b/lib/domains/my/edu/pkksabah.txt
deleted file mode 100644
index 06b3e51f7f..0000000000
--- a/lib/domains/my/edu/pkksabah.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kota Kinabalu Polytechnic
diff --git a/lib/domains/my/edu/pkkt.txt b/lib/domains/my/edu/pkkt.txt
deleted file mode 100644
index 10f8e93a3f..0000000000
--- a/lib/domains/my/edu/pkkt.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kuala Terengganu City Polytechnic
diff --git a/lib/domains/my/edu/polijb.txt b/lib/domains/my/edu/polijb.txt
deleted file mode 100644
index 97bf54921e..0000000000
--- a/lib/domains/my/edu/polijb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Johore Bharu Primeir Polytechnic
diff --git a/lib/domains/my/edu/polimuadzam.txt b/lib/domains/my/edu/polimuadzam.txt
deleted file mode 100644
index 823a086a52..0000000000
--- a/lib/domains/my/edu/polimuadzam.txt
+++ /dev/null
@@ -1 +0,0 @@
-Muadzam Shah Polytechnic
diff --git a/lib/domains/my/edu/udm.txt b/lib/domains/my/edu/udm.txt
deleted file mode 100644
index 0597c2e0ee..0000000000
--- a/lib/domains/my/edu/udm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universiti Darul Iman
diff --git a/lib/domains/my/edu/unitar.txt b/lib/domains/my/edu/unitar.txt
deleted file mode 100644
index 7591677165..0000000000
--- a/lib/domains/my/edu/unitar.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universiti Tun Abdul Razak
diff --git a/lib/domains/my/net/kudqi.txt b/lib/domains/my/net/kudqi.txt
deleted file mode 100644
index 052326e087..0000000000
--- a/lib/domains/my/net/kudqi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Darul Quran Islamic College University
diff --git a/lib/domains/net/birdvilleschools.txt b/lib/domains/net/birdvilleschools.txt
new file mode 100644
index 0000000000..dfbc5d212e
--- /dev/null
+++ b/lib/domains/net/birdvilleschools.txt
@@ -0,0 +1 @@
+Birdville Independent School District
diff --git a/lib/domains/net/bmstu.txt b/lib/domains/net/bmstu.txt
new file mode 100644
index 0000000000..55184f0d6b
--- /dev/null
+++ b/lib/domains/net/bmstu.txt
@@ -0,0 +1,2 @@
+Bauman Moscow State Technical University
+Bauman Moscow State Technical University
diff --git a/lib/domains/net/deerparkschool.txt b/lib/domains/net/deerparkschool.txt
new file mode 100644
index 0000000000..213f22dd49
--- /dev/null
+++ b/lib/domains/net/deerparkschool.txt
@@ -0,0 +1 @@
+Cirencester Deerpark School
diff --git a/lib/domains/net/dzrtvu.txt b/lib/domains/net/dzrtvu.txt
new file mode 100644
index 0000000000..58c78b3118
--- /dev/null
+++ b/lib/domains/net/dzrtvu.txt
@@ -0,0 +1 @@
+DAZHOU RADIO&TV UNIVERSITY
diff --git a/lib/domains/net/ecole-ipssi.txt b/lib/domains/net/ecole-ipssi.txt
new file mode 100644
index 0000000000..c78f490b46
--- /dev/null
+++ b/lib/domains/net/ecole-ipssi.txt
@@ -0,0 +1 @@
+IPSSI - École d’Informatique, Web et Design Graphique
diff --git a/lib/domains/net/epmistes.txt b/lib/domains/net/epmistes.txt
new file mode 100644
index 0000000000..cda5f88501
--- /dev/null
+++ b/lib/domains/net/epmistes.txt
@@ -0,0 +1 @@
+ECAM EPMI - école d'ingénieurs
diff --git a/lib/domains/net/gymbay.txt b/lib/domains/net/gymbay.txt
new file mode 100644
index 0000000000..2d60ad1a74
--- /dev/null
+++ b/lib/domains/net/gymbay.txt
@@ -0,0 +1 @@
+Staedtisches Gymnasium Bayreuther Strasse - Wuppertal
\ No newline at end of file
diff --git a/lib/domains/net/hadleighhigh.txt b/lib/domains/net/hadleighhigh.txt
new file mode 100644
index 0000000000..9f67c617ec
--- /dev/null
+++ b/lib/domains/net/hadleighhigh.txt
@@ -0,0 +1 @@
+Hadleigh High School
diff --git a/lib/domains/net/ip-formation.txt b/lib/domains/net/ip-formation.txt
new file mode 100644
index 0000000000..c78f490b46
--- /dev/null
+++ b/lib/domains/net/ip-formation.txt
@@ -0,0 +1 @@
+IPSSI - École d’Informatique, Web et Design Graphique
diff --git a/lib/domains/net/johnabbottcollege.txt b/lib/domains/net/johnabbottcollege.txt
new file mode 100644
index 0000000000..988655c1d2
--- /dev/null
+++ b/lib/domains/net/johnabbottcollege.txt
@@ -0,0 +1 @@
+John Abbott College
\ No newline at end of file
diff --git a/lib/domains/net/mba-esg.txt b/lib/domains/net/mba-esg.txt
new file mode 100644
index 0000000000..75fa4c5286
--- /dev/null
+++ b/lib/domains/net/mba-esg.txt
@@ -0,0 +1 @@
+MBA ESG
diff --git a/lib/domains/net/mckinneyisd.txt b/lib/domains/net/mckinneyisd.txt
new file mode 100644
index 0000000000..336bcadd92
--- /dev/null
+++ b/lib/domains/net/mckinneyisd.txt
@@ -0,0 +1 @@
+McKinney Independent School District
diff --git a/lib/domains/net/msitprogram.txt b/lib/domains/net/msitprogram.txt
new file mode 100644
index 0000000000..c7ef4785e9
--- /dev/null
+++ b/lib/domains/net/msitprogram.txt
@@ -0,0 +1,2 @@
+Master of Science in Information Technology
+International Institute of Information Technology Hyderabad
diff --git a/lib/domains/net/ncvt.txt b/lib/domains/net/ncvt.txt
new file mode 100644
index 0000000000..fb9bfa92a7
--- /dev/null
+++ b/lib/domains/net/ncvt.txt
@@ -0,0 +1,2 @@
+Nanning College For Vocational Technology
+http://www.ncvt.net
diff --git a/lib/domains/net/nsboroschools.txt b/lib/domains/net/nsboroschools.txt
new file mode 100644
index 0000000000..c5b596b4c3
--- /dev/null
+++ b/lib/domains/net/nsboroschools.txt
@@ -0,0 +1,3 @@
+Public Schools of Northborough and Southborough / Algonquin Regional High School
+Url: https://www.nsboro.k12.ma.us/arhs
+Mail: (name)@nsboroschools.net
diff --git a/lib/domains/net/oak-hill.txt b/lib/domains/net/oak-hill.txt
new file mode 100644
index 0000000000..25f311cd27
--- /dev/null
+++ b/lib/domains/net/oak-hill.txt
@@ -0,0 +1 @@
+Oak Hill Academy
diff --git a/lib/domains/net/pghs.txt b/lib/domains/net/pghs.txt
new file mode 100644
index 0000000000..18b0752f03
--- /dev/null
+++ b/lib/domains/net/pghs.txt
@@ -0,0 +1 @@
+Pleasant Grove High School
diff --git a/lib/domains/net/plainville270.txt b/lib/domains/net/plainville270.txt
new file mode 100644
index 0000000000..ba2d393d09
--- /dev/null
+++ b/lib/domains/net/plainville270.txt
@@ -0,0 +1 @@
+Plainville USD 270
diff --git a/lib/domains/net/plus4u.txt b/lib/domains/net/plus4u.txt
new file mode 100644
index 0000000000..470ff07785
--- /dev/null
+++ b/lib/domains/net/plus4u.txt
@@ -0,0 +1 @@
+Unicorn College
diff --git a/lib/domains/net/stmcougars.txt b/lib/domains/net/stmcougars.txt
new file mode 100644
index 0000000000..10266e081b
--- /dev/null
+++ b/lib/domains/net/stmcougars.txt
@@ -0,0 +1 @@
+St. Thomas More Catholic High School
diff --git a/lib/domains/net/trentcollege.txt b/lib/domains/net/trentcollege.txt
new file mode 100644
index 0000000000..d8d184c019
--- /dev/null
+++ b/lib/domains/net/trentcollege.txt
@@ -0,0 +1 @@
+Trent College in Nottingham, England
diff --git a/lib/domains/ng/edu/aquatechcollege.txt b/lib/domains/ng/edu/aquatechcollege.txt
new file mode 100644
index 0000000000..7a822c7f11
--- /dev/null
+++ b/lib/domains/ng/edu/aquatechcollege.txt
@@ -0,0 +1 @@
+Aquatech College of Agriculture and Technology
\ No newline at end of file
diff --git a/lib/domains/ng/edu/funaab.txt b/lib/domains/ng/edu/funaab.txt
new file mode 100644
index 0000000000..a47953d69b
--- /dev/null
+++ b/lib/domains/ng/edu/funaab.txt
@@ -0,0 +1,2 @@
+Federal University of Agriculture, Abeoukuta
+FUNAAB
\ No newline at end of file
diff --git a/lib/domains/ng/edu/futminna/st.txt b/lib/domains/ng/edu/futminna/st.txt
new file mode 100644
index 0000000000..8c4d752914
--- /dev/null
+++ b/lib/domains/ng/edu/futminna/st.txt
@@ -0,0 +1,5 @@
+Federal university of Techonology, Minna
+
+http://futminna.edu.ng
+
+The student email is like -- student_id@st.futminna.edu.ng
diff --git a/lib/domains/ng/edu/lasu.txt b/lib/domains/ng/edu/lasu.txt
new file mode 100644
index 0000000000..66559c6c8f
--- /dev/null
+++ b/lib/domains/ng/edu/lasu.txt
@@ -0,0 +1 @@
+Lagos State University
diff --git a/lib/domains/ng/edu/mcu.txt b/lib/domains/ng/edu/mcu.txt
new file mode 100644
index 0000000000..91698e5e4e
--- /dev/null
+++ b/lib/domains/ng/edu/mcu.txt
@@ -0,0 +1 @@
+McPherson University, Seriki-Sotayo, Ogun State
\ No newline at end of file
diff --git a/lib/domains/ng/edu/mcu/stu.txt b/lib/domains/ng/edu/mcu/stu.txt
new file mode 100644
index 0000000000..8cdf7446c5
--- /dev/null
+++ b/lib/domains/ng/edu/mcu/stu.txt
@@ -0,0 +1 @@
+McPherson University
\ No newline at end of file
diff --git a/lib/domains/ng/edu/umyu.txt b/lib/domains/ng/edu/umyu.txt
new file mode 100644
index 0000000000..6aa469e592
--- /dev/null
+++ b/lib/domains/ng/edu/umyu.txt
@@ -0,0 +1 @@
+Umaru Musa Yar'adua University Katsina
diff --git a/lib/domains/ng/edu/unilorin.txt~ b/lib/domains/ng/edu/unilorin.txt~
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lib/domains/nl/ade-buas.txt b/lib/domains/nl/ade-buas.txt
new file mode 100644
index 0000000000..66c5ccb913
--- /dev/null
+++ b/lib/domains/nl/ade-buas.txt
@@ -0,0 +1 @@
+Breda University of Applied Sciences
diff --git a/lib/domains/nl/buas.txt b/lib/domains/nl/buas.txt
new file mode 100644
index 0000000000..66c5ccb913
--- /dev/null
+++ b/lib/domains/nl/buas.txt
@@ -0,0 +1 @@
+Breda University of Applied Sciences
diff --git a/lib/domains/nl/calvijncollege.txt b/lib/domains/nl/calvijncollege.txt
new file mode 100644
index 0000000000..9331e4aadd
--- /dev/null
+++ b/lib/domains/nl/calvijncollege.txt
@@ -0,0 +1 @@
+Calvijn College
diff --git a/lib/domains/nl/ijburgcollege b/lib/domains/nl/ijburgcollege
new file mode 100644
index 0000000000..e87ba3e562
--- /dev/null
+++ b/lib/domains/nl/ijburgcollege
@@ -0,0 +1 @@
+IJburg College
diff --git a/lib/domains/nl/ijburgcollege.txt b/lib/domains/nl/ijburgcollege.txt
new file mode 100644
index 0000000000..e87ba3e562
--- /dev/null
+++ b/lib/domains/nl/ijburgcollege.txt
@@ -0,0 +1 @@
+IJburg College
diff --git a/lib/domains/nl/lentiz/student.txt b/lib/domains/nl/lentiz/student.txt
deleted file mode 100644
index 2dd6c65896..0000000000
--- a/lib/domains/nl/lentiz/student.txt
+++ /dev/null
@@ -1 +0,0 @@
-Lentiz
diff --git a/lib/domains/nl/luzac.txt b/lib/domains/nl/luzac.txt
new file mode 100644
index 0000000000..ab76ad1661
--- /dev/null
+++ b/lib/domains/nl/luzac.txt
@@ -0,0 +1 @@
+Luzac College en Luzac Lyceum
diff --git a/lib/domains/nl/mborijnland.txt b/lib/domains/nl/mborijnland.txt
new file mode 100644
index 0000000000..39e31a121a
--- /dev/null
+++ b/lib/domains/nl/mborijnland.txt
@@ -0,0 +1 @@
+Mborijnland
diff --git a/lib/domains/nl/nhtv.txt b/lib/domains/nl/nhtv.txt
deleted file mode 100644
index 9671565a8c..0000000000
--- a/lib/domains/nl/nhtv.txt
+++ /dev/null
@@ -1 +0,0 @@
-NHTV Breda University of Professional Education
diff --git a/lib/domains/nl/obcnet.txt b/lib/domains/nl/obcnet.txt
new file mode 100644
index 0000000000..00d82f6eac
--- /dev/null
+++ b/lib/domains/nl/obcnet.txt
@@ -0,0 +1 @@
+Over Betuwe College
\ No newline at end of file
diff --git a/lib/domains/nl/ogvo.txt b/lib/domains/nl/ogvo.txt
new file mode 100644
index 0000000000..3af2f69002
--- /dev/null
+++ b/lib/domains/nl/ogvo.txt
@@ -0,0 +1,4 @@
+Onderwijsgemeenschap Venlo en Omstreken
+* Valuascollege
+* College Den Hulster
+* Blariacumcollege
diff --git a/lib/domains/nl/osgh.txt b/lib/domains/nl/osgh.txt
new file mode 100644
index 0000000000..05a93f72a0
--- /dev/null
+++ b/lib/domains/nl/osgh.txt
@@ -0,0 +1 @@
+Openbare Scholengemeenschap Hengelo
diff --git a/lib/domains/nl/radboudumc.txt b/lib/domains/nl/radboudumc.txt
new file mode 100644
index 0000000000..d07e760b92
--- /dev/null
+++ b/lib/domains/nl/radboudumc.txt
@@ -0,0 +1 @@
+Radboud University Medical Center
diff --git a/lib/domains/nl/rocmn.txt b/lib/domains/nl/rocmn.txt
new file mode 100644
index 0000000000..dc0303ca38
--- /dev/null
+++ b/lib/domains/nl/rocmn.txt
@@ -0,0 +1 @@
+Roc Midden Nederland
\ No newline at end of file
diff --git a/lib/domains/nl/rocva.txt b/lib/domains/nl/rocva.txt
new file mode 100644
index 0000000000..d39cf5c08a
--- /dev/null
+++ b/lib/domains/nl/rocva.txt
@@ -0,0 +1 @@
+ROC van Amsterdam
diff --git a/lib/domains/nl/rocva/student.txt b/lib/domains/nl/rocva/student.txt
deleted file mode 100644
index ed9e733ea6..0000000000
--- a/lib/domains/nl/rocva/student.txt
+++ /dev/null
@@ -1 +0,0 @@
-ROC van Amsterdam
\ No newline at end of file
diff --git a/lib/domains/nl/rocwb/edu/zoomvlietcollege.txt b/lib/domains/nl/rocwb/edu/zoomvlietcollege.txt
deleted file mode 100644
index 34ed4d4071..0000000000
--- a/lib/domains/nl/rocwb/edu/zoomvlietcollege.txt
+++ /dev/null
@@ -1 +0,0 @@
-ROC West Brabant Zoomvliet College
diff --git a/lib/domains/nl/stenden.txt b/lib/domains/nl/stenden.txt
new file mode 100644
index 0000000000..31da227b5c
--- /dev/null
+++ b/lib/domains/nl/stenden.txt
@@ -0,0 +1,2 @@
+NHL Stenden Hogeschool, Leeuwarden
+NHL Stenden University of Applied Sciences
diff --git a/lib/domains/nl/tcrmbo.txt b/lib/domains/nl/tcrmbo.txt
new file mode 100644
index 0000000000..a5e16b5fc7
--- /dev/null
+++ b/lib/domains/nl/tcrmbo.txt
@@ -0,0 +1 @@
+Techniek College Rotterdam
diff --git a/lib/domains/nl/wartburg.txt b/lib/domains/nl/wartburg.txt
new file mode 100644
index 0000000000..9b314bab63
--- /dev/null
+++ b/lib/domains/nl/wartburg.txt
@@ -0,0 +1 @@
+Wartburg College
diff --git a/lib/domains/no/askerskolen.txt b/lib/domains/no/askerskolen.txt
new file mode 100644
index 0000000000..7826e33182
--- /dev/null
+++ b/lib/domains/no/askerskolen.txt
@@ -0,0 +1 @@
+Asker Kommune
diff --git a/lib/domains/no/hfk/vgs.txt b/lib/domains/no/hfk/vgs.txt
new file mode 100644
index 0000000000..af58634f70
--- /dev/null
+++ b/lib/domains/no/hfk/vgs.txt
@@ -0,0 +1 @@
+Hordaland fylkeskommune
diff --git a/lib/domains/no/hihm.txt b/lib/domains/no/hihm.txt
new file mode 100644
index 0000000000..c58aee0e2e
--- /dev/null
+++ b/lib/domains/no/hihm.txt
@@ -0,0 +1,3 @@
+Inland Norway University of Applied Sciences
+Høgskolen i Innlandet
+https://www.inn.no/
diff --git a/lib/domains/no/hil.txt b/lib/domains/no/hil.txt
index 825347930f..c58aee0e2e 100644
--- a/lib/domains/no/hil.txt
+++ b/lib/domains/no/hil.txt
@@ -1 +1,3 @@
-Lillehammer University College
+Inland Norway University of Applied Sciences
+Høgskolen i Innlandet
+https://www.inn.no/
diff --git a/lib/domains/no/inn.txt b/lib/domains/no/inn.txt
new file mode 100644
index 0000000000..c58aee0e2e
--- /dev/null
+++ b/lib/domains/no/inn.txt
@@ -0,0 +1,3 @@
+Inland Norway University of Applied Sciences
+Høgskolen i Innlandet
+https://www.inn.no/
diff --git a/lib/domains/no/kommune/trondheim/skole.txt b/lib/domains/no/kommune/trondheim/skole.txt
new file mode 100644
index 0000000000..c8f15c70b8
--- /dev/null
+++ b/lib/domains/no/kommune/trondheim/skole.txt
@@ -0,0 +1 @@
+Trondheim Kommune - Skole
diff --git a/lib/domains/no/kristiania.txt b/lib/domains/no/kristiania.txt
new file mode 100644
index 0000000000..622d50ee9b
--- /dev/null
+++ b/lib/domains/no/kristiania.txt
@@ -0,0 +1 @@
+Kristiania University College, the department of technology
diff --git a/lib/domains/no/mil/sksk.txt b/lib/domains/no/mil/sksk.txt
new file mode 100644
index 0000000000..4be64ffa24
--- /dev/null
+++ b/lib/domains/no/mil/sksk.txt
@@ -0,0 +1 @@
+Royal Norwegian Naval Academy (Sj�krigsskolen)
\ No newline at end of file
diff --git a/lib/domains/no/oslomet.txt b/lib/domains/no/oslomet.txt
new file mode 100644
index 0000000000..0cec374bbf
--- /dev/null
+++ b/lib/domains/no/oslomet.txt
@@ -0,0 +1 @@
+OsloMet – Oslo Metropolitan University
diff --git a/lib/domains/no/osloskolen.txt b/lib/domains/no/osloskolen.txt
new file mode 100644
index 0000000000..3a134cc3db
--- /dev/null
+++ b/lib/domains/no/osloskolen.txt
@@ -0,0 +1 @@
+Osloskolen
diff --git a/lib/domains/no/trondelagfylke/elev.txt b/lib/domains/no/trondelagfylke/elev.txt
new file mode 100644
index 0000000000..3e00ed1821
--- /dev/null
+++ b/lib/domains/no/trondelagfylke/elev.txt
@@ -0,0 +1 @@
+Trondelag Fylkeskommune
diff --git a/lib/domains/no/ungweb.txt b/lib/domains/no/ungweb.txt
deleted file mode 100644
index 582b1591d4..0000000000
--- a/lib/domains/no/ungweb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Møre og Romsdal Fylkeskommune
diff --git a/lib/domains/no/vgs/nissen.txt b/lib/domains/no/vgs/nissen.txt
new file mode 100644
index 0000000000..f0c0af4a09
--- /dev/null
+++ b/lib/domains/no/vgs/nissen.txt
@@ -0,0 +1 @@
+Hartvig Nissen VGS
diff --git a/lib/domains/np/edu/sxc.txt b/lib/domains/np/edu/sxc.txt
new file mode 100644
index 0000000000..226e7ac717
--- /dev/null
+++ b/lib/domains/np/edu/sxc.txt
@@ -0,0 +1 @@
+St. Xavier's College
diff --git a/lib/domains/nz/ac/amesstudent.txt b/lib/domains/nz/ac/amesstudent.txt
new file mode 100644
index 0000000000..3800f32b31
--- /dev/null
+++ b/lib/domains/nz/ac/amesstudent.txt
@@ -0,0 +1 @@
+AMES  - The Institute of IT
diff --git a/lib/domains/nz/ac/aucklanduni.txt b/lib/domains/nz/ac/aucklanduni.txt
new file mode 100644
index 0000000000..34d099aa99
--- /dev/null
+++ b/lib/domains/nz/ac/aucklanduni.txt
@@ -0,0 +1 @@
+University of Auckland
\ No newline at end of file
diff --git a/lib/domains/nz/ac/sit.txt b/lib/domains/nz/ac/sit.txt
new file mode 100644
index 0000000000..1c0a232690
--- /dev/null
+++ b/lib/domains/nz/ac/sit.txt
@@ -0,0 +1 @@
+Southern Institute of Technology, New Zealand
diff --git a/lib/domains/nz/ac/wintec/student.txt b/lib/domains/nz/ac/wintec/student.txt
new file mode 100755
index 0000000000..42ccc5d96f
--- /dev/null
+++ b/lib/domains/nz/ac/wintec/student.txt
@@ -0,0 +1 @@
+Waikato Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/org/aischool.txt b/lib/domains/org/aischool.txt
new file mode 100644
index 0000000000..c00801dc96
--- /dev/null
+++ b/lib/domains/org/aischool.txt
@@ -0,0 +1 @@
+Atlanta International School
diff --git a/lib/domains/org/almamonuc.txt b/lib/domains/org/almamonuc.txt
deleted file mode 100644
index 30a0152903..0000000000
--- a/lib/domains/org/almamonuc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mamon University College
diff --git a/lib/domains/org/altamontschool.txt b/lib/domains/org/altamontschool.txt
new file mode 100644
index 0000000000..5a4c6fabbe
--- /dev/null
+++ b/lib/domains/org/altamontschool.txt
@@ -0,0 +1 @@
+The Altamont School
diff --git a/lib/domains/org/ardsleyschools.txt b/lib/domains/org/ardsleyschools.txt
new file mode 100644
index 0000000000..9776336a17
--- /dev/null
+++ b/lib/domains/org/ardsleyschools.txt
@@ -0,0 +1 @@
+Ardsley High School 
\ No newline at end of file
diff --git a/lib/domains/org/bartoncougars.txt b/lib/domains/org/bartoncougars.txt
new file mode 100644
index 0000000000..bb75927732
--- /dev/null
+++ b/lib/domains/org/bartoncougars.txt
@@ -0,0 +1 @@
+Barton Community College
diff --git a/lib/domains/org/blindbrook.txt b/lib/domains/org/blindbrook.txt
new file mode 100644
index 0000000000..a3bc2d571b
--- /dev/null
+++ b/lib/domains/org/blindbrook.txt
@@ -0,0 +1 @@
+Blind Brook High School
diff --git a/lib/domains/org/bloomfield.txt b/lib/domains/org/bloomfield.txt
new file mode 100644
index 0000000000..8a55b3ec75
--- /dev/null
+++ b/lib/domains/org/bloomfield.txt
@@ -0,0 +1 @@
+Bloomfield Hills Schools
diff --git a/lib/domains/org/calallen.txt b/lib/domains/org/calallen.txt
new file mode 100644
index 0000000000..488e897df4
--- /dev/null
+++ b/lib/domains/org/calallen.txt
@@ -0,0 +1 @@
+Calallen High School (Grades 9-12)
\ No newline at end of file
diff --git a/lib/domains/org/camelotacademy.txt b/lib/domains/org/camelotacademy.txt
new file mode 100644
index 0000000000..aa5179a17a
--- /dev/null
+++ b/lib/domains/org/camelotacademy.txt
@@ -0,0 +1 @@
+Camelot Academy
\ No newline at end of file
diff --git a/lib/domains/org/campbellhall.txt b/lib/domains/org/campbellhall.txt
new file mode 100644
index 0000000000..66a40bdf32
--- /dev/null
+++ b/lib/domains/org/campbellhall.txt
@@ -0,0 +1 @@
+Campbell Hall - an independent coeducational day school for grades K-12
\ No newline at end of file
diff --git a/lib/domains/org/canyonsdistrict/ctec.txt b/lib/domains/org/canyonsdistrict/ctec.txt
new file mode 100644
index 0000000000..70f27cd366
--- /dev/null
+++ b/lib/domains/org/canyonsdistrict/ctec.txt
@@ -0,0 +1 @@
+Canyons Technical Education Center (CTEC)
diff --git a/lib/domains/org/conejousd.txt b/lib/domains/org/conejousd.txt
new file mode 100644
index 0000000000..3fb3d41d18
--- /dev/null
+++ b/lib/domains/org/conejousd.txt
@@ -0,0 +1 @@
+Conejo Valley Unified School District (CVUSD)
diff --git a/lib/domains/org/cravenk12.txt b/lib/domains/org/cravenk12.txt
new file mode 100644
index 0000000000..02ad6db5cf
--- /dev/null
+++ b/lib/domains/org/cravenk12.txt
@@ -0,0 +1 @@
+West Craven High School
\ No newline at end of file
diff --git a/lib/domains/org/cvsd356.txt b/lib/domains/org/cvsd356.txt
new file mode 100644
index 0000000000..8c829beeba
--- /dev/null
+++ b/lib/domains/org/cvsd356.txt
@@ -0,0 +1 @@
+Central Valley School District
diff --git a/lib/domains/org/danielcastelao.txt b/lib/domains/org/danielcastelao.txt
new file mode 100644
index 0000000000..68e0a05207
--- /dev/null
+++ b/lib/domains/org/danielcastelao.txt
@@ -0,0 +1 @@
+Centro de Formacion Profesional "Daniel Castelao"
diff --git a/lib/domains/org/desmet.txt b/lib/domains/org/desmet.txt
new file mode 100644
index 0000000000..6d3b9d1226
--- /dev/null
+++ b/lib/domains/org/desmet.txt
@@ -0,0 +1,4 @@
+De Smet Jesuit High School
+De Smet Jesuit
+DeSmet Jesuit
+DeSmet Jesuit High School
diff --git a/lib/domains/org/diderot.txt b/lib/domains/org/diderot.txt
new file mode 100644
index 0000000000..9fee5f98d7
--- /dev/null
+++ b/lib/domains/org/diderot.txt
@@ -0,0 +1 @@
+Lycée Polyvalent Diderot
diff --git a/lib/domains/org/diiage.txt b/lib/domains/org/diiage.txt
new file mode 100644
index 0000000000..f319594144
--- /dev/null
+++ b/lib/domains/org/diiage.txt
@@ -0,0 +1 @@
+Centre Universitaire Catholique de Bourgogne
diff --git a/lib/domains/org/dpengineering.txt b/lib/domains/org/dpengineering.txt
new file mode 100644
index 0000000000..50d62e3950
--- /dev/null
+++ b/lib/domains/org/dpengineering.txt
@@ -0,0 +1 @@
+Dos Pueblos Engineering Academy
\ No newline at end of file
diff --git a/lib/domains/org/edmonds15.txt b/lib/domains/org/edmonds15.txt
new file mode 100644
index 0000000000..0cf624862a
--- /dev/null
+++ b/lib/domains/org/edmonds15.txt
@@ -0,0 +1 @@
+Edmonds School District
diff --git a/lib/domains/org/er9.txt b/lib/domains/org/er9.txt
new file mode 100644
index 0000000000..26694ef04f
--- /dev/null
+++ b/lib/domains/org/er9.txt
@@ -0,0 +1 @@
+Joel Barlow High School
diff --git a/lib/domains/org/evergreenps/student.txt b/lib/domains/org/evergreenps/student.txt
new file mode 100644
index 0000000000..d38319e2af
--- /dev/null
+++ b/lib/domains/org/evergreenps/student.txt
@@ -0,0 +1 @@
+Evergreen Public Schools
diff --git a/lib/domains/org/fondazionejac/stu.txt b/lib/domains/org/fondazionejac/stu.txt
deleted file mode 100644
index 292eff98d7..0000000000
--- a/lib/domains/org/fondazionejac/stu.txt
+++ /dev/null
@@ -1 +0,0 @@
-FondazioneJAC JobsAcademy
diff --git a/lib/domains/org/fondazioneits/stu.txt b/lib/domains/org/fondazionejobsacademy/stu.txt
similarity index 100%
rename from lib/domains/org/fondazioneits/stu.txt
rename to lib/domains/org/fondazionejobsacademy/stu.txt
diff --git a/lib/domains/org/fresnou.txt b/lib/domains/org/fresnou.txt
new file mode 100644
index 0000000000..a1fdf0a2ee
--- /dev/null
+++ b/lib/domains/org/fresnou.txt
@@ -0,0 +1 @@
+Edison High School
\ No newline at end of file
diff --git a/lib/domains/org/fresnounified.txt b/lib/domains/org/fresnounified.txt
new file mode 100644
index 0000000000..a1fdf0a2ee
--- /dev/null
+++ b/lib/domains/org/fresnounified.txt
@@ -0,0 +1 @@
+Edison High School
\ No newline at end of file
diff --git a/lib/domains/org/gbwl.txt b/lib/domains/org/gbwl.txt
new file mode 100644
index 0000000000..3d09adc0c2
--- /dev/null
+++ b/lib/domains/org/gbwl.txt
@@ -0,0 +1 @@
+The Birch Wathen Lenox School
\ No newline at end of file
diff --git a/lib/domains/org/gcelabschool.txt b/lib/domains/org/gcelabschool.txt
new file mode 100644
index 0000000000..05efc6c5be
--- /dev/null
+++ b/lib/domains/org/gcelabschool.txt
@@ -0,0 +1 @@
+GCE Lab School
diff --git a/lib/domains/org/gdgu.txt b/lib/domains/org/gdgu.txt
new file mode 100644
index 0000000000..108b47b97a
--- /dev/null
+++ b/lib/domains/org/gdgu.txt
@@ -0,0 +1,8 @@
+gdgoenka university
+
+
+university url: http://www.gdgoenkauniversity.com/
+Course url : http://www.gdgoenkauniversity.com/schoolofengineering/,http://www.gdgoenkauniversity.com/schoolofengineering/programmes-eligibility/
+university url: http://www.gdgoenkauniversity.com/
+Course url : http://www.gdgoenkauniversity.com/schoolofengineering/,http://www.gdgoenkauniversity.com/schoolofengineering/programmes-eligibility/
+domain Proof : http://www.gdgoenkauniversity.com/iclass2018/conference-venue/
\ No newline at end of file
diff --git a/lib/domains/org/geneva304.txt b/lib/domains/org/geneva304.txt
new file mode 100644
index 0000000000..52a52ae5e0
--- /dev/null
+++ b/lib/domains/org/geneva304.txt
@@ -0,0 +1,2 @@
+Geneva Community High School
+.group
diff --git a/lib/domains/org/ggpi.txt b/lib/domains/org/ggpi.txt
new file mode 100644
index 0000000000..f82e6f6757
--- /dev/null
+++ b/lib/domains/org/ggpi.txt
@@ -0,0 +1,3 @@
+Glazov pedagogical Institute
+ГЛАЗОВСКИЙ ГОСУДАРСТВЕННЫЙ ПЕДАГОГИЧЕСКИЙ ИНСТИТУТ ИМЕНИ В.Г.КОРОЛЕНКО
+http://www.ggpi.org/news.php
diff --git a/lib/domains/org/gocommodores.txt b/lib/domains/org/gocommodores.txt
new file mode 100644
index 0000000000..eb067db0b1
--- /dev/null
+++ b/lib/domains/org/gocommodores.txt
@@ -0,0 +1 @@
+Lafayette Middle School
\ No newline at end of file
diff --git a/lib/domains/org/graniteschools.txt b/lib/domains/org/graniteschools.txt
new file mode 100644
index 0000000000..2c98c59aa6
--- /dev/null
+++ b/lib/domains/org/graniteschools.txt
@@ -0,0 +1 @@
+Granite School District
diff --git a/lib/domains/org/granitesd.txt b/lib/domains/org/granitesd.txt
new file mode 100644
index 0000000000..5681a7d1fa
--- /dev/null
+++ b/lib/domains/org/granitesd.txt
@@ -0,0 +1 @@
+Granite School District (students)
diff --git a/lib/domains/org/hedmark.txt b/lib/domains/org/hedmark.txt
new file mode 100644
index 0000000000..eb724faeb0
--- /dev/null
+++ b/lib/domains/org/hedmark.txt
@@ -0,0 +1 @@
+Hamar Katedralskole
diff --git a/lib/domains/org/hsestudents.txt b/lib/domains/org/hsestudents.txt
new file mode 100644
index 0000000000..fffedd6945
--- /dev/null
+++ b/lib/domains/org/hsestudents.txt
@@ -0,0 +1 @@
+Hamilton Southeastern High School
\ No newline at end of file
diff --git a/lib/domains/org/hunschool.txt b/lib/domains/org/hunschool.txt
new file mode 100644
index 0000000000..01c564b7cb
--- /dev/null
+++ b/lib/domains/org/hunschool.txt
@@ -0,0 +1 @@
+The Hun School of Princeton
diff --git a/lib/domains/org/ieslluissimarro.txt b/lib/domains/org/ieslluissimarro.txt
new file mode 100644
index 0000000000..5728d2a834
--- /dev/null
+++ b/lib/domains/org/ieslluissimarro.txt
@@ -0,0 +1,3 @@
+IES Dr. Lluis Simarro
+High School Dr. Lluis Simarro
+ieslluissimarro.org
diff --git a/lib/domains/org/invertis.txt b/lib/domains/org/invertis.txt
new file mode 100644
index 0000000000..2c0850c87c
--- /dev/null
+++ b/lib/domains/org/invertis.txt
@@ -0,0 +1,3 @@
+Invertis University, Bareilly
+Website: https://www.invertisuniversity.ac.in/
+https://www.invertisuniversity.ac.in/courses/btech-computer-science-engineering-/9/
diff --git a/lib/domains/org/ipsd.txt b/lib/domains/org/ipsd.txt
new file mode 100644
index 0000000000..f32fabd65b
--- /dev/null
+++ b/lib/domains/org/ipsd.txt
@@ -0,0 +1,2 @@
+Indian Prarie School District 204
+ipsd.org
diff --git a/lib/domains/org/ismanila.txt b/lib/domains/org/ismanila.txt
new file mode 100644
index 0000000000..0d769317cb
--- /dev/null
+++ b/lib/domains/org/ismanila.txt
@@ -0,0 +1,2 @@
+International School Manila
+ISM
diff --git a/lib/domains/org/ivesheadschool.txt b/lib/domains/org/ivesheadschool.txt
new file mode 100644
index 0000000000..ece491662e
--- /dev/null
+++ b/lib/domains/org/ivesheadschool.txt
@@ -0,0 +1 @@
+Iveshead School
diff --git a/lib/domains/org/jmieti.txt b/lib/domains/org/jmieti.txt
new file mode 100644
index 0000000000..894802cf13
--- /dev/null
+++ b/lib/domains/org/jmieti.txt
@@ -0,0 +1,2 @@
+Jai Parkash Mukand Lal Innovative Institue of Engineering
+Radur, INDIA
diff --git a/lib/domains/org/k12louisa.txt b/lib/domains/org/k12louisa.txt
new file mode 100644
index 0000000000..a173cfcd70
--- /dev/null
+++ b/lib/domains/org/k12louisa.txt
@@ -0,0 +1 @@
+Louisa County Public Schools
diff --git a/lib/domains/org/kinkaid.txt b/lib/domains/org/kinkaid.txt
new file mode 100644
index 0000000000..75d2109089
--- /dev/null
+++ b/lib/domains/org/kinkaid.txt
@@ -0,0 +1 @@
+The Kinkaid School
\ No newline at end of file
diff --git a/lib/domains/org/ksd.txt b/lib/domains/org/ksd.txt
new file mode 100644
index 0000000000..e3703199fb
--- /dev/null
+++ b/lib/domains/org/ksd.txt
@@ -0,0 +1 @@
+Kennewick High School
\ No newline at end of file
diff --git a/lib/domains/org/lcps.txt b/lib/domains/org/lcps.txt
new file mode 100644
index 0000000000..43f2457317
--- /dev/null
+++ b/lib/domains/org/lcps.txt
@@ -0,0 +1 @@
+Loudoun County Public Schools
diff --git a/lib/domains/org/learnatwren.txt b/lib/domains/org/learnatwren.txt
new file mode 100644
index 0000000000..01a727e6d2
--- /dev/null
+++ b/lib/domains/org/learnatwren.txt
@@ -0,0 +1 @@
+Wren Academy
diff --git a/lib/domains/org/lincolncharter.txt b/lib/domains/org/lincolncharter.txt
new file mode 100644
index 0000000000..24601a1063
--- /dev/null
+++ b/lib/domains/org/lincolncharter.txt
@@ -0,0 +1 @@
+Lincoln Charter
diff --git a/lib/domains/org/llanoisd.txt b/lib/domains/org/llanoisd.txt
new file mode 100644
index 0000000000..0fae8083e2
--- /dev/null
+++ b/lib/domains/org/llanoisd.txt
@@ -0,0 +1,2 @@
+Llano Independent School District
+.group
diff --git a/lib/domains/org/lrstudents.txt b/lib/domains/org/lrstudents.txt
new file mode 100644
index 0000000000..eb440cbf57
--- /dev/null
+++ b/lib/domains/org/lrstudents.txt
@@ -0,0 +1 @@
+Lenape Regional High School District
diff --git a/lib/domains/org/lw210.txt b/lib/domains/org/lw210.txt
new file mode 100644
index 0000000000..9700b900e8
--- /dev/null
+++ b/lib/domains/org/lw210.txt
@@ -0,0 +1 @@
+Lincoln Way Community High School District 210
diff --git a/lib/domains/org/macintyreacademies.txt b/lib/domains/org/macintyreacademies.txt
new file mode 100644
index 0000000000..3c859eec72
--- /dev/null
+++ b/lib/domains/org/macintyreacademies.txt
@@ -0,0 +1 @@
+MacIntyre Academies
diff --git a/lib/domains/org/maltingsacademy.txt b/lib/domains/org/maltingsacademy.txt
new file mode 100644
index 0000000000..89d904a527
--- /dev/null
+++ b/lib/domains/org/maltingsacademy.txt
@@ -0,0 +1 @@
+Maltings Academy
\ No newline at end of file
diff --git a/lib/domains/org/menloschool.txt b/lib/domains/org/menloschool.txt
new file mode 100644
index 0000000000..24b3b5d03b
--- /dev/null
+++ b/lib/domains/org/menloschool.txt
@@ -0,0 +1 @@
+Menlo School
diff --git a/lib/domains/org/mines-nancy.txt b/lib/domains/org/mines-nancy.txt
new file mode 100644
index 0000000000..7fd2613ca0
--- /dev/null
+++ b/lib/domains/org/mines-nancy.txt
@@ -0,0 +1 @@
+École Nationale Supérieure des Mines de Nancy
diff --git a/lib/domains/org/misd400.txt b/lib/domains/org/misd400.txt
new file mode 100644
index 0000000000..d2d387b808
--- /dev/null
+++ b/lib/domains/org/misd400.txt
@@ -0,0 +1 @@
+Mercer Island School District
diff --git a/lib/domains/org/mkuniversity.txt b/lib/domains/org/mkuniversity.txt
new file mode 100644
index 0000000000..b3e31e12b6
--- /dev/null
+++ b/lib/domains/org/mkuniversity.txt
@@ -0,0 +1 @@
+Madurai Kamaraj University
diff --git a/lib/domains/org/mpspride.txt b/lib/domains/org/mpspride.txt
new file mode 100644
index 0000000000..27a3cded12
--- /dev/null
+++ b/lib/domains/org/mpspride.txt
@@ -0,0 +1 @@
+Manchester CT, Public Schools
diff --git a/lib/domains/org/mursd.txt b/lib/domains/org/mursd.txt
new file mode 100644
index 0000000000..b28a5de750
--- /dev/null
+++ b/lib/domains/org/mursd.txt
@@ -0,0 +1 @@
+Nipmuc Regional High School
diff --git a/lib/domains/org/myimmaculatehs.txt b/lib/domains/org/myimmaculatehs.txt
new file mode 100644
index 0000000000..bb67ac39d8
--- /dev/null
+++ b/lib/domains/org/myimmaculatehs.txt
@@ -0,0 +1 @@
+Immaculate High School
diff --git a/lib/domains/org/mysbisd.txt b/lib/domains/org/mysbisd.txt
new file mode 100644
index 0000000000..2089c1df09
--- /dev/null
+++ b/lib/domains/org/mysbisd.txt
@@ -0,0 +1,2 @@
+Spring Branch ISD
+.group
diff --git a/lib/domains/org/ndpma.txt b/lib/domains/org/ndpma.txt
new file mode 100644
index 0000000000..46d619b028
--- /dev/null
+++ b/lib/domains/org/ndpma.txt
@@ -0,0 +1 @@
+Notre Dame Preparatory School and Marist Academy
diff --git a/lib/domains/org/nkcschools.txt b/lib/domains/org/nkcschools.txt
new file mode 100644
index 0000000000..354fd34312
--- /dev/null
+++ b/lib/domains/org/nkcschools.txt
@@ -0,0 +1 @@
+North Kansas City Schools
diff --git a/lib/domains/org/nscsd.txt b/lib/domains/org/nscsd.txt
new file mode 100644
index 0000000000..655ce0a872
--- /dev/null
+++ b/lib/domains/org/nscsd.txt
@@ -0,0 +1 @@
+North Syracuse Central Schools
diff --git a/lib/domains/org/pcsb.txt b/lib/domains/org/pcsb.txt
new file mode 100644
index 0000000000..f7f83daca7
--- /dev/null
+++ b/lib/domains/org/pcsb.txt
@@ -0,0 +1,2 @@
+Pinellas County School Board
+.group
diff --git a/lib/domains/org/qe.txt b/lib/domains/org/qe.txt
new file mode 100644
index 0000000000..09da8e4b5c
--- /dev/null
+++ b/lib/domains/org/qe.txt
@@ -0,0 +1 @@
+Queen Ethelburga's Collegiate
diff --git a/lib/domains/org/region16ct.txt b/lib/domains/org/region16ct.txt
new file mode 100644
index 0000000000..ef62258c9e
--- /dev/null
+++ b/lib/domains/org/region16ct.txt
@@ -0,0 +1 @@
+Woodland Regional High School in Beacon Falls CT under the Regional School District # 16
diff --git a/lib/domains/org/ryecountryday.txt b/lib/domains/org/ryecountryday.txt
new file mode 100644
index 0000000000..c9ad2601ac
--- /dev/null
+++ b/lib/domains/org/ryecountryday.txt
@@ -0,0 +1 @@
+Rye Country Day School
diff --git a/lib/domains/org/saintgits.txt b/lib/domains/org/saintgits.txt
new file mode 100644
index 0000000000..5d3ab713fd
--- /dev/null
+++ b/lib/domains/org/saintgits.txt
@@ -0,0 +1,3 @@
+Saintgits College of Engineering
+saintgits.org
+URL: http://saintgits.org/engineering-college
diff --git a/lib/domains/org/sch.txt b/lib/domains/org/sch.txt
new file mode 100644
index 0000000000..da85295909
--- /dev/null
+++ b/lib/domains/org/sch.txt
@@ -0,0 +1 @@
+Springside Chestnut Hill Academy
\ No newline at end of file
diff --git a/lib/domains/org/sciencescom.txt b/lib/domains/org/sciencescom.txt
new file mode 100644
index 0000000000..aef121f28e
--- /dev/null
+++ b/lib/domains/org/sciencescom.txt
@@ -0,0 +1 @@
+SciencesCom
diff --git a/lib/domains/org/sfuhs.txt b/lib/domains/org/sfuhs.txt
new file mode 100644
index 0000000000..9926eac834
--- /dev/null
+++ b/lib/domains/org/sfuhs.txt
@@ -0,0 +1 @@
+San Francisco University High School
diff --git a/lib/domains/org/sjb-liege.txt b/lib/domains/org/sjb-liege.txt
new file mode 100644
index 0000000000..e8c43f12d6
--- /dev/null
+++ b/lib/domains/org/sjb-liege.txt
@@ -0,0 +1 @@
+Institut Saint-Jean Berchmans Liège
diff --git a/lib/domains/org/spencerportschools.txt b/lib/domains/org/spencerportschools.txt
new file mode 100644
index 0000000000..ae035efe8d
--- /dev/null
+++ b/lib/domains/org/spencerportschools.txt
@@ -0,0 +1 @@
+Spencerport Central School District
diff --git a/lib/domains/org/spjimr.txt b/lib/domains/org/spjimr.txt
new file mode 100644
index 0000000000..d6e9ffaf9e
--- /dev/null
+++ b/lib/domains/org/spjimr.txt
@@ -0,0 +1 @@
+S. P. Jain Institute of Management And Research, Mumbai
diff --git a/lib/domains/org/sstx.txt b/lib/domains/org/sstx.txt
new file mode 100644
index 0000000000..464b808fd1
--- /dev/null
+++ b/lib/domains/org/sstx.txt
@@ -0,0 +1,16 @@
+Saint Stephen's Episcopal School
+Saint Stephens Episcopal School
+St. Stephen's Episcopal School
+St. Stephens Episcopal School
+Saint Stephen's Episcopal School of Austin
+Saint Stephens Episcopal School of Austin
+St. Stephen's Episcopal School of Austin
+St. Stephens Episcopal School of Austin
+Saint Stephen's Episcopal School, Austin
+Saint Stephens Episcopal School, Austin
+St. Stephen's Episcopal School, Austin
+St. Stephens Episcopal School, Austin
+Saint Stephen's Episcopal School, Austin TX
+Saint Stephens Episcopal School, Austin TX
+St. Stephen's Episcopal School, Austin TX
+St. Stephens Episcopal School, Austin TX
diff --git a/lib/domains/org/ssvotech.txt b/lib/domains/org/ssvotech.txt
new file mode 100644
index 0000000000..5bdcb86878
--- /dev/null
+++ b/lib/domains/org/ssvotech.txt
@@ -0,0 +1 @@
+South Shore Vocational Technical High School
diff --git a/lib/domains/org/st-christophers.txt b/lib/domains/org/st-christophers.txt
new file mode 100644
index 0000000000..a77b62a812
--- /dev/null
+++ b/lib/domains/org/st-christophers.txt
@@ -0,0 +1 @@
+St Christopher's CE High School
diff --git a/lib/domains/org/stbernards.txt b/lib/domains/org/stbernards.txt
new file mode 100644
index 0000000000..381d2b7f52
--- /dev/null
+++ b/lib/domains/org/stbernards.txt
@@ -0,0 +1 @@
+St. Bernard's School
diff --git a/lib/domains/org/stjacademy.txt b/lib/domains/org/stjacademy.txt
new file mode 100644
index 0000000000..e9975eab2c
--- /dev/null
+++ b/lib/domains/org/stjacademy.txt
@@ -0,0 +1 @@
+St. Johnsbury Academy
diff --git a/lib/domains/org/stjohnschs.txt b/lib/domains/org/stjohnschs.txt
new file mode 100644
index 0000000000..1d868382cd
--- /dev/null
+++ b/lib/domains/org/stjohnschs.txt
@@ -0,0 +1 @@
+St. John's College High School
diff --git a/lib/domains/org/suttonmail.txt b/lib/domains/org/suttonmail.txt
new file mode 100644
index 0000000000..f153e6b42d
--- /dev/null
+++ b/lib/domains/org/suttonmail.txt
@@ -0,0 +1 @@
+Cheam High School
\ No newline at end of file
diff --git a/lib/domains/org/svcschools.txt b/lib/domains/org/svcschools.txt
new file mode 100644
index 0000000000..e876d9a2b3
--- /dev/null
+++ b/lib/domains/org/svcschools.txt
@@ -0,0 +1 @@
+Saddleback Valley Christian School
diff --git a/lib/domains/org/tanenbaumchat.txt b/lib/domains/org/tanenbaumchat.txt
new file mode 100644
index 0000000000..e2b50a35c5
--- /dev/null
+++ b/lib/domains/org/tanenbaumchat.txt
@@ -0,0 +1 @@
+The Anne & Max Tanenbaum Community Hebrew Academy of Toronto
diff --git a/lib/domains/org/tcdupage.txt b/lib/domains/org/tcdupage.txt
new file mode 100644
index 0000000000..375dfd4672
--- /dev/null
+++ b/lib/domains/org/tcdupage.txt
@@ -0,0 +1 @@
+Technology Center of DuPage
diff --git a/lib/domains/org/tcstudents.txt b/lib/domains/org/tcstudents.txt
new file mode 100644
index 0000000000..e2b50a35c5
--- /dev/null
+++ b/lib/domains/org/tcstudents.txt
@@ -0,0 +1 @@
+The Anne & Max Tanenbaum Community Hebrew Academy of Toronto
diff --git a/lib/domains/org/teriinc.txt b/lib/domains/org/teriinc.txt
new file mode 100644
index 0000000000..74a6cac208
--- /dev/null
+++ b/lib/domains/org/teriinc.txt
@@ -0,0 +1 @@
+TERI Inc.
diff --git a/lib/domains/org/times2.txt b/lib/domains/org/times2.txt
new file mode 100644
index 0000000000..2fb9d3e712
--- /dev/null
+++ b/lib/domains/org/times2.txt
@@ -0,0 +1 @@
+Times2 STEM Academy
diff --git a/lib/domains/org/tonbridge-school.txt b/lib/domains/org/tonbridge-school.txt
new file mode 100644
index 0000000000..9d1aa919a0
--- /dev/null
+++ b/lib/domains/org/tonbridge-school.txt
@@ -0,0 +1 @@
+Tonbridge School
diff --git a/lib/domains/org/uits-bd.txt b/lib/domains/org/uits-bd.txt
deleted file mode 100644
index e04db19cd1..0000000000
--- a/lib/domains/org/uits-bd.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Information Technology &amp; Sciences (UITS)
diff --git a/lib/domains/org/unishanoi.txt b/lib/domains/org/unishanoi.txt
new file mode 100644
index 0000000000..a5f8564551
--- /dev/null
+++ b/lib/domains/org/unishanoi.txt
@@ -0,0 +1 @@
+United Nations International School of Hanoi
\ No newline at end of file
diff --git a/lib/domains/org/univ-annaba.txt b/lib/domains/org/univ-annaba.txt
new file mode 100644
index 0000000000..17fa1dba6e
--- /dev/null
+++ b/lib/domains/org/univ-annaba.txt
@@ -0,0 +1 @@
+Badji Mokhtar University - Annaba
diff --git a/lib/domains/org/univ-ndjamena.txt b/lib/domains/org/univ-ndjamena.txt
deleted file mode 100644
index da7ad6bddb..0000000000
--- a/lib/domains/org/univ-ndjamena.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université de N'Djamena
diff --git a/lib/domains/org/visocloud.txt b/lib/domains/org/visocloud.txt
new file mode 100644
index 0000000000..db086743a4
--- /dev/null
+++ b/lib/domains/org/visocloud.txt
@@ -0,0 +1 @@
+Vrij Instituut voor Secundair Onderwijs Mariakerke
diff --git a/lib/domains/org/welingkar.txt b/lib/domains/org/welingkar.txt
new file mode 100644
index 0000000000..85b1ffe602
--- /dev/null
+++ b/lib/domains/org/welingkar.txt
@@ -0,0 +1 @@
+Prin. L. N. Welingkar Institute of Management Development & Research
diff --git a/lib/domains/org/westboroughk12/student.txt b/lib/domains/org/westboroughk12/student.txt
new file mode 100644
index 0000000000..426d415c7b
--- /dev/null
+++ b/lib/domains/org/westboroughk12/student.txt
@@ -0,0 +1 @@
+Westborough Public Schools (Westborough, MA, US)
diff --git a/lib/domains/org/westerncenter.txt b/lib/domains/org/westerncenter.txt
new file mode 100644
index 0000000000..b932215471
--- /dev/null
+++ b/lib/domains/org/westerncenter.txt
@@ -0,0 +1 @@
+Western Montgomery Career and Technology Center
\ No newline at end of file
diff --git a/lib/domains/org/whps.txt b/lib/domains/org/whps.txt
new file mode 100644
index 0000000000..ef5648331b
--- /dev/null
+++ b/lib/domains/org/whps.txt
@@ -0,0 +1,2 @@
+West Hartford Public Schools
+.group
diff --git a/lib/domains/org/wwcsd.txt b/lib/domains/org/wwcsd.txt
new file mode 100644
index 0000000000..ad8615eb52
--- /dev/null
+++ b/lib/domains/org/wwcsd.txt
@@ -0,0 +1 @@
+Wayne-Westland Community School District
diff --git a/lib/domains/pe/SENATI.txt b/lib/domains/pe/SENATI.txt
new file mode 100644
index 0000000000..e9bacfbbb4
--- /dev/null
+++ b/lib/domains/pe/SENATI.txt
@@ -0,0 +1 @@
+Servicio Nacional de Adiestramiento en Trabajo Industrial
diff --git a/lib/domains/pe/edu/idat.txt b/lib/domains/pe/edu/idat.txt
new file mode 100644
index 0000000000..1857f2be74
--- /dev/null
+++ b/lib/domains/pe/edu/idat.txt
@@ -0,0 +1 @@
+Instituto superior tecnológico IDAT
diff --git a/lib/domains/pe/ucss.txt b/lib/domains/pe/ucss.txt
new file mode 100644
index 0000000000..babf504b1c
--- /dev/null
+++ b/lib/domains/pe/ucss.txt
@@ -0,0 +1 @@
+Universidad Católica Sedes Sapientiae
diff --git a/lib/domains/pe/unac.txt b/lib/domains/pe/unac.txt
new file mode 100644
index 0000000000..09c70b4d41
--- /dev/null
+++ b/lib/domains/pe/unac.txt
@@ -0,0 +1 @@
+Universidad Nacional del Callao
diff --git a/lib/domains/pe/upch.txt b/lib/domains/pe/upch.txt
new file mode 100644
index 0000000000..7b35096cc2
--- /dev/null
+++ b/lib/domains/pe/upch.txt
@@ -0,0 +1 @@
+Universidad Peruana Cayetano Heredia
diff --git a/lib/domains/pf/edu/ddec/clm.txt b/lib/domains/pf/edu/ddec/clm.txt
new file mode 100644
index 0000000000..befbf097ec
--- /dev/null
+++ b/lib/domains/pf/edu/ddec/clm.txt
@@ -0,0 +1 @@
+Lycée La Mennais
diff --git a/lib/domains/ph/com/pnumanila.txt b/lib/domains/ph/com/pnumanila.txt
deleted file mode 100644
index 773308acba..0000000000
--- a/lib/domains/ph/com/pnumanila.txt
+++ /dev/null
@@ -1 +0,0 @@
-Philippine Normal University
diff --git a/lib/domains/ph/edu/aupen.txt b/lib/domains/ph/edu/aupen.txt
deleted file mode 100644
index acfdb1590c..0000000000
--- a/lib/domains/ph/edu/aupen.txt
+++ /dev/null
@@ -1 +0,0 @@
-Araullo University
diff --git a/lib/domains/ph/edu/cu-cdo.txt b/lib/domains/ph/edu/cu-cdo.txt
deleted file mode 100644
index 7619741c1a..0000000000
--- a/lib/domains/ph/edu/cu-cdo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Capitol University
diff --git a/lib/domains/ph/edu/ldcu.txt b/lib/domains/ph/edu/ldcu.txt
deleted file mode 100644
index 77c03d3160..0000000000
--- a/lib/domains/ph/edu/ldcu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Liceo de Cagayan University
diff --git a/lib/domains/ph/edu/lsu-visca.txt b/lib/domains/ph/edu/lsu-visca.txt
deleted file mode 100644
index b76c5b709a..0000000000
--- a/lib/domains/ph/edu/lsu-visca.txt
+++ /dev/null
@@ -1 +0,0 @@
-Leyte State University 
diff --git a/lib/domains/ph/edu/psu-online.txt b/lib/domains/ph/edu/psu-online.txt
deleted file mode 100644
index 97d3829246..0000000000
--- a/lib/domains/ph/edu/psu-online.txt
+++ /dev/null
@@ -1 +0,0 @@
-Palawan State University
diff --git a/lib/domains/ph/edu/spu.txt b/lib/domains/ph/edu/spu.txt
deleted file mode 100644
index c264534fcf..0000000000
--- a/lib/domains/ph/edu/spu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Saint Paul University
diff --git a/lib/domains/ph/edu/universityofcebu.txt b/lib/domains/ph/edu/universityofcebu.txt
deleted file mode 100644
index 51e143cdf1..0000000000
--- a/lib/domains/ph/edu/universityofcebu.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Cebu
diff --git a/lib/domains/ph/edu/univman.txt b/lib/domains/ph/edu/univman.txt
deleted file mode 100644
index 67f25d3513..0000000000
--- a/lib/domains/ph/edu/univman.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Manila
diff --git a/lib/domains/ph/edu/upang.txt b/lib/domains/ph/edu/upang.txt
deleted file mode 100644
index 58c3e97569..0000000000
--- a/lib/domains/ph/edu/upang.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Pangasinan
diff --git a/lib/domains/ph/edu/uphighschoolcebu.txt b/lib/domains/ph/edu/uphighschoolcebu.txt
deleted file mode 100644
index e3a5d510c8..0000000000
--- a/lib/domains/ph/edu/uphighschoolcebu.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of the Philippines Visayas - Cebu High School
diff --git a/lib/domains/ph/edu/uphr.txt b/lib/domains/ph/edu/uphr.txt
deleted file mode 100644
index cca993ed19..0000000000
--- a/lib/domains/ph/edu/uphr.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Perpetual Help
diff --git a/lib/domains/ph/edu/urc.txt b/lib/domains/ph/edu/urc.txt
deleted file mode 100644
index 70b047c81f..0000000000
--- a/lib/domains/ph/edu/urc.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Regina Carmeli
diff --git a/lib/domains/pk/edu/alphaomega.txt b/lib/domains/pk/edu/alphaomega.txt
deleted file mode 100644
index 765626698b..0000000000
--- a/lib/domains/pk/edu/alphaomega.txt
+++ /dev/null
@@ -1 +0,0 @@
-Alpha Omega University
diff --git a/lib/domains/pk/edu/auh.txt b/lib/domains/pk/edu/auh.txt
deleted file mode 100644
index 8a71d327de..0000000000
--- a/lib/domains/pk/edu/auh.txt
+++ /dev/null
@@ -1 +0,0 @@
-American University of Hawaii, Punjab Campus
diff --git a/lib/domains/pk/edu/biztek.txt b/lib/domains/pk/edu/biztek.txt
deleted file mode 100644
index e04b96f7ff..0000000000
--- a/lib/domains/pk/edu/biztek.txt
+++ /dev/null
@@ -1 +0,0 @@
-Institute of Business &amp; Technology
diff --git a/lib/domains/pk/edu/cbm.txt b/lib/domains/pk/edu/cbm.txt
deleted file mode 100644
index 4c6f6af499..0000000000
--- a/lib/domains/pk/edu/cbm.txt
+++ /dev/null
@@ -1 +0,0 @@
-College of Business Management ( CBM )
diff --git a/lib/domains/pk/edu/ciit-wah.txt b/lib/domains/pk/edu/ciit-wah.txt
deleted file mode 100644
index 481b88c511..0000000000
--- a/lib/domains/pk/edu/ciit-wah.txt
+++ /dev/null
@@ -1 +0,0 @@
-COMSATS Institute of Information Technology, Wah
diff --git a/lib/domains/pk/edu/dcet.txt b/lib/domains/pk/edu/dcet.txt
deleted file mode 100644
index 3ee20877ae..0000000000
--- a/lib/domains/pk/edu/dcet.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dawood College of Engineering and Technology
diff --git a/lib/domains/pk/edu/fitfd.txt b/lib/domains/pk/edu/fitfd.txt
deleted file mode 100644
index 997c3c3240..0000000000
--- a/lib/domains/pk/edu/fitfd.txt
+++ /dev/null
@@ -1 +0,0 @@
-Faisalabad Institute of Textile and Fashion Design
diff --git a/lib/domains/pk/edu/guic.txt b/lib/domains/pk/edu/guic.txt
deleted file mode 100644
index 8863162ce2..0000000000
--- a/lib/domains/pk/edu/guic.txt
+++ /dev/null
@@ -1 +0,0 @@
-Greenwich University
diff --git a/lib/domains/pk/edu/hajvery.txt b/lib/domains/pk/edu/hajvery.txt
deleted file mode 100644
index 61263c1892..0000000000
--- a/lib/domains/pk/edu/hajvery.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hajvery University Lahore for Women
diff --git a/lib/domains/pk/edu/iqra.txt b/lib/domains/pk/edu/iqra.txt
new file mode 100644
index 0000000000..739a6e68d6
--- /dev/null
+++ b/lib/domains/pk/edu/iqra.txt
@@ -0,0 +1 @@
+iqra university
diff --git a/lib/domains/pk/edu/itu.txt b/lib/domains/pk/edu/itu.txt
new file mode 100644
index 0000000000..a7dab5befe
--- /dev/null
+++ b/lib/domains/pk/edu/itu.txt
@@ -0,0 +1 @@
+Information Technology University
diff --git a/lib/domains/pk/edu/kiit.txt b/lib/domains/pk/edu/kiit.txt
deleted file mode 100644
index d607966aae..0000000000
--- a/lib/domains/pk/edu/kiit.txt
+++ /dev/null
@@ -1 +0,0 @@
-Karachi Institute of Information Technology
diff --git a/lib/domains/pk/edu/mnsuet.txt b/lib/domains/pk/edu/mnsuet.txt
new file mode 100644
index 0000000000..5b89623e2c
--- /dev/null
+++ b/lib/domains/pk/edu/mnsuet.txt
@@ -0,0 +1 @@
+Muhammad Nawaz Sharif University of Engineering and Technology
diff --git a/lib/domains/pk/edu/pedu.txt b/lib/domains/pk/edu/pedu.txt
deleted file mode 100644
index 0a0ea29307..0000000000
--- a/lib/domains/pk/edu/pedu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pyramid Education Center
diff --git a/lib/domains/pk/edu/prestonpak.txt b/lib/domains/pk/edu/prestonpak.txt
deleted file mode 100644
index da8c2b1b4d..0000000000
--- a/lib/domains/pk/edu/prestonpak.txt
+++ /dev/null
@@ -1 +0,0 @@
-Preston University, Pakistan Campus
diff --git a/lib/domains/pk/edu/ssms.txt b/lib/domains/pk/edu/ssms.txt
deleted file mode 100644
index 7884db3aaa..0000000000
--- a/lib/domains/pk/edu/ssms.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sir Syed Institute Of Technology Islamabad
diff --git a/lib/domains/pk/edu/ulhr.txt b/lib/domains/pk/edu/ulhr.txt
deleted file mode 100644
index eb608422c4..0000000000
--- a/lib/domains/pk/edu/ulhr.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Lahore
diff --git a/lib/domains/pk/edu/uw.txt b/lib/domains/pk/edu/uw.txt
deleted file mode 100644
index 943e7fac12..0000000000
--- a/lib/domains/pk/edu/uw.txt
+++ /dev/null
@@ -1 +0,0 @@
-University of Wah
diff --git a/lib/domains/pl/aktywnaedukacja.txt b/lib/domains/pl/aktywnaedukacja.txt
new file mode 100644
index 0000000000..ac5488bb62
--- /dev/null
+++ b/lib/domains/pl/aktywnaedukacja.txt
@@ -0,0 +1 @@
+NoBell
diff --git a/lib/domains/pl/chelm/pwsz.txt b/lib/domains/pl/chelm/pwsz.txt
new file mode 100755
index 0000000000..dc1c66d1b8
--- /dev/null
+++ b/lib/domains/pl/chelm/pwsz.txt
@@ -0,0 +1,2 @@
+Państwowa Wyższa Szkoła Zawodowa w Chełmie
+The State School of Higher Education in Chełm
\ No newline at end of file
diff --git a/lib/domains/pl/debinka.txt b/lib/domains/pl/debinka.txt
new file mode 100644
index 0000000000..cfbc16c8c4
--- /dev/null
+++ b/lib/domains/pl/debinka.txt
@@ -0,0 +1 @@
+Kolegium Edukacyjne PSO
\ No newline at end of file
diff --git a/lib/domains/pl/edu/ajp.txt b/lib/domains/pl/edu/ajp.txt
new file mode 100644
index 0000000000..fbb2787ecf
--- /dev/null
+++ b/lib/domains/pl/edu/ajp.txt
@@ -0,0 +1,2 @@
+The Jacob of Paradies University in Gorzow Wielkopolski
+Akademia im. Jakuba z Paradyża w Gorzowie Wielkopolskim
diff --git a/lib/domains/pl/edu/aps.txt b/lib/domains/pl/edu/aps.txt
new file mode 100644
index 0000000000..7329d0540a
--- /dev/null
+++ b/lib/domains/pl/edu/aps.txt
@@ -0,0 +1,2 @@
+Akademia Pedagogiki Specjalnej
+The Academy of Special Education (The Maria Grzegorzewska University)
diff --git a/lib/domains/pl/edu/ath.txt b/lib/domains/pl/edu/ath.txt
new file mode 100644
index 0000000000..b3a0ceeba9
--- /dev/null
+++ b/lib/domains/pl/edu/ath.txt
@@ -0,0 +1 @@
+University of Bielsko-Biala
diff --git a/lib/domains/pl/edu/batory.txt b/lib/domains/pl/edu/batory.txt
new file mode 100644
index 0000000000..2d5b4c85c6
--- /dev/null
+++ b/lib/domains/pl/edu/batory.txt
@@ -0,0 +1 @@
+Liceum im. Stefana Batorego
diff --git a/lib/domains/pl/edu/elektryk.txt b/lib/domains/pl/edu/elektryk.txt
new file mode 100644
index 0000000000..0d853170d1
--- /dev/null
+++ b/lib/domains/pl/edu/elektryk.txt
@@ -0,0 +1 @@
+Zespol Szkol Elektrycznych
\ No newline at end of file
diff --git a/lib/domains/pl/edu/elodz/lo31.txt b/lib/domains/pl/edu/elodz/lo31.txt
new file mode 100644
index 0000000000..df05a4ffb4
--- /dev/null
+++ b/lib/domains/pl/edu/elodz/lo31.txt
@@ -0,0 +1,2 @@
+XXXI Liceum Ogólnokształcące im. Ludwika Zamenhofa w Łodzi
+Ludwik Zamenhof 31st High School in Lodz
\ No newline at end of file
diff --git a/lib/domains/pl/edu/gumed.txt b/lib/domains/pl/edu/gumed.txt
new file mode 100644
index 0000000000..dc3d3f9eca
--- /dev/null
+++ b/lib/domains/pl/edu/gumed.txt
@@ -0,0 +1 @@
+Medical University of Gdansk
diff --git a/lib/domains/pl/edu/lckziu.txt b/lib/domains/pl/edu/lckziu.txt
new file mode 100644
index 0000000000..d5af8427d5
--- /dev/null
+++ b/lib/domains/pl/edu/lckziu.txt
@@ -0,0 +1 @@
+Lubelskie Centrum Kształcenia Zawodowego i Ustawicznego
diff --git a/lib/domains/pl/edu/legnica/pwsz/studenci.txt b/lib/domains/pl/edu/legnica/pwsz/studenci.txt
new file mode 100644
index 0000000000..d5690f5bbc
--- /dev/null
+++ b/lib/domains/pl/edu/legnica/pwsz/studenci.txt
@@ -0,0 +1,2 @@
+The Witelon State University of Applied Sciences in Legnica
+Państwowa Wyższa Szkoła Zawodowa im Witelona w Legnicy
diff --git a/lib/domains/pl/edu/nobell.txt b/lib/domains/pl/edu/nobell.txt
new file mode 100644
index 0000000000..ac5488bb62
--- /dev/null
+++ b/lib/domains/pl/edu/nobell.txt
@@ -0,0 +1 @@
+NoBell
diff --git a/lib/domains/pl/edu/pack.txt b/lib/domains/pl/edu/pack.txt
new file mode 100644
index 0000000000..456ae45b38
--- /dev/null
+++ b/lib/domains/pl/edu/pack.txt
@@ -0,0 +1,2 @@
+VIII Prywatne Akademickie Liceum Ogólnokształcące
+Private Academic High School No 8 of Krakow, Poland
diff --git a/lib/domains/pl/edu/pg.txt b/lib/domains/pl/edu/pg.txt
new file mode 100644
index 0000000000..88e5e8aa56
--- /dev/null
+++ b/lib/domains/pl/edu/pg.txt
@@ -0,0 +1 @@
+Technical University of Gdansk
diff --git a/lib/domains/pl/edu/pja.txt b/lib/domains/pl/edu/pja.txt
new file mode 100644
index 0000000000..3028ee72c7
--- /dev/null
+++ b/lib/domains/pl/edu/pja.txt
@@ -0,0 +1 @@
+Polish-Japanese Academy of Information Technology in Warsaw
diff --git a/lib/domains/pl/edu/po/student.txt b/lib/domains/pl/edu/po/student.txt
new file mode 100644
index 0000000000..a3fb7ad00e
--- /dev/null
+++ b/lib/domains/pl/edu/po/student.txt
@@ -0,0 +1,2 @@
+Opole University of Technology
+Politechnika Opolska
\ No newline at end of file
diff --git a/lib/domains/pl/edu/prz.txt b/lib/domains/pl/edu/prz.txt
new file mode 100644
index 0000000000..b71d141bb7
--- /dev/null
+++ b/lib/domains/pl/edu/prz.txt
@@ -0,0 +1 @@
+Politechnika Rzeszowska im. Ignacego Łukasiewicza
diff --git a/lib/domains/pl/edu/pswbp/student.txt b/lib/domains/pl/edu/pswbp/student.txt
new file mode 100644
index 0000000000..c797d6ede9
--- /dev/null
+++ b/lib/domains/pl/edu/pswbp/student.txt
@@ -0,0 +1,2 @@
+Państwowa Szkoła Wyższa im. Papieża Jana Pawła II w Białej Podlaskiej
+Pope John Paul II State School Of Higher Education in Biała Podlaska
diff --git a/lib/domains/pl/edu/put.txt b/lib/domains/pl/edu/put.txt
new file mode 100644
index 0000000000..b03883962d
--- /dev/null
+++ b/lib/domains/pl/edu/put.txt
@@ -0,0 +1 @@
+Technical University of Poznan
diff --git a/lib/domains/pl/edu/pwste.txt b/lib/domains/pl/edu/pwste.txt
new file mode 100644
index 0000000000..f48b06f65f
--- /dev/null
+++ b/lib/domains/pl/edu/pwste.txt
@@ -0,0 +1,2 @@
+Panstwowa Wyzsza Szkola Techniczno-Ekonomiczna w Jaroslawiu
+The State Higher School of Technology and Economics in Jaroslaw
\ No newline at end of file
diff --git a/lib/domains/pl/edu/pwsz-kalisz.txt b/lib/domains/pl/edu/pwsz-kalisz.txt
new file mode 100644
index 0000000000..05a1f7f599
--- /dev/null
+++ b/lib/domains/pl/edu/pwsz-kalisz.txt
@@ -0,0 +1 @@
+Państwowa Wyższa Szkoła Zawodowa w Kaliszu
diff --git a/lib/domains/pl/edu/pwszchelm.txt b/lib/domains/pl/edu/pwszchelm.txt
new file mode 100755
index 0000000000..dc1c66d1b8
--- /dev/null
+++ b/lib/domains/pl/edu/pwszchelm.txt
@@ -0,0 +1,2 @@
+Państwowa Wyższa Szkoła Zawodowa w Chełmie
+The State School of Higher Education in Chełm
\ No newline at end of file
diff --git a/lib/domains/pl/edu/pwsztar.txt b/lib/domains/pl/edu/pwsztar.txt
new file mode 100644
index 0000000000..80d3f8d5c8
--- /dev/null
+++ b/lib/domains/pl/edu/pwsztar.txt
@@ -0,0 +1,2 @@
+Państwowa Wyższa Szkoła Zawodowa w Tarnowie
+State Higher Vocational School in Tarnów
diff --git a/lib/domains/pl/edu/pwsztar/student.txt b/lib/domains/pl/edu/pwsztar/student.txt
new file mode 100644
index 0000000000..323524e3c6
--- /dev/null
+++ b/lib/domains/pl/edu/pwsztar/student.txt
@@ -0,0 +1 @@
+Państwowa Wyższa Szkoła Zawodowa w Tarnowie
diff --git a/lib/domains/pl/edu/san.txt b/lib/domains/pl/edu/san.txt
new file mode 100644
index 0000000000..a93e43ae7f
--- /dev/null
+++ b/lib/domains/pl/edu/san.txt
@@ -0,0 +1 @@
+Społeczna Akademia Nauk
diff --git a/lib/domains/pl/edu/skarga.txt b/lib/domains/pl/edu/skarga.txt
new file mode 100644
index 0000000000..419c761c93
--- /dev/null
+++ b/lib/domains/pl/edu/skarga.txt
@@ -0,0 +1 @@
+Katolicki Zespół Edukacyjny
diff --git a/lib/domains/pl/edu/smcebi.txt b/lib/domains/pl/edu/smcebi.txt
new file mode 100644
index 0000000000..5d4c417f95
--- /dev/null
+++ b/lib/domains/pl/edu/smcebi.txt
@@ -0,0 +1 @@
+Silesian Centre for Education and Interdisciplinary Research
diff --git a/lib/domains/pl/edu/tm1.txt b/lib/domains/pl/edu/tm1.txt
new file mode 100644
index 0000000000..c8f8c0895c
--- /dev/null
+++ b/lib/domains/pl/edu/tm1.txt
@@ -0,0 +1 @@
+Zespół Szkół Licealnych i Technicznych nr 1 w Warszawie
diff --git a/lib/domains/pl/edu/ug.txt b/lib/domains/pl/edu/ug.txt
new file mode 100644
index 0000000000..e2b3f059be
--- /dev/null
+++ b/lib/domains/pl/edu/ug.txt
@@ -0,0 +1 @@
+University of Gdansk
diff --git a/lib/domains/pl/edu/umcs/live.txt b/lib/domains/pl/edu/umcs/live.txt
new file mode 100644
index 0000000000..ec9abaf37c
--- /dev/null
+++ b/lib/domains/pl/edu/umcs/live.txt
@@ -0,0 +1 @@
+Maria Curie Skłodowska University in Lublin
\ No newline at end of file
diff --git a/lib/domains/pl/edu/ump.txt b/lib/domains/pl/edu/ump.txt
new file mode 100644
index 0000000000..9a9328cf99
--- /dev/null
+++ b/lib/domains/pl/edu/ump.txt
@@ -0,0 +1,6 @@
+Uniwersytet Medyczny im. Karola Marcinkowskiego w Poznaniu
+Poznan University of Medical Sciences
+
+Domains:
+@ump.edu.pl 
+@student.ump.edu.pl - studenta, PhD candidates
diff --git a/lib/domains/pl/edu/upjp2.txt b/lib/domains/pl/edu/upjp2.txt
new file mode 100644
index 0000000000..fc0f3ba551
--- /dev/null
+++ b/lib/domains/pl/edu/upjp2.txt
@@ -0,0 +1,2 @@
+Uniwersytet Papieski Jana Pawła II w Krakowie
+Pontifical University of John Paul II
diff --git a/lib/domains/pl/edu/usz.txt b/lib/domains/pl/edu/usz.txt
new file mode 100644
index 0000000000..435adb1696
--- /dev/null
+++ b/lib/domains/pl/edu/usz.txt
@@ -0,0 +1 @@
+University of Szczecin
diff --git a/lib/domains/pl/edu/vistula.txt b/lib/domains/pl/edu/vistula.txt
new file mode 100644
index 0000000000..b6bcce0fe5
--- /dev/null
+++ b/lib/domains/pl/edu/vistula.txt
@@ -0,0 +1 @@
+Akademia Finansow i Biznesu Vistula
\ No newline at end of file
diff --git a/lib/domains/pl/edu/wsosp.txt b/lib/domains/pl/edu/wsosp.txt
new file mode 100644
index 0000000000..4c8db0ecfd
--- /dev/null
+++ b/lib/domains/pl/edu/wsosp.txt
@@ -0,0 +1 @@
+Polish Air Force Academy
diff --git a/lib/domains/pl/edu/wspa.txt b/lib/domains/pl/edu/wspa.txt
new file mode 100644
index 0000000000..1c17d3b300
--- /dev/null
+++ b/lib/domains/pl/edu/wspa.txt
@@ -0,0 +1,3 @@
+Wyższa Szkoła Przedsiębiorczości i Administracji w Lublinie
+University College of Enterprise and Administration in Lublin 
+WSPA
diff --git a/lib/domains/pl/edu/wwsi.txt b/lib/domains/pl/edu/wwsi.txt
new file mode 100644
index 0000000000..ff46104b43
--- /dev/null
+++ b/lib/domains/pl/edu/wwsi.txt
@@ -0,0 +1,3 @@
+Warsaw School of Computer Science
+Warszawska Wyższa Szkoła Informatyki
+http://www.wwsi.edu.pl/
\ No newline at end of file
diff --git a/lib/domains/pl/edu/zamoyski.txt b/lib/domains/pl/edu/zamoyski.txt
new file mode 100644
index 0000000000..6af56453ce
--- /dev/null
+++ b/lib/domains/pl/edu/zamoyski.txt
@@ -0,0 +1 @@
+XVIII Liceum Ogólnokształcące im. Jana Zamoyskiego w Warszawie
diff --git a/lib/domains/pl/edu/zespolszkolkomunikacji.txt b/lib/domains/pl/edu/zespolszkolkomunikacji.txt
new file mode 100644
index 0000000000..12afeaae11
--- /dev/null
+++ b/lib/domains/pl/edu/zespolszkolkomunikacji.txt
@@ -0,0 +1 @@
+Zespół Szkół Komunikacji im. Hipolita Cegielskiego w Poznaniu
diff --git a/lib/domains/pl/gdynia/wsm.txt b/lib/domains/pl/gdynia/am.txt
similarity index 100%
rename from lib/domains/pl/gdynia/wsm.txt
rename to lib/domains/pl/gdynia/am.txt
diff --git a/lib/domains/pl/gliwice/zsti.txt b/lib/domains/pl/gliwice/zsti.txt
new file mode 100644
index 0000000000..798e7aebf6
--- /dev/null
+++ b/lib/domains/pl/gliwice/zsti.txt
@@ -0,0 +1,2 @@
+Zespół Szkół Techniczno-Informatycznych
+Informatics-Technical School
diff --git a/lib/domains/pl/krakow/wse.txt b/lib/domains/pl/krakow/wse.txt
new file mode 100644
index 0000000000..a8e7edd811
--- /dev/null
+++ b/lib/domains/pl/krakow/wse.txt
@@ -0,0 +1,3 @@
+native language Polish
+
+Wyższa Szkoła Europejska
diff --git a/lib/domains/pl/lublin/wsei.txt b/lib/domains/pl/lublin/wsei.txt
new file mode 100644
index 0000000000..497e2d66c3
--- /dev/null
+++ b/lib/domains/pl/lublin/wsei.txt
@@ -0,0 +1 @@
+University of Economics and Innovation in Lublin
diff --git a/lib/domains/pl/pswbp/dydaktyka.txt b/lib/domains/pl/pswbp/dydaktyka.txt
new file mode 100644
index 0000000000..c797d6ede9
--- /dev/null
+++ b/lib/domains/pl/pswbp/dydaktyka.txt
@@ -0,0 +1,2 @@
+Państwowa Szkoła Wyższa im. Papieża Jana Pawła II w Białej Podlaskiej
+Pope John Paul II State School Of Higher Education in Biała Podlaska
diff --git a/lib/domains/pl/pswbp/student.txt b/lib/domains/pl/pswbp/student.txt
new file mode 100644
index 0000000000..c797d6ede9
--- /dev/null
+++ b/lib/domains/pl/pswbp/student.txt
@@ -0,0 +1,2 @@
+Państwowa Szkoła Wyższa im. Papieża Jana Pawła II w Białej Podlaskiej
+Pope John Paul II State School Of Higher Education in Biała Podlaska
diff --git a/lib/domains/pl/pwste.txt b/lib/domains/pl/pwste.txt
new file mode 100644
index 0000000000..78c8cb78c3
--- /dev/null
+++ b/lib/domains/pl/pwste.txt
@@ -0,0 +1 @@
+The Bronisław Markiewicz State Higher School of Technology and Economics in Jarosław
diff --git a/lib/domains/pl/pwszchelm.txt b/lib/domains/pl/pwszchelm.txt
new file mode 100755
index 0000000000..dc1c66d1b8
--- /dev/null
+++ b/lib/domains/pl/pwszchelm.txt
@@ -0,0 +1,2 @@
+Państwowa Wyższa Szkoła Zawodowa w Chełmie
+The State School of Higher Education in Chełm
\ No newline at end of file
diff --git a/lib/domains/pl/pzsbierun.txt b/lib/domains/pl/pzsbierun.txt
new file mode 100644
index 0000000000..87d85db792
--- /dev/null
+++ b/lib/domains/pl/pzsbierun.txt
@@ -0,0 +1 @@
+Powiatowy Zespół Szkół w Bieruniu (PZS Bieruń)
diff --git a/lib/domains/pl/umlub.txt b/lib/domains/pl/umlub.txt
new file mode 100644
index 0000000000..c34620e272
--- /dev/null
+++ b/lib/domains/pl/umlub.txt
@@ -0,0 +1,3 @@
+Medical University of Lublin
+@student.umlub.pl
+@umlub.pl
diff --git a/lib/domains/pl/umlub/student.txt b/lib/domains/pl/umlub/student.txt
new file mode 100644
index 0000000000..c34620e272
--- /dev/null
+++ b/lib/domains/pl/umlub/student.txt
@@ -0,0 +1,3 @@
+Medical University of Lublin
+@student.umlub.pl
+@umlub.pl
diff --git a/lib/domains/pl/wsm.txt b/lib/domains/pl/wsm.txt
new file mode 100644
index 0000000000..9c5c36869f
--- /dev/null
+++ b/lib/domains/pl/wsm.txt
@@ -0,0 +1 @@
+WSM Warsaw Management University
diff --git a/lib/domains/pl/wsosp.txt b/lib/domains/pl/wsosp.txt
new file mode 100644
index 0000000000..4c8db0ecfd
--- /dev/null
+++ b/lib/domains/pl/wsosp.txt
@@ -0,0 +1 @@
+Polish Air Force Academy
diff --git a/lib/domains/pl/zpsb.txt b/lib/domains/pl/zpsb.txt
new file mode 100644
index 0000000000..a2bd7b7b62
--- /dev/null
+++ b/lib/domains/pl/zpsb.txt
@@ -0,0 +1,2 @@
+Zachodniopomorska Szkoła Biznesu w Szczecinie
+West Pomeranian School of Business
diff --git a/lib/domains/pl/zs1piaseczno.txt b/lib/domains/pl/zs1piaseczno.txt
new file mode 100644
index 0000000000..48e0de5310
--- /dev/null
+++ b/lib/domains/pl/zs1piaseczno.txt
@@ -0,0 +1 @@
+Zespół Szkół Nr 1 w Piasecznie
diff --git a/lib/domains/pt/ismat.txt b/lib/domains/pt/ismat.txt
new file mode 100644
index 0000000000..77605346e8
--- /dev/null
+++ b/lib/domains/pt/ismat.txt
@@ -0,0 +1 @@
+INSTITUTO SUPERIOR MANUEL TEIXEIRA GOMES
diff --git a/lib/domains/pt/uma/student.txt b/lib/domains/pt/uma/student.txt
new file mode 100644
index 0000000000..713977b01a
--- /dev/null
+++ b/lib/domains/pt/uma/student.txt
@@ -0,0 +1 @@
+Universidade da Madeira
diff --git a/lib/domains/ro/anefs-edu.txt b/lib/domains/ro/anefs-edu.txt
deleted file mode 100644
index edcc3c422d..0000000000
--- a/lib/domains/ro/anefs-edu.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Academy for Physical Education and Sports Bucharest
diff --git a/lib/domains/ro/umf.txt b/lib/domains/ro/umf.txt
new file mode 100644
index 0000000000..84f6457f3b
--- /dev/null
+++ b/lib/domains/ro/umf.txt
@@ -0,0 +1,2 @@
+"Carol Davila" University of Medicine and Pharmacy Bucharest
+Universitatea de Medicină și Farmacie „Carol Davila” București
diff --git a/lib/domains/ro/unbm/student.txt b/lib/domains/ro/unbm/student.txt
deleted file mode 100644
index 8d77d0728a..0000000000
--- a/lib/domains/ro/unbm/student.txt
+++ /dev/null
@@ -1 +0,0 @@
-Technical University of Cluj-Napoca, North University Centre Baia Mare
diff --git a/lib/domains/rs/ac/metropolitan.txt b/lib/domains/rs/ac/metropolitan.txt
new file mode 100644
index 0000000000..c55438e209
--- /dev/null
+++ b/lib/domains/rs/ac/metropolitan.txt
@@ -0,0 +1 @@
+Metropolitan University
diff --git a/lib/domains/rs/ac/su/vts.txt b/lib/domains/rs/ac/su/vts.txt
new file mode 100644
index 0000000000..2f0baaf880
--- /dev/null
+++ b/lib/domains/rs/ac/su/vts.txt
@@ -0,0 +1,2 @@
+Subotica Tech - College of Applied Sciences
+Visoka tehnička škola strukovnih studija Subotica
\ No newline at end of file
diff --git a/lib/domains/rs/edu/fmk.txt b/lib/domains/rs/edu/fmk.txt
new file mode 100644
index 0000000000..9daa13556f
--- /dev/null
+++ b/lib/domains/rs/edu/fmk.txt
@@ -0,0 +1 @@
+Singidunum University
diff --git a/lib/domains/rs/edu/ict.txt b/lib/domains/rs/edu/ict.txt
new file mode 100644
index 0000000000..30aa877d73
--- /dev/null
+++ b/lib/domains/rs/edu/ict.txt
@@ -0,0 +1 @@
+Visoka ICT škola (ICT College of Vocational Studies)
diff --git a/lib/domains/rs/edu/its.txt b/lib/domains/rs/edu/its.txt
new file mode 100644
index 0000000000..0810e3c862
--- /dev/null
+++ b/lib/domains/rs/edu/its.txt
@@ -0,0 +1 @@
+ITS - Visoka škola strukovnih studija za informacione tehnologije | Beograd
diff --git a/lib/domains/rs/edu/vhts.txt b/lib/domains/rs/edu/vhts.txt
new file mode 100644
index 0000000000..6298a6ce1a
--- /dev/null
+++ b/lib/domains/rs/edu/vhts.txt
@@ -0,0 +1 @@
+Visoka tehničko-tehnološka škola strukovnih studija - Kruševac, Srbija (College of applied technical & technological studies - Krusevac, Serbia)
diff --git a/lib/domains/rs/edu/vtsnis.txt b/lib/domains/rs/edu/vtsnis.txt
new file mode 100644
index 0000000000..993993bdb7
--- /dev/null
+++ b/lib/domains/rs/edu/vtsnis.txt
@@ -0,0 +1,5 @@
+College of Applied Technical Sciences Nis
+Visoka tehnicka skola strukovnih studija Nis
+Visoka tehnička škola strukovnih studija Niš
+Visoka thnička škola Niš
+Visoka tehnicka skola Ni
diff --git a/lib/domains/rs/fink.txt b/lib/domains/rs/fink.txt
new file mode 100644
index 0000000000..512451ee9a
--- /dev/null
+++ b/lib/domains/rs/fink.txt
@@ -0,0 +1 @@
+University of Kragujevac, Faculty of Engineering
diff --git a/lib/domains/rs/vtsnis.txt b/lib/domains/rs/vtsnis.txt
index e8c32525f3..2f3fbb29d8 100644
--- a/lib/domains/rs/vtsnis.txt
+++ b/lib/domains/rs/vtsnis.txt
@@ -1 +1,5 @@
-Visoka tehnicka skola strukovnih studija
+College of Applied Technical Sciences Nis
+Visoka tehnicka skola strukovnih studija Nis
+Visoka tehnička škola strukovnih studija Niš
+Visoka thnička škola Niš
+Visoka tehnicka skola Nis
diff --git a/lib/domains/ru/239.txt b/lib/domains/ru/239.txt
new file mode 100644
index 0000000000..9f5438e4cd
--- /dev/null
+++ b/lib/domains/ru/239.txt
@@ -0,0 +1 @@
+Physics and Mathematics Lyceum No. 239, St. Petersburg
diff --git a/lib/domains/ru/ac/stup.txt b/lib/domains/ru/ac/stup.txt
deleted file mode 100644
index f3276edb01..0000000000
--- a/lib/domains/ru/ac/stup.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Penza State Technical University
-Penza State Technical University
diff --git a/lib/domains/ru/ac/tu-chel.txt b/lib/domains/ru/ac/tu-chel.txt
deleted file mode 100644
index 1d5079d7a8..0000000000
--- a/lib/domains/ru/ac/tu-chel.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Southern Ural State University
-Southern Ural State University
diff --git a/lib/domains/ru/ac/vorstu.txt b/lib/domains/ru/ac/vorstu.txt
deleted file mode 100644
index 380dff92bd..0000000000
--- a/lib/domains/ru/ac/vorstu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Voronezh State Technical University
-Voronezh State Technical University
diff --git a/lib/domains/ru/britishdesign.txt b/lib/domains/ru/britishdesign.txt
new file mode 100644
index 0000000000..99c3d290a0
--- /dev/null
+++ b/lib/domains/ru/britishdesign.txt
@@ -0,0 +1 @@
+British Higher School of Art & Design
diff --git a/lib/domains/ru/edu/msuc.txt b/lib/domains/ru/edu/msuc.txt
deleted file mode 100644
index 104e28d891..0000000000
--- a/lib/domains/ru/edu/msuc.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Moscow State University of Culture
-Moscow State University of Culture
diff --git a/lib/domains/ru/imiit.txt b/lib/domains/ru/imiit.txt
new file mode 100644
index 0000000000..d1bf354dd8
--- /dev/null
+++ b/lib/domains/ru/imiit.txt
@@ -0,0 +1,2 @@
+Institute of Management and Information Technologies of RUT (MIIT)
+Институт Управления и Информационных Технологий РУТ (МИИТ)
diff --git a/lib/domains/ru/inueco.txt b/lib/domains/ru/inueco.txt
new file mode 100644
index 0000000000..7ef83ce708
--- /dev/null
+++ b/lib/domains/ru/inueco.txt
@@ -0,0 +1,2 @@
+South Ural Institute of Management and Economics
+Южно-Уральский институт Управления и Экономики
diff --git a/lib/domains/ru/kaf65.txt b/lib/domains/ru/kaf65.txt
new file mode 100644
index 0000000000..40a9ba2dc0
--- /dev/null
+++ b/lib/domains/ru/kaf65.txt
@@ -0,0 +1 @@
+Kafedra 65 Concurrent systems analysis of MEPhI (Moscow Engineering Physics Institute)
\ No newline at end of file
diff --git a/lib/domains/ru/kait20.txt b/lib/domains/ru/kait20.txt
new file mode 100644
index 0000000000..f233384801
--- /dev/null
+++ b/lib/domains/ru/kait20.txt
@@ -0,0 +1,3 @@
+GBPOU KAIT N 20, GBU, Moscow, Russia
+In Russian, short: ГБПОУ КАИТ №20
+In Russian, full official: Государственное бюджетное профессиональное образовательное учреждение города Москвы "Колледж автоматизации и информационных технологий № 20"
\ No newline at end of file
diff --git a/lib/domains/ru/kgeu.txt b/lib/domains/ru/kgeu.txt
new file mode 100644
index 0000000000..1329ef9372
--- /dev/null
+++ b/lib/domains/ru/kgeu.txt
@@ -0,0 +1 @@
+Kazan State Power Engineering University
diff --git a/lib/domains/ru/kirov/vspu.txt b/lib/domains/ru/kirov/vspu.txt
deleted file mode 100644
index abf539866b..0000000000
--- a/lib/domains/ru/kirov/vspu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Vyatka State Pedagogical University
-Vyatka State Pedagogical University
diff --git a/lib/domains/ru/ktits.txt b/lib/domains/ru/ktits.txt
new file mode 100644
index 0000000000..e7b8fa2d37
--- /dev/null
+++ b/lib/domains/ru/ktits.txt
@@ -0,0 +1 @@
+Kazan Technical School of Information Technologies and Communication
diff --git a/lib/domains/ru/kubsau.txt b/lib/domains/ru/kubsau.txt
new file mode 100644
index 0000000000..27f25a3a50
--- /dev/null
+++ b/lib/domains/ru/kubsau.txt
@@ -0,0 +1,2 @@
+Kuban State Agrarian University
+Kuban State Agrarian University
diff --git a/lib/domains/ru/kursksu.txt b/lib/domains/ru/kursksu.txt
new file mode 100644
index 0000000000..1a01e3ec79
--- /dev/null
+++ b/lib/domains/ru/kursksu.txt
@@ -0,0 +1,2 @@
+Kursk State University
+Kursk State University
diff --git a/lib/domains/ru/ac/kuzstu.txt b/lib/domains/ru/kuzstu.txt
similarity index 50%
rename from lib/domains/ru/ac/kuzstu.txt
rename to lib/domains/ru/kuzstu.txt
index 1ab773efe7..9c61b701ee 100644
--- a/lib/domains/ru/ac/kuzstu.txt
+++ b/lib/domains/ru/kuzstu.txt
@@ -1,2 +1 @@
 Kuzbass State Technical University
-Kuzbass State Technical University
diff --git a/lib/domains/ru/mai.txt b/lib/domains/ru/mai.txt
new file mode 100644
index 0000000000..ae32e8d8b5
--- /dev/null
+++ b/lib/domains/ru/mai.txt
@@ -0,0 +1 @@
+Moscow Aviation Institute
diff --git a/lib/domains/ru/mari/margu.txt b/lib/domains/ru/mari/margu.txt
deleted file mode 100644
index a867d97d04..0000000000
--- a/lib/domains/ru/mari/margu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Marij State University
-Marij State University
diff --git a/lib/domains/ru/mari/yola15.txt b/lib/domains/ru/mari/yola15.txt
deleted file mode 100644
index 224f5c726c..0000000000
--- a/lib/domains/ru/mari/yola15.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Secondary school №15 in Yoshkar-Ola
-МБОУ "Средняя общеобразовательная школа №15 г.Йошкар-Олы"
diff --git a/lib/domains/ru/mgutm.txt b/lib/domains/ru/mgutm.txt
new file mode 100644
index 0000000000..2a6ff7b132
--- /dev/null
+++ b/lib/domains/ru/mgutm.txt
@@ -0,0 +1,5 @@
+«Московский государственный университет технологий и управления имени К.Г. Разумовского (ПКУ)»
+МГУТУ им. К.Г. Разумовского (ПКУ)
+MGUTU
+Moscow State University of Technology and Management named after K.G. Razumovsky (PKU)
+Education programm: http://www.mgutm.ru/about/chairs/it.php
\ No newline at end of file
diff --git a/lib/domains/ru/miit.txt b/lib/domains/ru/miit.txt
index 9247122ea8..6b36748c16 100644
--- a/lib/domains/ru/miit.txt
+++ b/lib/domains/ru/miit.txt
@@ -1,2 +1,2 @@
-Moscow State University of Railway Transport
-Moscow State University of Railway Transport
+Russian University of Transport (MIIT)
+Российский университет транспорта (МИИТ)
diff --git a/lib/domains/ru/mitht.txt b/lib/domains/ru/mitht.txt
new file mode 100644
index 0000000000..4982e5ee11
--- /dev/null
+++ b/lib/domains/ru/mitht.txt
@@ -0,0 +1,2 @@
+Moscow Technologilac University (ITHT)
+Moscow State University of Fine Chemical Technologies
diff --git a/lib/domains/ru/msun.txt b/lib/domains/ru/msun.txt
new file mode 100644
index 0000000000..ff5dc886ea
--- /dev/null
+++ b/lib/domains/ru/msun.txt
@@ -0,0 +1 @@
+Maritime State University
diff --git a/lib/domains/ru/nsu/g.txt b/lib/domains/ru/nsu/g.txt
new file mode 100644
index 0000000000..f5003d43eb
--- /dev/null
+++ b/lib/domains/ru/nsu/g.txt
@@ -0,0 +1,2 @@
+Novosibirsk State University
+Новосибирский государственный университет
diff --git a/lib/domains/ru/nsuem.txt b/lib/domains/ru/nsuem.txt
new file mode 100644
index 0000000000..b9d968100c
--- /dev/null
+++ b/lib/domains/ru/nsuem.txt
@@ -0,0 +1 @@
+  Novosibirsk State University of Economics and Management
diff --git a/lib/domains/ru/pfncfu.txt b/lib/domains/ru/pfncfu.txt
new file mode 100644
index 0000000000..895d2885eb
--- /dev/null
+++ b/lib/domains/ru/pfncfu.txt
@@ -0,0 +1 @@
+Institute of service, tourism and design in Pyatigorsk
diff --git a/lib/domains/ru/pl36angarsk.txt b/lib/domains/ru/pl36angarsk.txt
new file mode 100644
index 0000000000..2855b1525a
--- /dev/null
+++ b/lib/domains/ru/pl36angarsk.txt
@@ -0,0 +1 @@
+Angarsk College of Advertising and Industrial Technology
\ No newline at end of file
diff --git a/lib/domains/ru/prgusa.txt b/lib/domains/ru/prgusa.txt
new file mode 100644
index 0000000000..a1fa2c1a23
--- /dev/null
+++ b/lib/domains/ru/prgusa.txt
@@ -0,0 +1 @@
+Sholem Aleichem Amur State University
diff --git a/lib/domains/ru/pskgu.txt b/lib/domains/ru/pskgu.txt
new file mode 100644
index 0000000000..fd0a1d9b8b
--- /dev/null
+++ b/lib/domains/ru/pskgu.txt
@@ -0,0 +1 @@
+Pskov state university
diff --git a/lib/domains/ru/ryazan/ttc.txt b/lib/domains/ru/ryazan/ttc.txt
deleted file mode 100644
index 4da6569d91..0000000000
--- a/lib/domains/ru/ryazan/ttc.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Ryazan State Pedagogical University
-Ryazan State Pedagogical University
diff --git a/lib/domains/ru/sakhalin/sakhgu.txt b/lib/domains/ru/sakhalin/sakhgu.txt
deleted file mode 100644
index ce56c05f30..0000000000
--- a/lib/domains/ru/sakhalin/sakhgu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Sakhalin State University
-Sakhalin State University
diff --git a/lib/domains/ru/samara/ssttu.txt b/lib/domains/ru/samara/ssttu.txt
deleted file mode 100644
index 471a1544d1..0000000000
--- a/lib/domains/ru/samara/ssttu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Samara State University of Teacher Training
-Samara State University of Teacher Training
diff --git a/lib/domains/ru/samara/sstu.txt b/lib/domains/ru/samara/sstu.txt
deleted file mode 100644
index 6eff057759..0000000000
--- a/lib/domains/ru/samara/sstu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Samara State Technical University
-Samara State Technical University
diff --git a/lib/domains/ru/sano.txt b/lib/domains/ru/sano.txt
new file mode 100644
index 0000000000..7af4213807
--- /dev/null
+++ b/lib/domains/ru/sano.txt
@@ -0,0 +1 @@
+Siberian Institute of Business and Information Technologies
diff --git a/lib/domains/ru/sch12.txt b/lib/domains/ru/sch12.txt
new file mode 100644
index 0000000000..7f145f0c53
--- /dev/null
+++ b/lib/domains/ru/sch12.txt
@@ -0,0 +1 @@
+School 12 of Petrozavodsk, Russia
diff --git a/lib/domains/ru/schelcol.txt b/lib/domains/ru/schelcol.txt
new file mode 100644
index 0000000000..e8ca0292e2
--- /dev/null
+++ b/lib/domains/ru/schelcol.txt
@@ -0,0 +1 @@
+Schelkovsky college
diff --git a/lib/domains/ru/sevsu.txt b/lib/domains/ru/sevsu.txt
new file mode 100644
index 0000000000..3ffb53750e
--- /dev/null
+++ b/lib/domains/ru/sevsu.txt
@@ -0,0 +1 @@
+Sevastopol State University
\ No newline at end of file
diff --git a/lib/domains/ru/smolgu.txt b/lib/domains/ru/smolgu.txt
new file mode 100644
index 0000000000..6e916168b3
--- /dev/null
+++ b/lib/domains/ru/smolgu.txt
@@ -0,0 +1 @@
+Smolensk State University
diff --git a/lib/domains/ru/spb/artacademy.txt b/lib/domains/ru/spb/artacademy.txt
deleted file mode 100644
index 25e8b713d6..0000000000
--- a/lib/domains/ru/spb/artacademy.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-St. Petersburg Repin State Academic Institute of Painting Sculpture and Achitecture
-St. Petersburg Repin State Academic Institute of Painting Sculpture and Achitecture
diff --git a/lib/domains/ru/spb/bstu.txt b/lib/domains/ru/spb/bstu.txt
deleted file mode 100644
index 293183d26d..0000000000
--- a/lib/domains/ru/spb/bstu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Baltic State Technical University "Voenmeh" D.F.Ustinov
diff --git a/lib/domains/ru/spbtei.txt b/lib/domains/ru/spbtei.txt
deleted file mode 100644
index 4193b5b025..0000000000
--- a/lib/domains/ru/spbtei.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-St. Petersburg Institute of Sales Management and Economics
-St. Petersburg Institute of Sales Management and Economics
diff --git a/lib/domains/ru/srshb.txt b/lib/domains/ru/srshb.txt
new file mode 100644
index 0000000000..34589e7936
--- /dev/null
+++ b/lib/domains/ru/srshb.txt
@@ -0,0 +1 @@
+Siberian regional business school
diff --git a/lib/domains/ru/suitd.txt b/lib/domains/ru/suitd.txt
new file mode 100644
index 0000000000..467cf5b1ca
--- /dev/null
+++ b/lib/domains/ru/suitd.txt
@@ -0,0 +1,2 @@
+СПбГУПТД Высшая Школа Технологии и Энергетики
+SPbSUTD Higher School of Technology and Energy
\ No newline at end of file
diff --git a/lib/domains/ru/ugrafmsh.txt b/lib/domains/ru/ugrafmsh.txt
new file mode 100644
index 0000000000..4ed8bc5dc5
--- /dev/null
+++ b/lib/domains/ru/ugrafmsh.txt
@@ -0,0 +1,2 @@
+Ugra Physics and Mathematics Lyceum
+Югорский физико-математический лицей-интернат
diff --git a/lib/domains/ru/uscon.txt b/lib/domains/ru/uscon.txt
deleted file mode 100644
index a5aabe513f..0000000000
--- a/lib/domains/ru/uscon.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Ural State Conservatory
-Ural State Conservatory
diff --git a/lib/domains/ru/vgppk.txt b/lib/domains/ru/vgppk.txt
new file mode 100644
index 0000000000..f3d6c8e961
--- /dev/null
+++ b/lib/domains/ru/vgppk.txt
@@ -0,0 +1 @@
+Voronezh State Vocational and Pedagogical College
\ No newline at end of file
diff --git a/lib/domains/ru/voenmeh.txt b/lib/domains/ru/voenmeh.txt
new file mode 100644
index 0000000000..104e6d7c1e
--- /dev/null
+++ b/lib/domains/ru/voenmeh.txt
@@ -0,0 +1 @@
+Baltic State Technical University "Voenmeh"
diff --git a/lib/domains/ru/yaroslavl/rgata.txt b/lib/domains/ru/yaroslavl/rgata.txt
deleted file mode 100644
index 9036b154a4..0000000000
--- a/lib/domains/ru/yaroslavl/rgata.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Rybinsk State Academy of Aviational Technology
-Rybinsk State Academy of Aviational Technology
diff --git a/lib/domains/sa/edu/gotevot.txt b/lib/domains/sa/edu/gotevot.txt
deleted file mode 100644
index 1c0182a68c..0000000000
--- a/lib/domains/sa/edu/gotevot.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-College of Technology at Abha
-College of Technology at Dammam
-College of Technology at Kharj
diff --git a/lib/domains/sa/edu/pcdp.txt b/lib/domains/sa/edu/pcdp.txt
deleted file mode 100644
index b8b6373db8..0000000000
--- a/lib/domains/sa/edu/pcdp.txt
+++ /dev/null
@@ -1 +0,0 @@
-Private College of Dentistry and Pharmacy
diff --git a/lib/domains/sa/edu/pscabha.txt b/lib/domains/sa/edu/pscabha.txt
deleted file mode 100644
index 449e0fd42f..0000000000
--- a/lib/domains/sa/edu/pscabha.txt
+++ /dev/null
@@ -1 +0,0 @@
-Prince Sultan College for Tourism and Hotel Scinces
diff --git a/lib/domains/sa/edu/rug.txt b/lib/domains/sa/edu/rug.txt
deleted file mode 100644
index 2dd34065cc..0000000000
--- a/lib/domains/sa/edu/rug.txt
+++ /dev/null
@@ -1 +0,0 @@
-Princess Nora Bint Abdulrahman University
diff --git a/lib/domains/sa/edu/su/students.txt b/lib/domains/sa/edu/su/students.txt
new file mode 100644
index 0000000000..ad85a415c0
--- /dev/null
+++ b/lib/domains/sa/edu/su/students.txt
@@ -0,0 +1 @@
+Shaqra University
diff --git a/lib/domains/school/cesar.txt b/lib/domains/school/cesar.txt
new file mode 100644
index 0000000000..fe30fa105a
--- /dev/null
+++ b/lib/domains/school/cesar.txt
@@ -0,0 +1 @@
+CESAR School
diff --git a/lib/domains/school/wasd.txt b/lib/domains/school/wasd.txt
new file mode 100644
index 0000000000..4c6ad7243b
--- /dev/null
+++ b/lib/domains/school/wasd.txt
@@ -0,0 +1 @@
+Wilmington Area School District
diff --git a/lib/domains/se/chalmers/student.txt b/lib/domains/se/chalmers/student.txt
new file mode 100644
index 0000000000..6c416bbd98
--- /dev/null
+++ b/lib/domains/se/chalmers/student.txt
@@ -0,0 +1,2 @@
+Chalmers tekniska h�gskola
+Chalmers University of Technology
\ No newline at end of file
diff --git a/lib/domains/se/dbgy/ga/elev.txt b/lib/domains/se/dbgy/ga/elev.txt
new file mode 100644
index 0000000000..27b1d44dba
--- /dev/null
+++ b/lib/domains/se/dbgy/ga/elev.txt
@@ -0,0 +1,2 @@
+Drottning Blankas Gymansieskola
+https://www.drottningblanka.se/
diff --git a/lib/domains/se/gtg.txt b/lib/domains/se/gtg.txt
new file mode 100644
index 0000000000..717bf8d161
--- /dev/null
+++ b/lib/domains/se/gtg.txt
@@ -0,0 +1 @@
+Göteborgsgregionens Tekniska Gymnasium
diff --git a/lib/domains/se/itgksd.txt b/lib/domains/se/itgksd.txt
new file mode 100644
index 0000000000..f6764ff4a3
--- /dev/null
+++ b/lib/domains/se/itgksd.txt
@@ -0,0 +1 @@
+IT-Gymnasiet Karlstad
diff --git a/lib/domains/se/iths.txt b/lib/domains/se/iths.txt
new file mode 100644
index 0000000000..917f7f1863
--- /dev/null
+++ b/lib/domains/se/iths.txt
@@ -0,0 +1 @@
+IT-Högskolan
diff --git a/lib/domains/se/jonkoping/edu.txt b/lib/domains/se/jonkoping/edu.txt
new file mode 100644
index 0000000000..df8b99560b
--- /dev/null
+++ b/lib/domains/se/jonkoping/edu.txt
@@ -0,0 +1,2 @@
+Sandagymnasiet
+.group
diff --git a/lib/domains/se/linkoping/adm.txt b/lib/domains/se/linkoping/adm.txt
new file mode 100644
index 0000000000..d4cc31ad6d
--- /dev/null
+++ b/lib/domains/se/linkoping/adm.txt
@@ -0,0 +1 @@
+linkopings kommun
diff --git a/lib/domains/se/linkoping/edu.txt b/lib/domains/se/linkoping/edu.txt
index 7cdc116f84..de2af610ea 100644
--- a/lib/domains/se/linkoping/edu.txt
+++ b/lib/domains/se/linkoping/edu.txt
@@ -1 +1 @@
-Linkopings komun
+Linkopings kommun
diff --git a/lib/domains/se/norrkoping/elev.txt b/lib/domains/se/norrkoping/elev.txt
new file mode 100644
index 0000000000..bd48097609
--- /dev/null
+++ b/lib/domains/se/norrkoping/elev.txt
@@ -0,0 +1 @@
+Mosstorpsskolan
diff --git a/lib/domains/se/sollentuna/edu.txt b/lib/domains/se/sollentuna/edu.txt
new file mode 100644
index 0000000000..f01cb91d53
--- /dev/null
+++ b/lib/domains/se/sollentuna/edu.txt
@@ -0,0 +1 @@
+Rudbeck
diff --git a/lib/domains/se/thegameassembly.txt b/lib/domains/se/thegameassembly.txt
new file mode 100644
index 0000000000..cdb6de2b37
--- /dev/null
+++ b/lib/domains/se/thegameassembly.txt
@@ -0,0 +1 @@
+The Game Assembly
diff --git a/lib/domains/sg/edu/singaporetech.txt b/lib/domains/sg/edu/singaporetech.txt
new file mode 100644
index 0000000000..04504a249a
--- /dev/null
+++ b/lib/domains/sg/edu/singaporetech.txt
@@ -0,0 +1 @@
+Singapore Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/sg/edu/singaporetech/sit.txt b/lib/domains/sg/edu/singaporetech/sit.txt
new file mode 100644
index 0000000000..04504a249a
--- /dev/null
+++ b/lib/domains/sg/edu/singaporetech/sit.txt
@@ -0,0 +1 @@
+Singapore Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/si/vegova.txt b/lib/domains/si/vegova.txt
new file mode 100644
index 0000000000..399c23e388
--- /dev/null
+++ b/lib/domains/si/vegova.txt
@@ -0,0 +1 @@
+Vegova Ljubljana
diff --git a/lib/domains/sk/spsjm.txt b/lib/domains/sk/spsjm.txt
new file mode 100644
index 0000000000..76aba1d081
--- /dev/null
+++ b/lib/domains/sk/spsjm.txt
@@ -0,0 +1 @@
+Stredná priemyselná škola Jozefa Murgaša, Banská Bystrica
diff --git a/lib/domains/sn/udb.txt b/lib/domains/sn/udb.txt
deleted file mode 100644
index 1fca81bbc6..0000000000
--- a/lib/domains/sn/udb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Dakar Bourguiba
diff --git a/lib/domains/sr/edu/ptc.txt b/lib/domains/sr/edu/ptc.txt
new file mode 100644
index 0000000000..067b866128
--- /dev/null
+++ b/lib/domains/sr/edu/ptc.txt
@@ -0,0 +1 @@
+Polytechnic College Suriname
diff --git a/lib/domains/sv/edu/unico.txt b/lib/domains/sv/edu/unico.txt
deleted file mode 100644
index bfc91920ce..0000000000
--- a/lib/domains/sv/edu/unico.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Católica de Occidente
diff --git a/lib/domains/sv/edu/usin.txt b/lib/domains/sv/edu/usin.txt
deleted file mode 100644
index 55c9dc2f12..0000000000
--- a/lib/domains/sv/edu/usin.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universidad Isaac Newton
diff --git a/lib/domains/sy/ac.txt b/lib/domains/sy/ac.txt
deleted file mode 100644
index b2104255c7..0000000000
--- a/lib/domains/sy/ac.txt
+++ /dev/null
@@ -1 +0,0 @@
-Arab European University
diff --git a/lib/domains/sy/edu/must.txt b/lib/domains/sy/edu/must.txt
deleted file mode 100644
index 814d100189..0000000000
--- a/lib/domains/sy/edu/must.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mamoun Private University for Science and Technology
diff --git a/lib/domains/sy/edu/siust.txt b/lib/domains/sy/edu/siust.txt
deleted file mode 100644
index 1dac948d25..0000000000
--- a/lib/domains/sy/edu/siust.txt
+++ /dev/null
@@ -1 +0,0 @@
-Syrian International Private University for Science &amp; Technology
diff --git a/lib/domains/tg/iai-togo.txt b/lib/domains/tg/iai-togo.txt
new file mode 100644
index 0000000000..e803284d2c
--- /dev/null
+++ b/lib/domains/tg/iai-togo.txt
@@ -0,0 +1,4 @@
+Institut Africain d'Informatique.
+
+English Name :
+Africa Institute of Technology
diff --git a/lib/domains/th/ac/aru.txt b/lib/domains/th/ac/aru.txt
deleted file mode 100644
index 4babe9ac20..0000000000
--- a/lib/domains/th/ac/aru.txt
+++ /dev/null
@@ -1 +0,0 @@
-Phranakhon Si Ayutthaya Rajabhat University
diff --git a/lib/domains/th/ac/asianust.txt b/lib/domains/th/ac/asianust.txt
deleted file mode 100644
index e9f971040d..0000000000
--- a/lib/domains/th/ac/asianust.txt
+++ /dev/null
@@ -1 +0,0 @@
-Asian University of Science and Technology
diff --git a/lib/domains/th/ac/nivadhana.txt b/lib/domains/th/ac/nivadhana.txt
deleted file mode 100644
index 5fc8dff7aa..0000000000
--- a/lib/domains/th/ac/nivadhana.txt
+++ /dev/null
@@ -1 +0,0 @@
-Nivadhana University
diff --git a/lib/domains/th/ac/shinawatra.txt b/lib/domains/th/ac/shinawatra.txt
deleted file mode 100644
index acd7c9d70c..0000000000
--- a/lib/domains/th/ac/shinawatra.txt
+++ /dev/null
@@ -1 +0,0 @@
-Shinawatra University
diff --git a/lib/domains/th/ac/yonok.txt b/lib/domains/th/ac/yonok.txt
deleted file mode 100644
index f0448526d6..0000000000
--- a/lib/domains/th/ac/yonok.txt
+++ /dev/null
@@ -1 +0,0 @@
-Yonok University
diff --git a/lib/domains/tj/dtmik.tj b/lib/domains/tj/dtmik.tj
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/lib/domains/tj/dtmik.tj
@@ -0,0 +1 @@
+
diff --git a/lib/domains/tj/dtmik.txt b/lib/domains/tj/dtmik.txt
new file mode 100644
index 0000000000..caa5fe94ee
--- /dev/null
+++ b/lib/domains/tj/dtmik.txt
@@ -0,0 +1 @@
+Innovation and Technology Management Institute in Kulob City
diff --git a/lib/domains/tj/tiu.txt b/lib/domains/tj/tiu.txt
deleted file mode 100644
index 62e4099d2a..0000000000
--- a/lib/domains/tj/tiu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tajikistan International University
diff --git a/lib/domains/tlds.txt b/lib/domains/tlds.txt
index d983ba0fc4..4e03340e8c 100644
--- a/lib/domains/tlds.txt
+++ b/lib/domains/tlds.txt
@@ -21,12 +21,10 @@ ac.mu
 ac.mw
 ac.mz
 ac.ni
-ac.nz
 ac.om
 ac.pa
 ac.pg
 ac.pr
-ac.rs
 ac.ru
 ac.rw
 ac.sz
@@ -72,7 +70,6 @@ edu.es
 edu.et
 edu.ge
 edu.gh
-edu.gr
 edu.gt
 edu.hk
 edu.hn
@@ -85,12 +82,10 @@ edu.kg
 edu.kh
 edu.kn
 edu.kw
-edu.ky
 edu.kz
 edu.la
 edu.lb
 edu.lr
-edu.lv
 edu.ly
 edu.me
 edu.mg
@@ -111,14 +106,12 @@ edu.pa
 edu.pe
 edu.ph
 edu.pk
-edu.pl
 edu.pr
 edu.ps
 edu.pt
 edu.pw
 edu.py
 edu.qa
-edu.rs
 edu.ru
 edu.sa
 edu.sc
diff --git a/lib/domains/tn/ens/ult.txt b/lib/domains/tn/ens/ult.txt
deleted file mode 100644
index f964df3c30..0000000000
--- a/lib/domains/tn/ens/ult.txt
+++ /dev/null
@@ -1 +0,0 @@
-Université Libre de Tunis
diff --git a/lib/domains/tn/infoplus.txt b/lib/domains/tn/infoplus.txt
new file mode 100644
index 0000000000..5606970fcd
--- /dev/null
+++ b/lib/domains/tn/infoplus.txt
@@ -0,0 +1 @@
+Centre de formation privé Infoplus
diff --git a/lib/domains/tn/polytechnicien.txt b/lib/domains/tn/polytechnicien.txt
new file mode 100644
index 0000000000..cf0bddd4a1
--- /dev/null
+++ b/lib/domains/tn/polytechnicien.txt
@@ -0,0 +1 @@
+Polytechnique Sousse
diff --git a/lib/domains/tn/polytecsousse.txt b/lib/domains/tn/polytecsousse.txt
new file mode 100644
index 0000000000..cf0bddd4a1
--- /dev/null
+++ b/lib/domains/tn/polytecsousse.txt
@@ -0,0 +1 @@
+Polytechnique Sousse
diff --git a/lib/domains/tn/r-iset/sfax.txt b/lib/domains/tn/r-iset/sfax.txt
new file mode 100644
index 0000000000..4c8bd833b3
--- /dev/null
+++ b/lib/domains/tn/r-iset/sfax.txt
@@ -0,0 +1 @@
+Instituts Supérieurs des Etudes Technologiques de Sfax
\ No newline at end of file
diff --git a/lib/domains/tn/r-iset/sousse.txt b/lib/domains/tn/r-iset/sousse.txt
new file mode 100644
index 0000000000..81326e21cf
--- /dev/null
+++ b/lib/domains/tn/r-iset/sousse.txt
@@ -0,0 +1 @@
+Instituts Sup�rieurs des Etudes Technologiques de Sousse
\ No newline at end of file
diff --git a/lib/domains/tn/rnu/insat.txt b/lib/domains/tn/rnu/insat.txt
new file mode 100644
index 0000000000..9ccbde77d6
--- /dev/null
+++ b/lib/domains/tn/rnu/insat.txt
@@ -0,0 +1 @@
+national institute of applied science and technology
diff --git a/lib/domains/tn/rnu/isetso.txt b/lib/domains/tn/rnu/isetso.txt
new file mode 100644
index 0000000000..146d95f297
--- /dev/null
+++ b/lib/domains/tn/rnu/isetso.txt
@@ -0,0 +1 @@
+Instituts Supérieurs des Etudes Technologiques de Sousse
diff --git a/lib/domains/tr/edu/ahap.txt b/lib/domains/tr/edu/ahap.txt
deleted file mode 100644
index 8601673b5b..0000000000
--- a/lib/domains/tr/edu/ahap.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Alanya Hamdullah Emin Paşa Üniversitesi
-Alanya Hamdullah Emin Paşa University
\ No newline at end of file
diff --git a/lib/domains/tr/edu/eul.txt b/lib/domains/tr/edu/eul.txt
new file mode 100644
index 0000000000..856a7f620b
--- /dev/null
+++ b/lib/domains/tr/edu/eul.txt
@@ -0,0 +1,2 @@
+European University of Lefke
+Lefke Avrupa Üniversitesi
diff --git a/lib/domains/tr/edu/kou.txt b/lib/domains/tr/edu/kou.txt
deleted file mode 100644
index 7642d2c474..0000000000
--- a/lib/domains/tr/edu/kou.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Kocaeli Üniversitesi
-Kocaeli University
diff --git a/lib/domains/tr/edu/tunceli.txt b/lib/domains/tr/edu/tunceli.txt
deleted file mode 100644
index 2f4d0b9233..0000000000
--- a/lib/domains/tr/edu/tunceli.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Munzur Üniversitesi
-Munzur University
\ No newline at end of file
diff --git a/lib/domains/tr/k12/ayseabla.txt b/lib/domains/tr/k12/ayseabla.txt
new file mode 100644
index 0000000000..a474673b50
--- /dev/null
+++ b/lib/domains/tr/k12/ayseabla.txt
@@ -0,0 +1 @@
+Başkent Üniversitesi Özel Ayşeabla Anadolu Lisesi
diff --git a/lib/domains/tw/edu/chna.txt b/lib/domains/tw/edu/chna.txt
deleted file mode 100644
index 3a26eea6fe..0000000000
--- a/lib/domains/tw/edu/chna.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chia Nana College of Pharmacy and Science
diff --git a/lib/domains/tw/edu/cju.txt b/lib/domains/tw/edu/cju.txt
deleted file mode 100644
index 60b41e2479..0000000000
--- a/lib/domains/tw/edu/cju.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chang Jung University
diff --git a/lib/domains/tw/edu/cmc.txt b/lib/domains/tw/edu/cmc.txt
deleted file mode 100644
index 4e76aeed04..0000000000
--- a/lib/domains/tw/edu/cmc.txt
+++ /dev/null
@@ -1 +0,0 @@
-China Medical College
diff --git a/lib/domains/tw/edu/csmc.txt b/lib/domains/tw/edu/csmc.txt
deleted file mode 100644
index 32a6beb851..0000000000
--- a/lib/domains/tw/edu/csmc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chung Shan Medical and Dental College
diff --git a/lib/domains/tw/edu/kmc.txt b/lib/domains/tw/edu/kmc.txt
deleted file mode 100644
index 7c71f1cdc0..0000000000
--- a/lib/domains/tw/edu/kmc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kaohsiung Medical College
diff --git a/lib/domains/tw/edu/ksit.txt b/lib/domains/tw/edu/ksit.txt
deleted file mode 100644
index e0396f6a48..0000000000
--- a/lib/domains/tw/edu/ksit.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kung Shan Institute of Technology
diff --git a/lib/domains/tw/edu/ltc.txt b/lib/domains/tw/edu/ltc.txt
deleted file mode 100644
index 2f9748b2c1..0000000000
--- a/lib/domains/tw/edu/ltc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ling Tung University
diff --git a/lib/domains/tw/edu/nchulc.txt b/lib/domains/tw/edu/nchulc.txt
deleted file mode 100644
index c306356324..0000000000
--- a/lib/domains/tw/edu/nchulc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Chung Hsing University, Taipei
diff --git a/lib/domains/tw/edu/ncpes.txt b/lib/domains/tw/edu/ncpes.txt
deleted file mode 100644
index 4e4ee5b0a3..0000000000
--- a/lib/domains/tw/edu/ncpes.txt
+++ /dev/null
@@ -1 +0,0 @@
-National College of Physical Education and Sports
diff --git a/lib/domains/tw/edu/nhctc.txt b/lib/domains/tw/edu/nhctc.txt
deleted file mode 100644
index 6f43a37afb..0000000000
--- a/lib/domains/tw/edu/nhctc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Hsin-Chu Teachers College
diff --git a/lib/domains/tw/edu/nhltc.txt b/lib/domains/tw/edu/nhltc.txt
deleted file mode 100644
index 4b75102611..0000000000
--- a/lib/domains/tw/edu/nhltc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Hualien Teachers College
diff --git a/lib/domains/tw/edu/nia.txt b/lib/domains/tw/edu/nia.txt
deleted file mode 100644
index d137001955..0000000000
--- a/lib/domains/tw/edu/nia.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Institute of the Arts
diff --git a/lib/domains/tw/edu/nkfu.txt b/lib/domains/tw/edu/nkfu.txt
deleted file mode 100644
index 68bf99373d..0000000000
--- a/lib/domains/tw/edu/nkfu.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Kaohsiung First University of Science and Technology
diff --git a/lib/domains/tw/edu/npttc.txt b/lib/domains/tw/edu/npttc.txt
deleted file mode 100644
index e65c122aaf..0000000000
--- a/lib/domains/tw/edu/npttc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Pingtung Teachers College
diff --git a/lib/domains/tw/edu/nptu.txt b/lib/domains/tw/edu/nptu.txt
new file mode 100644
index 0000000000..5ac7fb54bf
--- /dev/null
+++ b/lib/domains/tw/edu/nptu.txt
@@ -0,0 +1 @@
+National Pingtung University
\ No newline at end of file
diff --git a/lib/domains/tw/edu/ntca.txt b/lib/domains/tw/edu/ntca.txt
deleted file mode 100644
index 5530653f42..0000000000
--- a/lib/domains/tw/edu/ntca.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-National Taiwan College of Arts
-National Taiwan College of the Arts
diff --git a/lib/domains/tw/edu/ntcn.txt b/lib/domains/tw/edu/ntcn.txt
deleted file mode 100644
index 5d82da1acc..0000000000
--- a/lib/domains/tw/edu/ntcn.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Taipei College of Nursing
diff --git a/lib/domains/tw/edu/ntcpe.txt b/lib/domains/tw/edu/ntcpe.txt
deleted file mode 100644
index 19a428e44b..0000000000
--- a/lib/domains/tw/edu/ntcpe.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Taiwan College of Physical Education and Sports
diff --git a/lib/domains/tw/edu/ntctc.txt b/lib/domains/tw/edu/ntctc.txt
deleted file mode 100644
index 428db24dfe..0000000000
--- a/lib/domains/tw/edu/ntctc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Taichung Teachers College
diff --git a/lib/domains/tw/edu/ntntc.txt b/lib/domains/tw/edu/ntntc.txt
deleted file mode 100644
index 42c089d925..0000000000
--- a/lib/domains/tw/edu/ntntc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Tainan Teachers College
diff --git a/lib/domains/tw/edu/ntptc.txt b/lib/domains/tw/edu/ntptc.txt
deleted file mode 100644
index 0a3826c313..0000000000
--- a/lib/domains/tw/edu/ntptc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Taipei Teachers College
diff --git a/lib/domains/tw/edu/ntttc.txt b/lib/domains/tw/edu/ntttc.txt
deleted file mode 100644
index c07cfdded2..0000000000
--- a/lib/domains/tw/edu/ntttc.txt
+++ /dev/null
@@ -1 +0,0 @@
-National Taitung Teachers College
diff --git a/lib/domains/tw/edu/scc.txt b/lib/domains/tw/edu/scc.txt
deleted file mode 100644
index b08506436e..0000000000
--- a/lib/domains/tw/edu/scc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Shih Chien University
diff --git a/lib/domains/tw/edu/sjsmit.txt b/lib/domains/tw/edu/sjsmit.txt
deleted file mode 100644
index 2078577189..0000000000
--- a/lib/domains/tw/edu/sjsmit.txt
+++ /dev/null
@@ -1 +0,0 @@
-St. John's &amp; St. Mary's Institute of Technology
diff --git a/lib/domains/tw/edu/thmu.txt b/lib/domains/tw/edu/thmu.txt
deleted file mode 100644
index ed5fe47486..0000000000
--- a/lib/domains/tw/edu/thmu.txt
+++ /dev/null
@@ -1 +0,0 @@
-TaiChung Healthcare and Management University
diff --git a/lib/domains/tw/edu/tmc.txt b/lib/domains/tw/edu/tmc.txt
deleted file mode 100644
index 7621e0282c..0000000000
--- a/lib/domains/tw/edu/tmc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taipei Medical College
diff --git a/lib/domains/tw/edu/tmtc.txt b/lib/domains/tw/edu/tmtc.txt
deleted file mode 100644
index d5360fa72c..0000000000
--- a/lib/domains/tw/edu/tmtc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taipei Municipal Teachers College
diff --git a/lib/domains/tw/edu/tnca.txt b/lib/domains/tw/edu/tnca.txt
deleted file mode 100644
index 4a29c08ee9..0000000000
--- a/lib/domains/tw/edu/tnca.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tainan National College of the Arts
diff --git a/lib/domains/tw/edu/ttit.txt b/lib/domains/tw/edu/ttit.txt
deleted file mode 100644
index 9217d37cd1..0000000000
--- a/lib/domains/tw/edu/ttit.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tatung Institute of Technology
diff --git a/lib/domains/ua/dp/dnulive/ftf.txt b/lib/domains/ua/dp/dnulive/ftf.txt
new file mode 100644
index 0000000000..225b1a932a
--- /dev/null
+++ b/lib/domains/ua/dp/dnulive/ftf.txt
@@ -0,0 +1,2 @@
+Дніпропетровський національний університет імені Олеся Гончара 
+Dnipropetrovsk national university Oles Honchar
diff --git a/lib/domains/ua/dp/dsma.txt b/lib/domains/ua/dp/dsma.txt
new file mode 100644
index 0000000000..4f1337dbc7
--- /dev/null
+++ b/lib/domains/ua/dp/dsma.txt
@@ -0,0 +1,2 @@
+ДЗ "Дніпропетровська медична академія МОЗ України"
+State Establishment "Dnipropetrovsk Medical Academy of Health Ministry of Ukraine" (SE "DMA")
diff --git a/lib/domains/ua/kneu.txt b/lib/domains/ua/kneu.txt
new file mode 100644
index 0000000000..9af164260d
--- /dev/null
+++ b/lib/domains/ua/kneu.txt
@@ -0,0 +1 @@
+Kyiv National Economic University named after Vadym Hetman (KNEU)
diff --git a/lib/domains/ua/lviv/lute.txt b/lib/domains/ua/lviv/lute.txt
new file mode 100644
index 0000000000..fd6ea98d80
--- /dev/null
+++ b/lib/domains/ua/lviv/lute.txt
@@ -0,0 +1 @@
+Lviv University of Trade and Economics
diff --git a/lib/domains/ua/net/kkz.txt b/lib/domains/ua/net/kkz.txt
new file mode 100644
index 0000000000..4429596e49
--- /dev/null
+++ b/lib/domains/ua/net/kkz.txt
@@ -0,0 +1,6 @@
+Kiev collage of communications
+KKC
+Київський колледж зв'язку
+ККЗ
+Киевский колледж связи
+ККС
diff --git a/lib/domains/ua/org/ogasa.txt b/lib/domains/ua/org/ogasa.txt
new file mode 100644
index 0000000000..556cd5622a
--- /dev/null
+++ b/lib/domains/ua/org/ogasa.txt
@@ -0,0 +1 @@
+Odessa State Academy of Civil Engeneering and Architecture
diff --git a/lib/domains/ua/pp/sh44.txt b/lib/domains/ua/pp/sh44.txt
new file mode 100644
index 0000000000..1f9f62aa2f
--- /dev/null
+++ b/lib/domains/ua/pp/sh44.txt
@@ -0,0 +1 @@
+Secondary school 44, Kam'yanske
diff --git a/lib/domains/uk/ac/ayrshire.txt b/lib/domains/uk/ac/ayrshire.txt
new file mode 100644
index 0000000000..09d61efb6f
--- /dev/null
+++ b/lib/domains/uk/ac/ayrshire.txt
@@ -0,0 +1 @@
+Ayrshire College
\ No newline at end of file
diff --git a/lib/domains/uk/ac/cardiffmet.txt b/lib/domains/uk/ac/cardiffmet.txt
new file mode 100644
index 0000000000..a112708d38
--- /dev/null
+++ b/lib/domains/uk/ac/cardiffmet.txt
@@ -0,0 +1,2 @@
+Cardiff Metropolitan University
+Prifysgol Metropolitan Caerdydd
diff --git a/lib/domains/uk/ac/gbmc/student.txt b/lib/domains/uk/ac/gbmc/student.txt
new file mode 100644
index 0000000000..9b53e1789b
--- /dev/null
+++ b/lib/domains/uk/ac/gbmc/student.txt
@@ -0,0 +1 @@
+Greater Brighton Metropolitan College (GB MET) for Students.
diff --git a/lib/domains/uk/ac/gla/student.txt b/lib/domains/uk/ac/gla/student.txt
new file mode 100644
index 0000000000..65afb8d77b
--- /dev/null
+++ b/lib/domains/uk/ac/gla/student.txt
@@ -0,0 +1 @@
+University of Glasgow
diff --git a/lib/domains/uk/ac/huron.txt b/lib/domains/uk/ac/huron.txt
deleted file mode 100644
index ab99513de2..0000000000
--- a/lib/domains/uk/ac/huron.txt
+++ /dev/null
@@ -1 +0,0 @@
-Huron University USA in London
diff --git a/lib/domains/uk/ac/liverpool.txt b/lib/domains/uk/ac/liverpool.txt
new file mode 100644
index 0000000000..870c980b70
--- /dev/null
+++ b/lib/domains/uk/ac/liverpool.txt
@@ -0,0 +1 @@
+University of Liverpool
diff --git a/lib/domains/uk/ac/ljmu.txt b/lib/domains/uk/ac/ljmu.txt
new file mode 100644
index 0000000000..4cd4ea47cb
--- /dev/null
+++ b/lib/domains/uk/ac/ljmu.txt
@@ -0,0 +1 @@
+Liverpool John Moores University
diff --git a/lib/domains/uk/ac/mrc/lms.txt b/lib/domains/uk/ac/mrc/lms.txt
new file mode 100644
index 0000000000..de4e3ac41b
--- /dev/null
+++ b/lib/domains/uk/ac/mrc/lms.txt
@@ -0,0 +1 @@
+MRC London institute of Medical Sciences (Imperial College London)
\ No newline at end of file
diff --git a/lib/domains/uk/ac/rfhsm.txt b/lib/domains/uk/ac/rfhsm.txt
deleted file mode 100644
index 4621786d99..0000000000
--- a/lib/domains/uk/ac/rfhsm.txt
+++ /dev/null
@@ -1 +0,0 @@
-Royal Free Hospital School of Medicine, University of London
diff --git a/lib/domains/uk/ac/sbu.txt b/lib/domains/uk/ac/sbu.txt
deleted file mode 100644
index 7c6d2bf046..0000000000
--- a/lib/domains/uk/ac/sbu.txt
+++ /dev/null
@@ -1 +0,0 @@
-South Bank University
diff --git a/lib/domains/uk/ac/schillerlondon.txt b/lib/domains/uk/ac/schillerlondon.txt
deleted file mode 100644
index b828906f72..0000000000
--- a/lib/domains/uk/ac/schillerlondon.txt
+++ /dev/null
@@ -1 +0,0 @@
-Schiller International University, London
diff --git a/lib/domains/uk/ac/shrewsbury.txt b/lib/domains/uk/ac/shrewsbury.txt
new file mode 100644
index 0000000000..6dce051cc8
--- /dev/null
+++ b/lib/domains/uk/ac/shrewsbury.txt
@@ -0,0 +1 @@
+Shrewsbury Colleges Group
diff --git a/lib/domains/uk/ac/ssfc.txt b/lib/domains/uk/ac/ssfc.txt
new file mode 100644
index 0000000000..6dce051cc8
--- /dev/null
+++ b/lib/domains/uk/ac/ssfc.txt
@@ -0,0 +1 @@
+Shrewsbury Colleges Group
diff --git a/lib/domains/uk/ac/strath.txt b/lib/domains/uk/ac/strath.txt
index ae8e8a0ca3..57c069caa6 100644
--- a/lib/domains/uk/ac/strath.txt
+++ b/lib/domains/uk/ac/strath.txt
@@ -1,2 +1,3 @@
 University of Strathclyde
 uka tarsadia university,bardoli
+Pune university (INDIA)
diff --git a/lib/domains/uk/ac/uca.txt b/lib/domains/uk/ac/uca.txt
new file mode 100644
index 0000000000..31b7061bc4
--- /dev/null
+++ b/lib/domains/uk/ac/uca.txt
@@ -0,0 +1 @@
+University for the Creative Arts
\ No newline at end of file
diff --git a/lib/domains/uk/ac/ulsop.txt b/lib/domains/uk/ac/ulsop.txt
deleted file mode 100644
index 1370d8f93a..0000000000
--- a/lib/domains/uk/ac/ulsop.txt
+++ /dev/null
@@ -1 +0,0 @@
-School of Pharmacy, University of London
diff --git a/lib/domains/uk/avonvalleyschool.txt b/lib/domains/uk/avonvalleyschool.txt
new file mode 100644
index 0000000000..0bf1d91ce6
--- /dev/null
+++ b/lib/domains/uk/avonvalleyschool.txt
@@ -0,0 +1 @@
+The Avon Valley School
diff --git a/lib/domains/uk/co/caludoncastle.txt b/lib/domains/uk/co/caludoncastle.txt
new file mode 100644
index 0000000000..1b2148d2dd
--- /dev/null
+++ b/lib/domains/uk/co/caludoncastle.txt
@@ -0,0 +1 @@
+Caludon Castle
diff --git a/lib/domains/uk/co/cardinalallen.txt b/lib/domains/uk/co/cardinalallen.txt
new file mode 100644
index 0000000000..fb2549c139
--- /dev/null
+++ b/lib/domains/uk/co/cardinalallen.txt
@@ -0,0 +1 @@
+Cardinal Allen Catholic High School
diff --git a/lib/domains/uk/co/elam.txt b/lib/domains/uk/co/elam.txt
new file mode 100644
index 0000000000..0b8fd35128
--- /dev/null
+++ b/lib/domains/uk/co/elam.txt
@@ -0,0 +1 @@
+East London Arts and Music
diff --git a/lib/domains/uk/co/hppc.txt b/lib/domains/uk/co/hppc.txt
new file mode 100644
index 0000000000..78c5f6b210
--- /dev/null
+++ b/lib/domains/uk/co/hppc.txt
@@ -0,0 +1 @@
+Hurstpierpoint College
diff --git a/lib/domains/uk/co/ivesheadschool.txt b/lib/domains/uk/co/ivesheadschool.txt
new file mode 100644
index 0000000000..ece491662e
--- /dev/null
+++ b/lib/domains/uk/co/ivesheadschool.txt
@@ -0,0 +1 @@
+Iveshead School
diff --git a/lib/domains/uk/co/latymer.txt b/lib/domains/uk/co/latymer.txt
new file mode 100644
index 0000000000..49eb35b9cd
--- /dev/null
+++ b/lib/domains/uk/co/latymer.txt
@@ -0,0 +1 @@
+Latymer School - Sixth Form
diff --git a/lib/domains/uk/co/maynard.txt b/lib/domains/uk/co/maynard.txt
new file mode 100644
index 0000000000..8ddf09757e
--- /dev/null
+++ b/lib/domains/uk/co/maynard.txt
@@ -0,0 +1 @@
+Maynard School
\ No newline at end of file
diff --git a/lib/domains/uk/co/shepshedlearning.txt b/lib/domains/uk/co/shepshedlearning.txt
new file mode 100644
index 0000000000..ece491662e
--- /dev/null
+++ b/lib/domains/uk/co/shepshedlearning.txt
@@ -0,0 +1 @@
+Iveshead School
diff --git a/lib/domains/uk/co/theangmeringschool.txt b/lib/domains/uk/co/theangmeringschool.txt
new file mode 100644
index 0000000000..a7757ee4ec
--- /dev/null
+++ b/lib/domains/uk/co/theangmeringschool.txt
@@ -0,0 +1 @@
+The Angmering School
diff --git a/lib/domains/uk/co/tottenhamutc.txt b/lib/domains/uk/co/tottenhamutc.txt
deleted file mode 100644
index b21c6040a9..0000000000
--- a/lib/domains/uk/co/tottenhamutc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tottenham University Technology College
diff --git a/lib/domains/uk/co/williamgilbert.txt b/lib/domains/uk/co/williamgilbert.txt
deleted file mode 100644
index eec94882c6..0000000000
--- a/lib/domains/uk/co/williamgilbert.txt
+++ /dev/null
@@ -1 +0,0 @@
-William Gilbert College
diff --git a/lib/domains/uk/co/wsnl.txt b/lib/domains/uk/co/wsnl.txt
new file mode 100644
index 0000000000..9af7760e56
--- /dev/null
+++ b/lib/domains/uk/co/wsnl.txt
@@ -0,0 +1 @@
+Worksop College
diff --git a/lib/domains/uk/org/bcs b/lib/domains/uk/org/bcs
deleted file mode 100644
index d54bf8b5ed..0000000000
--- a/lib/domains/uk/org/bcs
+++ /dev/null
@@ -1 +0,0 @@
-British Computer Society
diff --git a/lib/domains/uk/org/beechencliff.txt b/lib/domains/uk/org/beechencliff.txt
new file mode 100644
index 0000000000..e5c0ab2fa0
--- /dev/null
+++ b/lib/domains/uk/org/beechencliff.txt
@@ -0,0 +1,4 @@
+Beechen Cliff School
+@beechencliff.org.uk
+
+School offers A-Level in Computer Science
diff --git a/lib/domains/uk/org/bl6.txt b/lib/domains/uk/org/bl6.txt
new file mode 100644
index 0000000000..bbc7b105be
--- /dev/null
+++ b/lib/domains/uk/org/bl6.txt
@@ -0,0 +1,2 @@
+Brine Leas Sixth Form
+BL6
diff --git a/lib/domains/uk/org/carmel.txt b/lib/domains/uk/org/carmel.txt
new file mode 100644
index 0000000000..e68a46689d
--- /dev/null
+++ b/lib/domains/uk/org/carmel.txt
@@ -0,0 +1 @@
+Carmel RC College
diff --git a/lib/domains/uk/org/epsomcollege.txt b/lib/domains/uk/org/epsomcollege.txt
new file mode 100644
index 0000000000..1881a1d1e0
--- /dev/null
+++ b/lib/domains/uk/org/epsomcollege.txt
@@ -0,0 +1 @@
+Epsom College
diff --git a/lib/domains/uk/org/esf-schools.txt b/lib/domains/uk/org/esf-schools.txt
new file mode 100644
index 0000000000..14a6d4327a
--- /dev/null
+++ b/lib/domains/uk/org/esf-schools.txt
@@ -0,0 +1 @@
+Emmanuel Schools Foundation
diff --git a/lib/domains/uk/org/ivesheadschool.txt b/lib/domains/uk/org/ivesheadschool.txt
new file mode 100644
index 0000000000..ece491662e
--- /dev/null
+++ b/lib/domains/uk/org/ivesheadschool.txt
@@ -0,0 +1 @@
+Iveshead School
diff --git a/lib/domains/uk/org/kscs.txt b/lib/domains/uk/org/kscs.txt
new file mode 100644
index 0000000000..29f29ac715
--- /dev/null
+++ b/lib/domains/uk/org/kscs.txt
@@ -0,0 +1 @@
+Ken Stimpson Community School
diff --git a/lib/domains/uk/org/landau-forte.txt b/lib/domains/uk/org/landau-forte.txt
new file mode 100644
index 0000000000..b22a5ae007
--- /dev/null
+++ b/lib/domains/uk/org/landau-forte.txt
@@ -0,0 +1 @@
+Landau Forte College Derby
diff --git a/lib/domains/uk/org/nbacademy.txt b/lib/domains/uk/org/nbacademy.txt
new file mode 100644
index 0000000000..490cebe288
--- /dev/null
+++ b/lib/domains/uk/org/nbacademy.txt
@@ -0,0 +1 @@
+North Birmingham Academy
diff --git a/lib/domains/uk/org/niu.txt b/lib/domains/uk/org/niu.txt
deleted file mode 100644
index 5c42aae8e8..0000000000
--- a/lib/domains/uk/org/niu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Newport International University
diff --git a/lib/domains/uk/org/rgsw.txt b/lib/domains/uk/org/rgsw.txt
new file mode 100644
index 0000000000..4d96ce4494
--- /dev/null
+++ b/lib/domains/uk/org/rgsw.txt
@@ -0,0 +1 @@
+Royal Grammar School Worcester
\ No newline at end of file
diff --git a/lib/domains/uk/org/savremena.txt b/lib/domains/uk/org/savremena.txt
new file mode 100644
index 0000000000..e89e9c5786
--- /dev/null
+++ b/lib/domains/uk/org/savremena.txt
@@ -0,0 +1 @@
+Savremena Gimnazija
diff --git a/lib/domains/uk/org/st-ambrosecollege.txt b/lib/domains/uk/org/st-ambrosecollege.txt
new file mode 100644
index 0000000000..91b1b6576b
--- /dev/null
+++ b/lib/domains/uk/org/st-ambrosecollege.txt
@@ -0,0 +1 @@
+St Ambrose College
diff --git a/lib/domains/uk/org/stbens.txt b/lib/domains/uk/org/stbens.txt
new file mode 100644
index 0000000000..29ff60082b
--- /dev/null
+++ b/lib/domains/uk/org/stbens.txt
@@ -0,0 +1,6 @@
+St Benedict's School Ealing
+
+54 Eaton Rise
+Ealing
+London 
+W5 2ES
diff --git a/lib/domains/uk/sch/Kent/Dovergramboys.txt b/lib/domains/uk/sch/Kent/Dovergramboys.txt
new file mode 100644
index 0000000000..ca59f5ec66
--- /dev/null
+++ b/lib/domains/uk/sch/Kent/Dovergramboys.txt
@@ -0,0 +1,2 @@
+format - username@dovergramboys.kent.sch.uk
+Dover grammar school for boys, kent, uk
diff --git a/lib/domains/uk/sch/Kent/juddschool.txt b/lib/domains/uk/sch/Kent/juddschool.txt
new file mode 100644
index 0000000000..5174e51fb2
--- /dev/null
+++ b/lib/domains/uk/sch/Kent/juddschool.txt
@@ -0,0 +1,2 @@
+The Judd School, Tonbridge, Kent, UK
+format - username@judd.kent.sch.uk
\ No newline at end of file
diff --git a/lib/domains/uk/sch/lancs/hodgson.txt b/lib/domains/uk/sch/lancs/hodgson.txt
new file mode 100644
index 0000000000..58fafe9648
--- /dev/null
+++ b/lib/domains/uk/sch/lancs/hodgson.txt
@@ -0,0 +1 @@
+Hodgson Academy
diff --git a/lib/domains/uk/sch/lancs/millfield.txt b/lib/domains/uk/sch/lancs/millfield.txt
new file mode 100644
index 0000000000..647c98c9bd
--- /dev/null
+++ b/lib/domains/uk/sch/lancs/millfield.txt
@@ -0,0 +1 @@
+Millfield Science & Performing Arts College
diff --git a/lib/domains/uk/sch/lancs/st-aidans.txt b/lib/domains/uk/sch/lancs/st-aidans.txt
new file mode 100644
index 0000000000..81d061a46b
--- /dev/null
+++ b/lib/domains/uk/sch/lancs/st-aidans.txt
@@ -0,0 +1 @@
+St Aidans Church of England High School
diff --git a/lib/domains/uk/sch/n-yorks/ermysteds.txt b/lib/domains/uk/sch/n-yorks/ermysteds.txt
new file mode 100644
index 0000000000..0e7f918df0
--- /dev/null
+++ b/lib/domains/uk/sch/n-yorks/ermysteds.txt
@@ -0,0 +1 @@
+Ermysted's Grammar School
diff --git a/lib/domains/uk/sch/norfolk/aan.txt b/lib/domains/uk/sch/norfolk/aan.txt
new file mode 100644
index 0000000000..dd2fcce559
--- /dev/null
+++ b/lib/domains/uk/sch/norfolk/aan.txt
@@ -0,0 +1 @@
+Attleborough Academy Norfolk
\ No newline at end of file
diff --git a/lib/domains/uk/sch/northants/ccs.txt b/lib/domains/uk/sch/northants/ccs.txt
new file mode 100644
index 0000000000..74d720fecf
--- /dev/null
+++ b/lib/domains/uk/sch/northants/ccs.txt
@@ -0,0 +1 @@
+Caroline Chisholm School
\ No newline at end of file
diff --git a/lib/domains/uk/sch/sutton/cheam.txt b/lib/domains/uk/sch/sutton/cheam.txt
new file mode 100644
index 0000000000..f153e6b42d
--- /dev/null
+++ b/lib/domains/uk/sch/sutton/cheam.txt
@@ -0,0 +1 @@
+Cheam High School
\ No newline at end of file
diff --git a/lib/domains/university/innopolis.txt b/lib/domains/university/innopolis.txt
new file mode 100644
index 0000000000..851256281b
--- /dev/null
+++ b/lib/domains/university/innopolis.txt
@@ -0,0 +1 @@
+Innopolis University
diff --git a/lib/domains/university/rudn.txt b/lib/domains/university/rudn.txt
new file mode 100644
index 0000000000..11547ed26e
--- /dev/null
+++ b/lib/domains/university/rudn.txt
@@ -0,0 +1 @@
+RUDN University
diff --git a/lib/domains/university/satbayev.txt b/lib/domains/university/satbayev.txt
new file mode 100644
index 0000000000..0f5facc91b
--- /dev/null
+++ b/lib/domains/university/satbayev.txt
@@ -0,0 +1 @@
+Satbayev University
diff --git a/lib/domains/us/andoverma/k12.txt b/lib/domains/us/andoverma/k12.txt
new file mode 100644
index 0000000000..babd141191
--- /dev/null
+++ b/lib/domains/us/andoverma/k12.txt
@@ -0,0 +1 @@
+Andover Public Schools
diff --git a/lib/domains/us/ca/k12/murrieta/student.txt b/lib/domains/us/ca/k12/murrieta/student.txt
new file mode 100644
index 0000000000..973a94b435
--- /dev/null
+++ b/lib/domains/us/ca/k12/murrieta/student.txt
@@ -0,0 +1 @@
+Murrieta Valley School District
diff --git a/lib/domains/us/ga/k12/cherokee.txt b/lib/domains/us/ga/k12/cherokee.txt
new file mode 100644
index 0000000000..1bc6f4a59b
--- /dev/null
+++ b/lib/domains/us/ga/k12/cherokee.txt
@@ -0,0 +1 @@
+Cherokee County School District
diff --git a/lib/domains/us/hi/k12/kaimukims.txt b/lib/domains/us/hi/k12/kaimukims.txt
new file mode 100644
index 0000000000..1d0dba410f
--- /dev/null
+++ b/lib/domains/us/hi/k12/kaimukims.txt
@@ -0,0 +1 @@
+Kaimuki Middle School
\ No newline at end of file
diff --git a/lib/domains/us/hi/k12/notes.txt b/lib/domains/us/hi/k12/notes.txt
new file mode 100644
index 0000000000..c5f675d1ee
--- /dev/null
+++ b/lib/domains/us/hi/k12/notes.txt
@@ -0,0 +1,2 @@
+Hawaii State Department of Education
+.group
diff --git a/lib/domains/us/ia/k12/cr.txt b/lib/domains/us/ia/k12/cr.txt
new file mode 100644
index 0000000000..34503d35e2
--- /dev/null
+++ b/lib/domains/us/ia/k12/cr.txt
@@ -0,0 +1 @@
+Cedar Rapids Community School District
diff --git a/lib/domains/us/il/cc/dacc.txt b/lib/domains/us/il/cc/dacc.txt
deleted file mode 100644
index 9f7e1599f8..0000000000
--- a/lib/domains/us/il/cc/dacc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Danville Area Community College
diff --git a/lib/domains/us/il/cc/shawnee.txt b/lib/domains/us/il/cc/shawnee.txt
deleted file mode 100644
index 10d94ce8e9..0000000000
--- a/lib/domains/us/il/cc/shawnee.txt
+++ /dev/null
@@ -1 +0,0 @@
-Shawnee Community College
diff --git a/lib/domains/us/il/cc/triton.txt b/lib/domains/us/il/cc/triton.txt
deleted file mode 100644
index 5f4138f0b9..0000000000
--- a/lib/domains/us/il/cc/triton.txt
+++ /dev/null
@@ -1 +0,0 @@
-Triton College
diff --git a/lib/domains/us/in/k12/hse.txt b/lib/domains/us/in/k12/hse.txt
new file mode 100644
index 0000000000..fffedd6945
--- /dev/null
+++ b/lib/domains/us/in/k12/hse.txt
@@ -0,0 +1 @@
+Hamilton Southeastern High School
\ No newline at end of file
diff --git a/lib/domains/us/jessamine/kyschools.txt b/lib/domains/us/jessamine/kyschools.txt
deleted file mode 100644
index 15fa98033b..0000000000
--- a/lib/domains/us/jessamine/kyschools.txt
+++ /dev/null
@@ -1 +0,0 @@
-West Jessamine High School
diff --git a/lib/domains/us/kyschools/campbell.txt b/lib/domains/us/kyschools/campbell.txt
new file mode 100644
index 0000000000..289aa04fb4
--- /dev/null
+++ b/lib/domains/us/kyschools/campbell.txt
@@ -0,0 +1 @@
+Campbell County Schools
diff --git a/lib/domains/us/kyschools/campbell/stu.txt b/lib/domains/us/kyschools/campbell/stu.txt
new file mode 100644
index 0000000000..289aa04fb4
--- /dev/null
+++ b/lib/domains/us/kyschools/campbell/stu.txt
@@ -0,0 +1 @@
+Campbell County Schools
diff --git a/lib/domains/us/kyschools/fayette.txt b/lib/domains/us/kyschools/fayette.txt
new file mode 100644
index 0000000000..2ad6a04b9b
--- /dev/null
+++ b/lib/domains/us/kyschools/fayette.txt
@@ -0,0 +1 @@
+Bryan Station High School
diff --git a/lib/domains/us/kyschools/fayette/jessamine.txt b/lib/domains/us/kyschools/fayette/jessamine.txt
deleted file mode 100644
index 15fa98033b..0000000000
--- a/lib/domains/us/kyschools/fayette/jessamine.txt
+++ /dev/null
@@ -1 +0,0 @@
-West Jessamine High School
diff --git a/lib/domains/us/kyschools/jefferson/stu.txt b/lib/domains/us/kyschools/jefferson/stu.txt
new file mode 100644
index 0000000000..009ff52743
--- /dev/null
+++ b/lib/domains/us/kyschools/jefferson/stu.txt
@@ -0,0 +1 @@
+Jefferson County Public Schools
diff --git a/lib/domains/us/ma/k12/newton.txt b/lib/domains/us/ma/k12/newton.txt
new file mode 100644
index 0000000000..68cb678b10
--- /dev/null
+++ b/lib/domains/us/ma/k12/newton.txt
@@ -0,0 +1,2 @@
+Newton South High School
+.group
diff --git a/lib/domains/us/md/cc/hcc.txt b/lib/domains/us/md/cc/hcc.txt
deleted file mode 100644
index 109be9d4cf..0000000000
--- a/lib/domains/us/md/cc/hcc.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hagerstown Community College
diff --git a/lib/domains/us/mi/k12/cvs.txt b/lib/domains/us/mi/k12/cvs.txt
new file mode 100644
index 0000000000..e1408025b6
--- /dev/null
+++ b/lib/domains/us/mi/k12/cvs.txt
@@ -0,0 +1 @@
+Chippewa Valley Schools
diff --git a/lib/domains/us/mi/k12/troy.txt b/lib/domains/us/mi/k12/troy.txt
new file mode 100644
index 0000000000..0e7ed178e3
--- /dev/null
+++ b/lib/domains/us/mi/k12/troy.txt
@@ -0,0 +1,3 @@
+Troy Community School District
+Troy Community Schools
+Troy Public School District
diff --git a/lib/domains/us/mo/k12/wrightcity.txt b/lib/domains/us/mo/k12/wrightcity.txt
new file mode 100644
index 0000000000..88f0c4508e
--- /dev/null
+++ b/lib/domains/us/mo/k12/wrightcity.txt
@@ -0,0 +1 @@
+Wright City School District
diff --git a/lib/domains/us/nc/k12/abss.txt b/lib/domains/us/nc/k12/abss.txt
new file mode 100644
index 0000000000..6fe3e3cb2f
--- /dev/null
+++ b/lib/domains/us/nc/k12/abss.txt
@@ -0,0 +1 @@
+Alamance-Burlington School System - Teacher Emails
\ No newline at end of file
diff --git a/lib/domains/us/nc/k12/abss/students.txt b/lib/domains/us/nc/k12/abss/students.txt
new file mode 100644
index 0000000000..348187f8ad
--- /dev/null
+++ b/lib/domains/us/nc/k12/abss/students.txt
@@ -0,0 +1 @@
+Alamance-Burlington School System - Student Emails
\ No newline at end of file
diff --git a/lib/domains/us/nj/k12/dvrhs.txt b/lib/domains/us/nj/k12/dvrhs.txt
new file mode 100644
index 0000000000..947495a1e9
--- /dev/null
+++ b/lib/domains/us/nj/k12/dvrhs.txt
@@ -0,0 +1 @@
+Delaware Valley Regional High School
diff --git a/lib/domains/us/ny/k12/wfsd.txt b/lib/domains/us/ny/k12/wfsd.txt
new file mode 100644
index 0000000000..7845bf9273
--- /dev/null
+++ b/lib/domains/us/ny/k12/wfsd.txt
@@ -0,0 +1,2 @@
+William Floyd High School
+William Floyd School District
diff --git a/lib/domains/us/or/k12/orecity.txt b/lib/domains/us/or/k12/orecity.txt
new file mode 100644
index 0000000000..fb565f9095
--- /dev/null
+++ b/lib/domains/us/or/k12/orecity.txt
@@ -0,0 +1,2 @@
+Oregon City School District
+OCSD
diff --git a/lib/domains/us/or/k12/orecity/student.txt b/lib/domains/us/or/k12/orecity/student.txt
new file mode 100644
index 0000000000..fb565f9095
--- /dev/null
+++ b/lib/domains/us/or/k12/orecity/student.txt
@@ -0,0 +1,2 @@
+Oregon City School District
+OCSD
diff --git a/lib/domains/us/pa/k12/wilmington.txt b/lib/domains/us/pa/k12/wilmington.txt
new file mode 100644
index 0000000000..4c6ad7243b
--- /dev/null
+++ b/lib/domains/us/pa/k12/wilmington.txt
@@ -0,0 +1 @@
+Wilmington Area School District
diff --git a/lib/domains/us/sd/k12.txt b/lib/domains/us/sd/k12.txt
new file mode 100644
index 0000000000..311361d7e0
--- /dev/null
+++ b/lib/domains/us/sd/k12.txt
@@ -0,0 +1 @@
+Brookings High School
diff --git a/lib/domains/us/va/cc/nv.txt b/lib/domains/us/va/cc/nv.txt
deleted file mode 100644
index 672db3be10..0000000000
--- a/lib/domains/us/va/cc/nv.txt
+++ /dev/null
@@ -1 +0,0 @@
-Northern Virginia Community College
\ No newline at end of file
diff --git a/lib/domains/us/va/k12/salem.txt b/lib/domains/us/va/k12/salem.txt
new file mode 100644
index 0000000000..710915aedd
--- /dev/null
+++ b/lib/domains/us/va/k12/salem.txt
@@ -0,0 +1 @@
+Salem High School
diff --git a/lib/domains/us/vi-edu.txt b/lib/domains/us/vi-edu.txt
deleted file mode 100644
index ae244b9c52..0000000000
--- a/lib/domains/us/vi-edu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Victorville International University
diff --git a/lib/domains/us/wi/k12/bonduel.txt b/lib/domains/us/wi/k12/bonduel.txt
new file mode 100644
index 0000000000..1c24dd8396
--- /dev/null
+++ b/lib/domains/us/wi/k12/bonduel.txt
@@ -0,0 +1 @@
+Bonduel School District
diff --git a/lib/domains/us/wi/k12/waukesha.txt b/lib/domains/us/wi/k12/waukesha.txt
new file mode 100644
index 0000000000..2e16378a7a
--- /dev/null
+++ b/lib/domains/us/wi/k12/waukesha.txt
@@ -0,0 +1 @@
+School District of Waukesha
diff --git a/lib/domains/uy/edu/ei.txt b/lib/domains/uy/edu/ei.txt
deleted file mode 100644
index e25cce3d09..0000000000
--- a/lib/domains/uy/edu/ei.txt
+++ /dev/null
@@ -1 +0,0 @@
-Universitario Autonomo del Sur
diff --git a/lib/domains/uz/andmii.txt b/lib/domains/uz/andmii.txt
deleted file mode 100644
index 46311f0a3d..0000000000
--- a/lib/domains/uz/andmii.txt
+++ /dev/null
@@ -1 +0,0 @@
-Andijan Engineering and Economical Institute
diff --git a/lib/domains/uz/farpi.txt b/lib/domains/uz/farpi.txt
deleted file mode 100644
index 142f35a13b..0000000000
--- a/lib/domains/uz/farpi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ferghana Politechnical Institute
diff --git a/lib/domains/uz/msu.txt b/lib/domains/uz/msu.txt
new file mode 100644
index 0000000000..b147abc87c
--- /dev/null
+++ b/lib/domains/uz/msu.txt
@@ -0,0 +1,2 @@
+Lomonosov Moscow State University in Tashkent
+Moscow State University in Tashkent
diff --git a/lib/domains/uz/qmii.txt b/lib/domains/uz/qmii.txt
new file mode 100644
index 0000000000..c126de77cc
--- /dev/null
+++ b/lib/domains/uz/qmii.txt
@@ -0,0 +1 @@
+Karshi Engineering Economic Institute
diff --git a/lib/domains/uz/tsau.txt b/lib/domains/uz/tsau.txt
deleted file mode 100644
index aabf5415b8..0000000000
--- a/lib/domains/uz/tsau.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tashkent State Agrarian University
diff --git a/lib/domains/uz/tstu.txt b/lib/domains/uz/tstu.txt
deleted file mode 100644
index 4894294f60..0000000000
--- a/lib/domains/uz/tstu.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tashkent State Technical University
diff --git a/lib/domains/uz/tuitkf.txt b/lib/domains/uz/tuitkf.txt
new file mode 100644
index 0000000000..3a44728da6
--- /dev/null
+++ b/lib/domains/uz/tuitkf.txt
@@ -0,0 +1 @@
+Karshi Branch of Tashkent University of Information Technologies
diff --git a/lib/domains/ve/com/iutamaracay.txt b/lib/domains/ve/com/iutamaracay.txt
new file mode 100644
index 0000000000..6f85757e3f
--- /dev/null
+++ b/lib/domains/ve/com/iutamaracay.txt
@@ -0,0 +1 @@
+Instituto Universitario de tecnología de Administración Industrial
diff --git a/lib/domains/vn/edu/actvn.txt b/lib/domains/vn/edu/actvn.txt
new file mode 100644
index 0000000000..12a02e4e3e
--- /dev/null
+++ b/lib/domains/vn/edu/actvn.txt
@@ -0,0 +1 @@
+Academy of cryptography techniques of VietNam
diff --git a/lib/domains/vn/edu/tdc.txt b/lib/domains/vn/edu/tdc.txt
new file mode 100644
index 0000000000..c859853543
--- /dev/null
+++ b/lib/domains/vn/edu/tdc.txt
@@ -0,0 +1 @@
+Thu Duc College of Technology
\ No newline at end of file
diff --git a/lib/domains/vn/edu/uct.txt b/lib/domains/vn/edu/uct.txt
deleted file mode 100644
index 0ed2a3b3b9..0000000000
--- a/lib/domains/vn/edu/uct.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hanoi Univerisity of Transportation
diff --git a/lib/domains/ye/edu/queenarwauniversity.txt b/lib/domains/ye/edu/queenarwauniversity.txt
deleted file mode 100644
index 5e5434c756..0000000000
--- a/lib/domains/ye/edu/queenarwauniversity.txt
+++ /dev/null
@@ -1 +0,0 @@
-Queen Arwa University
diff --git a/lib/domains/za/ac/dit.txt b/lib/domains/za/ac/dit.txt
deleted file mode 100644
index d5304352ad..0000000000
--- a/lib/domains/za/ac/dit.txt
+++ /dev/null
@@ -1 +0,0 @@
-Durban Institute of Technology
diff --git a/lib/domains/za/co/birnamcollege.txt b/lib/domains/za/co/birnamcollege.txt
new file mode 100644
index 0000000000..2651c5f088
--- /dev/null
+++ b/lib/domains/za/co/birnamcollege.txt
@@ -0,0 +1 @@
+Birnam College
\ No newline at end of file
diff --git a/lib/domains/za/co/mancosa/students.txt b/lib/domains/za/co/mancosa/students.txt
new file mode 100644
index 0000000000..ebcca44737
--- /dev/null
+++ b/lib/domains/za/co/mancosa/students.txt
@@ -0,0 +1 @@
+Mancosa University
diff --git a/lib/domains/za/co/stjohnschool.txt b/lib/domains/za/co/stjohnschool.txt
new file mode 100644
index 0000000000..b30aafce9c
--- /dev/null
+++ b/lib/domains/za/co/stjohnschool.txt
@@ -0,0 +1 @@
+St John's College
diff --git a/lib/domains/za/edu/pctraining/students.txt b/lib/domains/za/edu/pctraining/students.txt
deleted file mode 100644
index 673c596589..0000000000
--- a/lib/domains/za/edu/pctraining/students.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Richfield Graduate Institute of technology.
-
-previous PC Training and Business college.
diff --git a/test/swot/SwotTest.kt b/test/swot/SwotTest.kt
index 3ef2723def..f800915fb1 100644
--- a/test/swot/SwotTest.kt
+++ b/test/swot/SwotTest.kt
@@ -43,6 +43,7 @@ class SwotTest : TestCase() {
         assertEquals (true , isAcademic("lee@mail.harvard.edu"))
 
         assertEquals(false, isAcademic("imposter@si.edu"))
+        assertEquals(false, isAcademic("lee@mdu.edu.rs"))
 
         // Iran sanctions are lifted
         assertEquals(true, isAcademic("lee@acmt.ac.ir"))