diff --git a/datamodels/2.x/authent-cas/cs.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/cs.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/cs.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/cs.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/da.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/da.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/da.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/da.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/de.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/de.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/de.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/de.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/en.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/en.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/en.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/en.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/es_cr.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/es_cr.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/fr.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/fr.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/fr.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/fr.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/hu.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/hu.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/it.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/it.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/it.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/it.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/ja.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/ja.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/ja.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/ja.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/nl.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/nl.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/nl.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/nl.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/pt_br.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/pt_br.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/pt_br.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/pt_br.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/ru.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/ru.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/ru.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/ru.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/sk.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/sk.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/sk.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/sk.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/tr.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/tr.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/tr.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/tr.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-cas/zh_cn.dict.authent-cas.php b/datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php
similarity index 100%
rename from datamodels/2.x/authent-cas/zh_cn.dict.authent-cas.php
rename to datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php
diff --git a/datamodels/2.x/authent-external/cs.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/cs.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/cs.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/cs.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/da.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/da.dict.authent-external.php
similarity index 100%
rename from datamodels/2.x/authent-external/da.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/da.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/de.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/de.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/de.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/de.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/en.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/en.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/en.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/en.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/es_cr.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php
similarity index 100%
rename from datamodels/2.x/authent-external/es_cr.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/fr.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/fr.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/fr.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/fr.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/hu.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/hu.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/hu.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/hu.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/it.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/it.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/it.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/it.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/ja.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/ja.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 99%
rename from datamodels/2.x/authent-external/ja.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/ja.dict.authent-external.php
index 71fff139e..1ad9d101f
--- a/datamodels/2.x/authent-external/ja.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/dictionaries/ja.dict.authent-external.php
@@ -16,7 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * @author	Hirofumi Kosaka <kosaka@rworks.jp>
+ * @author	Hirofumi Kosaka <kosaka@rworks.jp>
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
diff --git a/datamodels/2.x/authent-external/nl.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/nl.dict.authent-external.php
similarity index 100%
rename from datamodels/2.x/authent-external/nl.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/nl.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/pt_br.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/pt_br.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/pt_br.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/pt_br.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/ru.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/ru.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/ru.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/ru.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/sk.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/sk.dict.authent-external.php
similarity index 100%
rename from datamodels/2.x/authent-external/sk.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/sk.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/tr.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/tr.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/tr.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/tr.dict.authent-external.php
diff --git a/datamodels/2.x/authent-external/zh_cn.dict.authent-external.php b/datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-external/zh_cn.dict.authent-external.php
rename to datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php
diff --git a/datamodels/2.x/authent-ldap/cs.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/cs.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/cs.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/da.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php
similarity index 100%
rename from datamodels/2.x/authent-ldap/da.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/da.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/de.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/de.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/de.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/en.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/en.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/en.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/en.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/es_cr.dict.authent-ldap.php
similarity index 100%
rename from datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/es_cr.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/fr.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/fr.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/hu.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/hu.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/it.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/it.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/it.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/it.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/ja.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/ja.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/ja.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/ja.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/nl.dict.authent-ldap.php
similarity index 100%
rename from datamodels/2.x/authent-ldap/nl.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/nl.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/pt_br.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/pt_br.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/pt_br.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/pt_br.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/ru.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/ru.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/ru.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/sk.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/sk.dict.authent-ldap.php
similarity index 100%
rename from datamodels/2.x/authent-ldap/sk.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/sk.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/tr.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/tr.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-ldap/zh_cn.dict.authent-ldap.php
rename to datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
diff --git a/datamodels/2.x/authent-local/cs.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/cs.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/da.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
similarity index 99%
rename from datamodels/2.x/authent-local/da.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
index b1d0064a9..3474d15c6 100644
--- a/datamodels/2.x/authent-local/da.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php
@@ -16,7 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * @author	Erik Bøg <erik@boegmoeller.dk>
+ * @author	Erik Bøg <erik@boegmoeller.dk>
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
diff --git a/datamodels/2.x/authent-local/de.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/de.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/en.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/en.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/en.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/en.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/es_cr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
similarity index 100%
rename from datamodels/2.x/authent-local/es_cr.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/fr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/fr.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/hu.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/hu.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/it.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/it.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/ja.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 99%
rename from datamodels/2.x/authent-local/ja.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
index 62a0fb32f..d491729de
--- a/datamodels/2.x/authent-local/ja.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php
@@ -16,7 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * @author	Hirofumi Kosaka <kosaka@rworks.jp>
+ * @author	Hirofumi Kosaka <kosaka@rworks.jp>
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @licence	http://opensource.org/licenses/AGPL-3.0
  */
diff --git a/datamodels/2.x/authent-local/nl.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php
similarity index 100%
rename from datamodels/2.x/authent-local/nl.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/pt_br.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/pt_br.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/ru.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/ru.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/sk.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
similarity index 100%
rename from datamodels/2.x/authent-local/sk.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/tr.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/tr.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php
diff --git a/datamodels/2.x/authent-local/zh_cn.dict.authent-local.php b/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/authent-local/zh_cn.dict.authent-local.php
rename to datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
diff --git a/datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/cs.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/cs.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/da.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/da.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/de.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/de.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/de.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/en.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/en.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/en.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/es_cr.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/fr.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/fr.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/fr.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/fr.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/hu.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/it.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/it.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/ja.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/ja.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/nl.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/nl.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/nl.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/pt_br.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/pt_br.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/pt_br.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/ru.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/ru.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/sk.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/sk.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/sk.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/tr.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/tr.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/combodo-db-tools/zh_cn.dict.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
similarity index 100%
rename from datamodels/2.x/combodo-db-tools/zh_cn.dict.combodo-db-tools.php
rename to datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
diff --git a/datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-attachments/cs.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/cs.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/da.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/da.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/da.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/de.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/de.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/de.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/en.dict.itop-attachments.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/en.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-attachments/es_cr.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/fr.dict.itop-attachments.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-attachments/fr.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/fr.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/hu.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/it.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/it.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/it.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/ja.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/nl.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/pt_br.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-attachments/ru.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/ru.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/sk.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/sk.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/sk.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/tr.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/tr.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
similarity index 100%
rename from datamodels/2.x/itop-attachments/zh_cn.dict.itop-attachments.php
rename to datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
diff --git a/datamodels/2.x/itop-backup/cs.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-backup/cs.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/cs.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/da.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/da.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/de.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/de.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/de.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/en.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/en.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/en.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/en.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/es_cr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/es_cr.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/fr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/fr.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/fr.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/hu.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/hu.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/it.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/it.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/ja.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/ja.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/nl.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/nl.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/nl.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/pt_br.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-backup/pt_br.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/pt_br.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/ru.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-backup/ru.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/ru.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/sk.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/sk.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/tr.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/tr.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php b/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
similarity index 100%
rename from datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
rename to datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/cs.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/cs.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/cs.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/cs.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/da.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/da.dict.itop-change-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/da.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/da.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/de.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/de.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/de.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/en.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/en.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/es_cr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/es_cr.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/hu.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/hu.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/it.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/it.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/ja.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/ja.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/ja.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/ja.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/nl.dict.itop-change-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/nl.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/nl.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/pt_br.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/pt_br.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/pt_br.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/pt_br.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/ru.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/ru.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/ru.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/ru.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/sk.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/sk.dict.itop-change-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/sk.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/sk.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/tr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/tr.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/tr.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/tr.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt-itil/zh_cn.dict.itop-change-mgmt-itil.php
rename to datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php
diff --git a/datamodels/2.x/itop-change-mgmt/cs.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/cs.dict.itop-change-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/cs.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/cs.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/da.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/da.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/da.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/da.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/de.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/de.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/de.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/en.dict.itop-change-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/en.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/es_cr.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/es_cr.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/fr.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/fr.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/hu.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/hu.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/it.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/it.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/it.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/it.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/ja.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/ja.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/ja.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/ja.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/nl.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/nl.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/pt_br.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/pt_br.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/ru.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/ru.dict.itop-change-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/ru.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/ru.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/sk.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/sk.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/sk.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/sk.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/tr.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/tr.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/tr.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/tr.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-change-mgmt/zh_cn.dict.itop-change-mgmt.php
rename to datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
rename to datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
diff --git a/datamodels/2.x/itop-config/cs.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config/cs.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/da.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/da.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/de.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/de.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/en.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/en.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/es_cr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/es_cr.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/fr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/fr.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/hu.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/hu.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/it.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/it.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/ja.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/ja.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/nl.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/nl.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/pt_br.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/pt_br.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/ru.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config/ru.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/sk.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/sk.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/tr.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/tr.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
diff --git a/datamodels/2.x/itop-config/zh_cn.dict.itop-config.php b/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
similarity index 100%
rename from datamodels/2.x/itop-config/zh_cn.dict.itop-config.php
rename to datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
diff --git a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/de.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/en.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/en.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
similarity index 100%
rename from datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php
rename to datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/cs.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/cs.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/cs.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/cs.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/da.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/da.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/da.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/da.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/de.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/de.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/de.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/de.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/en.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/en.dict.itop-datacenter-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/en.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/en.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/es_cr.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/es_cr.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/es_cr.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/es_cr.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/fr.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/fr.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/fr.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/fr.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/hu.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/hu.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/hu.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/hu.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/it.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/it.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/it.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/it.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/ja.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/ja.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/ja.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/ja.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/nl.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/nl.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/nl.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/nl.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/pt_br.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/pt_br.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/pt_br.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/pt_br.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/ru.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/ru.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/ru.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/ru.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/sk.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/sk.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/sk.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/sk.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/tr.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/tr.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/tr.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/tr.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/zh_cn.dict.itop-datacenter-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-datacenter-mgmt/zh_cn.dict.itop-datacenter-mgmt.php
rename to datamodels/2.x/itop-datacenter-mgmt/dictionaries/zh_cn.dict.itop-datacenter-mgmt.php
diff --git a/datamodels/2.x/itop-endusers-devices/cs.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/cs.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/cs.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/cs.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/da.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/da.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/da.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/da.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/de.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/de.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/de.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/de.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/en.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/en.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/en.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/en.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/es_cr.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/es_cr.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/es_cr.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/es_cr.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/fr.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/fr.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/fr.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/fr.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/hu.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/hu.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/hu.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/hu.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/it.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/it.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/it.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/it.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/ja.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/ja.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/ja.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/ja.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/nl.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/nl.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/nl.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/nl.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/pt_br.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/pt_br.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/pt_br.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/pt_br.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/ru.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/ru.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/ru.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/ru.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/sk.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/sk.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/sk.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/sk.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/tr.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/tr.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/tr.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/tr.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-endusers-devices/zh_cn.dict.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/dictionaries/zh_cn.dict.itop-endusers-devices.php
similarity index 100%
rename from datamodels/2.x/itop-endusers-devices/zh_cn.dict.itop-endusers-devices.php
rename to datamodels/2.x/itop-endusers-devices/dictionaries/zh_cn.dict.itop-endusers-devices.php
diff --git a/datamodels/2.x/itop-files-information/cs.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/cs.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/cs.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/da.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/da.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/da.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/de.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/de.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/en.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/en.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/en.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/en.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/es_cr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/es_cr.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/fr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/fr.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/fr.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/fr.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/hu.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/hu.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/hu.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/hu.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/it.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/it.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/it.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/ja.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/ja.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/ja.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/nl.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/pt_br.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/pt_br.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/ru.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/ru.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/ru.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/sk.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/sk.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/sk.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/tr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/tr.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/tr.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
similarity index 100%
rename from datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php
rename to datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
diff --git a/datamodels/2.x/itop-hub-connector/cs.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/cs.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/da.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/da.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/de.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/de.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/de.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/en.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/en.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/es_cr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/es_cr.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/fr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/fr.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/fr.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/hu.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/hu.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/it.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/it.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/ja.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/ja.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/nl.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/nl.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/pt_br.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/pt_br.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/ru.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/ru.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/sk.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/sk.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/tr.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/tr.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
similarity index 100%
rename from datamodels/2.x/itop-hub-connector/zh_cn.dict.itop-hub-connector.php
rename to datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/cs.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/cs.dict.itop-incident-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/cs.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/cs.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/da.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/da.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/da.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/da.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/de.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/de.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/de.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/de.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en.dict.itop-incident-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/es_cr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/es_cr.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/fr.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/hu.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/hu.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/it.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/it.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/it.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/ja.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ja.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/ja.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ja.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/nl.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/nl.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/ru.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ru.dict.itop-incident-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/ru.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/ru.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/sk.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/sk.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/sk.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/tr.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/tr.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/tr.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-incident-mgmt-itil/zh_cn.dict.itop-incident-mgmt-itil.php
rename to datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/cs.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/cs.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/da.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/da.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/es_cr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/es_cr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/hu.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/hu.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/ja.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/ja.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/ru.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/ru.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/sk.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/sk.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/zh_cn.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
diff --git a/datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/da.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/da.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/de.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/de.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/en.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/en.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/fr.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/fr.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/hu.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/hu.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/it.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/it.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/ja.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/ja.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/nl.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/nl.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/nl.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/pt_br.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/pt_br.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/pt_br.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/pt_br.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/ru.dict.itop-portal-base.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/ru.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/sk.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/sk.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/tr.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/tr.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php b/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
similarity index 100%
rename from datamodels/2.x/itop-portal-base/zh_cn.dict.itop-portal-base.php
rename to datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
diff --git a/datamodels/2.x/itop-problem-mgmt/cs.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/cs.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/cs.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/cs.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/da.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/da.dict.itop-problem-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/da.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/da.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/de.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/de.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/de.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/de.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/en.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/en.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/es_cr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/es_cr.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/hu.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/hu.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/it.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/it.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/ja.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/ja.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/ja.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/ja.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/nl.dict.itop-problem-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/nl.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/pt_br.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/pt_br.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/pt_br.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/pt_br.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/ru.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/ru.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/ru.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/ru.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/sk.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/sk.dict.itop-problem-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/sk.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/sk.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/tr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/tr.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/tr.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/tr.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-problem-mgmt/zh_cn.dict.itop-problem-mgmt.php
rename to datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/cs.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/cs.dict.itop-request-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/cs.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/cs.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/da.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/da.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/da.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/da.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/de.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/de.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/de.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/de.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/en.dict.itop-request-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/en.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/fr.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/hu.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/hu.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/it.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/it.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/it.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/ja.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ja.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/ja.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/ja.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/nl.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/nl.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/nl.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/nl.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/ru.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/ru.dict.itop-request-mgmt-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/ru.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/ru.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/sk.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/sk.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/sk.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/sk.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/tr.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/tr.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/tr.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt-itil/zh_cn.dict.itop-request-mgmt-itil.php
rename to datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php
diff --git a/datamodels/2.x/itop-request-mgmt/cs.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/cs.dict.itop-request-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/cs.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/cs.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/da.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/da.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/da.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/da.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/de.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/de.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/de.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/de.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/en.dict.itop-request-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/en.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/es_cr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/es_cr.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/fr.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/hu.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/hu.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/it.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/it.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/it.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/ja.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/ja.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/ja.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/ja.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/nl.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/nl.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/pt_br.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/pt_br.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/ru.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/ru.dict.itop-request-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/ru.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/ru.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/sk.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/sk.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/sk.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/sk.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/tr.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/tr.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/tr.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-request-mgmt/zh_cn.dict.itop-request-mgmt.php
rename to datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/cs.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/cs.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/da.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/da.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/hu.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/hu.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/it.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/it.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/ru.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/ru.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/sk.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/sk.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/tr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/tr.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt-provider/zh_cn.dict.itop-service-mgmt-provider.php
rename to datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
diff --git a/datamodels/2.x/itop-service-mgmt/cs.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/cs.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/da.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/da.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/hu.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/hu.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/nl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/nl.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/sk.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/sk.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-service-mgmt/zh_cn.dict.itop-service-mgmt.php
rename to datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
diff --git a/datamodels/2.x/itop-sla-computation/cs.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/cs.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/cs.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/cs.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/da.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/da.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/da.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/da.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/de.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/de.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/de.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/de.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/en.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/en.dict.itop-sla-computation.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/en.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/en.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/es_cr.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/es_cr.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/fr.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/fr.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/fr.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/fr.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/hu.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/hu.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/hu.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/hu.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/it.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/it.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/it.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/it.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/ja.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/ja.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/ja.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/ja.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/nl.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/nl.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/nl.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/nl.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/pt_br.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/pt_br.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/pt_br.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/pt_br.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/ru.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/ru.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/ru.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/ru.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/sk.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/sk.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/sk.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/sk.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/tr.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/tr.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/tr.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/tr.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-sla-computation/zh_cn.dict.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/dictionaries/zh_cn.dict.itop-sla-computation.php
similarity index 100%
rename from datamodels/2.x/itop-sla-computation/zh_cn.dict.itop-sla-computation.php
rename to datamodels/2.x/itop-sla-computation/dictionaries/zh_cn.dict.itop-sla-computation.php
diff --git a/datamodels/2.x/itop-storage-mgmt/cs.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/cs.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/cs.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/cs.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/da.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/da.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/da.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/da.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/de.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/de.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/de.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/de.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/en.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/en.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/en.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/en.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/es_cr.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/es_cr.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/fr.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/fr.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/fr.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/fr.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/hu.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/hu.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/hu.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/hu.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/it.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/it.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/it.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/it.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/ja.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/ja.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/ja.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/ja.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/nl.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/nl.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/nl.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/nl.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/pt_br.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/pt_br.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/pt_br.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/pt_br.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/ru.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/ru.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/ru.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/ru.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/sk.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/sk.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/sk.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/sk.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/tr.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/tr.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/tr.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/tr.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-storage-mgmt/zh_cn.dict.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-storage-mgmt/zh_cn.dict.itop-storage-mgmt.php
rename to datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php
diff --git a/datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/da.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
similarity index 100%
rename from datamodels/2.x/itop-tickets/da.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/de.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/de.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
similarity index 100%
rename from datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/sk.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
similarity index 100%
rename from datamodels/2.x/itop-tickets/sk.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
rename to datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/cs.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/cs.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/cs.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/cs.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/da.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/da.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/da.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/da.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/de.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/de.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/de.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/de.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/en.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/en.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/en.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/en.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/es_cr.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/es_cr.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/fr.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/fr.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/fr.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/fr.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/hu.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/hu.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/hu.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/hu.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/it.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/it.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/it.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/it.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/ja.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/ja.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/ja.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/ja.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/nl.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/nl.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/nl.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/nl.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/pt_br.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/pt_br.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/pt_br.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/pt_br.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/ru.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/ru.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/ru.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/ru.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/sk.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/sk.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/sk.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/sk.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/tr.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/tr.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/tr.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/tr.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-virtualization-mgmt/zh_cn.dict.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/zh_cn.dict.itop-virtualization-mgmt.php
similarity index 100%
rename from datamodels/2.x/itop-virtualization-mgmt/zh_cn.dict.itop-virtualization-mgmt.php
rename to datamodels/2.x/itop-virtualization-mgmt/dictionaries/zh_cn.dict.itop-virtualization-mgmt.php
diff --git a/datamodels/2.x/itop-welcome-itil/cs.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/cs.dict.itop-welcome-itil.php
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/cs.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/cs.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/da.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/da.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/da.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/da.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/de.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/de.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/de.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/de.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/en.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/en.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/es_cr.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/es_cr.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/fr.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/fr.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/hu.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/hu.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/hu.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/hu.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/it.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/it.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/it.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/it.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/ja.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/ja.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/ja.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/ja.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/nl.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/nl.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/nl.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/nl.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/pt_br.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/pt_br.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/pt_br.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/pt_br.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/ru.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/ru.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/ru.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/ru.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/sk.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/sk.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/sk.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/sk.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/tr.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/tr.dict.itop-welcome-itil.php
diff --git a/datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/dictionaries/zh_cn.dict.itop-welcome-itil.php
similarity index 100%
rename from datamodels/2.x/itop-welcome-itil/zh_cn.dict.itop-welcome-itil.php
rename to datamodels/2.x/itop-welcome-itil/dictionaries/zh_cn.dict.itop-welcome-itil.php