diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/it.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/it.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/nl.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/nl.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ru.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/tr.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/tr.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
similarity index 100%
rename from datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
rename to datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
diff --git a/datamodels/2.x/itop-portal/cs.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/cs.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/cs.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/cs.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/da.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/da.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/da.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/da.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/de.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/de.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/de.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/de.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/en.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/en.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/en.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/en.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/es_cr.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/es_cr.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/es_cr.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/es_cr.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/fr.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/fr.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/fr.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/fr.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/hu.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/hu.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/it.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/it.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/it.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/it.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/ja.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/ja.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/ja.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/ja.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/nl.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/nl.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/nl.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/nl.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/pt_br.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/pt_br.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/pt_br.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/pt_br.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/ru.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/ru.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/ru.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/ru.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/sk.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/sk.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/sk.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/sk.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/tr.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/tr.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/tr.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/tr.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-portal/zh_cn.dict.itop-portal.php b/datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php
similarity index 100%
rename from datamodels/2.x/itop-portal/zh_cn.dict.itop-portal.php
rename to datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php
diff --git a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/cs.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/cs.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/da.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/da.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/de.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/de.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/en.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/fr.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/hu.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/it.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/it.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/ja.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/ja.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/nl.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/nl.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/pt_br.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/ru.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/ru.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/sk.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/sk.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/tr.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/tr.dict.itop-structure.php
diff --git a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php
similarity index 100%
rename from datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
rename to datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php