diff --git a/datamodel/authent-external/de.dict.authent-external.php b/datamodels/1.x/authent-external/de.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/de.dict.authent-external.php rename to datamodels/1.x/authent-external/de.dict.authent-external.php diff --git a/datamodel/authent-external/en.dict.authent-external.php b/datamodels/1.x/authent-external/en.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/en.dict.authent-external.php rename to datamodels/1.x/authent-external/en.dict.authent-external.php diff --git a/datamodel/authent-external/fr.dict.authent-external.php b/datamodels/1.x/authent-external/fr.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/fr.dict.authent-external.php rename to datamodels/1.x/authent-external/fr.dict.authent-external.php diff --git a/datamodel/authent-external/hu.dict.authent-external.php b/datamodels/1.x/authent-external/hu.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/hu.dict.authent-external.php rename to datamodels/1.x/authent-external/hu.dict.authent-external.php diff --git a/datamodel/authent-external/it.dict.authent-external.php b/datamodels/1.x/authent-external/it.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/it.dict.authent-external.php rename to datamodels/1.x/authent-external/it.dict.authent-external.php diff --git a/datamodel/authent-external/ja.dict.authent-external.php b/datamodels/1.x/authent-external/ja.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/ja.dict.authent-external.php rename to datamodels/1.x/authent-external/ja.dict.authent-external.php diff --git a/datamodel/authent-external/model.authent-external.php b/datamodels/1.x/authent-external/model.authent-external.php similarity index 100% rename from datamodel/authent-external/model.authent-external.php rename to datamodels/1.x/authent-external/model.authent-external.php diff --git a/datamodel/authent-external/module.authent-external.php b/datamodels/1.x/authent-external/module.authent-external.php similarity index 100% rename from datamodel/authent-external/module.authent-external.php rename to datamodels/1.x/authent-external/module.authent-external.php diff --git a/datamodel/authent-external/pt_br.dict.authent-external.php b/datamodels/1.x/authent-external/pt_br.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/pt_br.dict.authent-external.php rename to datamodels/1.x/authent-external/pt_br.dict.authent-external.php diff --git a/datamodel/authent-external/ru.dict.authent-external.php b/datamodels/1.x/authent-external/ru.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/ru.dict.authent-external.php rename to datamodels/1.x/authent-external/ru.dict.authent-external.php diff --git a/datamodel/authent-external/tr.dict.authent-external.php b/datamodels/1.x/authent-external/tr.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/tr.dict.authent-external.php rename to datamodels/1.x/authent-external/tr.dict.authent-external.php diff --git a/datamodel/authent-external/zh.dict.authent-external.php b/datamodels/1.x/authent-external/zh.dict.authent-external.php similarity index 100% rename from datamodel/authent-external/zh.dict.authent-external.php rename to datamodels/1.x/authent-external/zh.dict.authent-external.php diff --git a/datamodel/authent-ldap/de.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/de.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/de.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/de.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/en.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/en.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/en.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/en.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/fr.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/fr.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/fr.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/fr.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/hu.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/hu.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/hu.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/hu.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/it.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/it.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/it.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/it.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/ja.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/ja.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/ja.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/ja.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/model.authent-ldap.php b/datamodels/1.x/authent-ldap/model.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/model.authent-ldap.php rename to datamodels/1.x/authent-ldap/model.authent-ldap.php diff --git a/datamodel/authent-ldap/module.authent-ldap.php b/datamodels/1.x/authent-ldap/module.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/module.authent-ldap.php rename to datamodels/1.x/authent-ldap/module.authent-ldap.php diff --git a/datamodel/authent-ldap/pt_br.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/pt_br.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/pt_br.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/pt_br.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/ru.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/ru.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/ru.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/ru.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/tr.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/tr.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/tr.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/tr.dict.authent-ldap.php diff --git a/datamodel/authent-ldap/zh.dict.authent-ldap.php b/datamodels/1.x/authent-ldap/zh.dict.authent-ldap.php similarity index 100% rename from datamodel/authent-ldap/zh.dict.authent-ldap.php rename to datamodels/1.x/authent-ldap/zh.dict.authent-ldap.php diff --git a/datamodel/authent-local/de.dict.authent-local.php b/datamodels/1.x/authent-local/de.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/de.dict.authent-local.php rename to datamodels/1.x/authent-local/de.dict.authent-local.php diff --git a/datamodel/authent-local/en.dict.authent-local.php b/datamodels/1.x/authent-local/en.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/en.dict.authent-local.php rename to datamodels/1.x/authent-local/en.dict.authent-local.php diff --git a/datamodel/authent-local/fr.dict.authent-local.php b/datamodels/1.x/authent-local/fr.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/fr.dict.authent-local.php rename to datamodels/1.x/authent-local/fr.dict.authent-local.php diff --git a/datamodel/authent-local/hu.dict.authent-local.php b/datamodels/1.x/authent-local/hu.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/hu.dict.authent-local.php rename to datamodels/1.x/authent-local/hu.dict.authent-local.php diff --git a/datamodel/authent-local/it.dict.authent-local.php b/datamodels/1.x/authent-local/it.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/it.dict.authent-local.php rename to datamodels/1.x/authent-local/it.dict.authent-local.php diff --git a/datamodel/authent-local/ja.dict.authent-local.php b/datamodels/1.x/authent-local/ja.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/ja.dict.authent-local.php rename to datamodels/1.x/authent-local/ja.dict.authent-local.php diff --git a/datamodel/authent-local/model.authent-local.php b/datamodels/1.x/authent-local/model.authent-local.php similarity index 100% rename from datamodel/authent-local/model.authent-local.php rename to datamodels/1.x/authent-local/model.authent-local.php diff --git a/datamodel/authent-local/module.authent-local.php b/datamodels/1.x/authent-local/module.authent-local.php similarity index 100% rename from datamodel/authent-local/module.authent-local.php rename to datamodels/1.x/authent-local/module.authent-local.php diff --git a/datamodel/authent-local/pt_br.dict.authent-local.php b/datamodels/1.x/authent-local/pt_br.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/pt_br.dict.authent-local.php rename to datamodels/1.x/authent-local/pt_br.dict.authent-local.php diff --git a/datamodel/authent-local/ru.dict.authent-local.php b/datamodels/1.x/authent-local/ru.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/ru.dict.authent-local.php rename to datamodels/1.x/authent-local/ru.dict.authent-local.php diff --git a/datamodel/authent-local/tr.dict.authent-local.php b/datamodels/1.x/authent-local/tr.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/tr.dict.authent-local.php rename to datamodels/1.x/authent-local/tr.dict.authent-local.php diff --git a/datamodel/authent-local/zh.dict.authent-local.php b/datamodels/1.x/authent-local/zh.dict.authent-local.php similarity index 100% rename from datamodel/authent-local/zh.dict.authent-local.php rename to datamodels/1.x/authent-local/zh.dict.authent-local.php diff --git a/datamodel/installation.xml b/datamodels/1.x/installation.xml similarity index 100% rename from datamodel/installation.xml rename to datamodels/1.x/installation.xml diff --git a/datamodel/itop-attachments/ajax.attachment.php b/datamodels/1.x/itop-attachments/ajax.attachment.php similarity index 100% rename from datamodel/itop-attachments/ajax.attachment.php rename to datamodels/1.x/itop-attachments/ajax.attachment.php diff --git a/datamodel/itop-attachments/ajaxfileupload.js b/datamodels/1.x/itop-attachments/ajaxfileupload.js similarity index 100% rename from datamodel/itop-attachments/ajaxfileupload.js rename to datamodels/1.x/itop-attachments/ajaxfileupload.js diff --git a/datamodel/itop-attachments/datamodel.itop-attachments.xml b/datamodels/1.x/itop-attachments/datamodel.itop-attachments.xml similarity index 100% rename from datamodel/itop-attachments/datamodel.itop-attachments.xml rename to datamodels/1.x/itop-attachments/datamodel.itop-attachments.xml diff --git a/datamodel/itop-attachments/de.dict.attachments.php b/datamodels/1.x/itop-attachments/de.dict.attachments.php similarity index 100% rename from datamodel/itop-attachments/de.dict.attachments.php rename to datamodels/1.x/itop-attachments/de.dict.attachments.php diff --git a/datamodel/itop-attachments/en.dict.attachments.php b/datamodels/1.x/itop-attachments/en.dict.attachments.php similarity index 100% rename from datamodel/itop-attachments/en.dict.attachments.php rename to datamodels/1.x/itop-attachments/en.dict.attachments.php diff --git a/datamodel/itop-attachments/fr.dict.attachments.php b/datamodels/1.x/itop-attachments/fr.dict.attachments.php similarity index 100% rename from datamodel/itop-attachments/fr.dict.attachments.php rename to datamodels/1.x/itop-attachments/fr.dict.attachments.php diff --git a/datamodel/itop-attachments/icons/doc.png b/datamodels/1.x/itop-attachments/icons/doc.png similarity index 100% rename from datamodel/itop-attachments/icons/doc.png rename to datamodels/1.x/itop-attachments/icons/doc.png diff --git a/datamodel/itop-attachments/icons/document.png b/datamodels/1.x/itop-attachments/icons/document.png similarity index 100% rename from datamodel/itop-attachments/icons/document.png rename to datamodels/1.x/itop-attachments/icons/document.png diff --git a/datamodel/itop-attachments/icons/html.png b/datamodels/1.x/itop-attachments/icons/html.png similarity index 100% rename from datamodel/itop-attachments/icons/html.png rename to datamodels/1.x/itop-attachments/icons/html.png diff --git a/datamodel/itop-attachments/icons/image.png b/datamodels/1.x/itop-attachments/icons/image.png similarity index 100% rename from datamodel/itop-attachments/icons/image.png rename to datamodels/1.x/itop-attachments/icons/image.png diff --git a/datamodel/itop-attachments/icons/odp.png b/datamodels/1.x/itop-attachments/icons/odp.png similarity index 100% rename from datamodel/itop-attachments/icons/odp.png rename to datamodels/1.x/itop-attachments/icons/odp.png diff --git a/datamodel/itop-attachments/icons/ods.png b/datamodels/1.x/itop-attachments/icons/ods.png similarity index 100% rename from datamodel/itop-attachments/icons/ods.png rename to datamodels/1.x/itop-attachments/icons/ods.png diff --git a/datamodel/itop-attachments/icons/odt.png b/datamodels/1.x/itop-attachments/icons/odt.png similarity index 100% rename from datamodel/itop-attachments/icons/odt.png rename to datamodels/1.x/itop-attachments/icons/odt.png diff --git a/datamodel/itop-attachments/icons/pdf.png b/datamodels/1.x/itop-attachments/icons/pdf.png similarity index 100% rename from datamodel/itop-attachments/icons/pdf.png rename to datamodels/1.x/itop-attachments/icons/pdf.png diff --git a/datamodel/itop-attachments/icons/ppt.png b/datamodels/1.x/itop-attachments/icons/ppt.png similarity index 100% rename from datamodel/itop-attachments/icons/ppt.png rename to datamodels/1.x/itop-attachments/icons/ppt.png diff --git a/datamodel/itop-attachments/icons/rtf.png b/datamodels/1.x/itop-attachments/icons/rtf.png similarity index 100% rename from datamodel/itop-attachments/icons/rtf.png rename to datamodels/1.x/itop-attachments/icons/rtf.png diff --git a/datamodel/itop-attachments/icons/txt.png b/datamodels/1.x/itop-attachments/icons/txt.png similarity index 100% rename from datamodel/itop-attachments/icons/txt.png rename to datamodels/1.x/itop-attachments/icons/txt.png diff --git a/datamodel/itop-attachments/icons/xls.png b/datamodels/1.x/itop-attachments/icons/xls.png similarity index 100% rename from datamodel/itop-attachments/icons/xls.png rename to datamodels/1.x/itop-attachments/icons/xls.png diff --git a/datamodel/itop-attachments/icons/zip.png b/datamodels/1.x/itop-attachments/icons/zip.png similarity index 100% rename from datamodel/itop-attachments/icons/zip.png rename to datamodels/1.x/itop-attachments/icons/zip.png diff --git a/datamodel/itop-attachments/main.attachments.php b/datamodels/1.x/itop-attachments/main.attachments.php similarity index 100% rename from datamodel/itop-attachments/main.attachments.php rename to datamodels/1.x/itop-attachments/main.attachments.php diff --git a/datamodel/itop-attachments/module.attachments.php b/datamodels/1.x/itop-attachments/module.attachments.php similarity index 100% rename from datamodel/itop-attachments/module.attachments.php rename to datamodels/1.x/itop-attachments/module.attachments.php diff --git a/datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml b/datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml rename to datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml diff --git a/datamodel/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/images/change-approved.png b/datamodels/1.x/itop-change-mgmt-1.0.0/images/change-approved.png similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/images/change-approved.png rename to datamodels/1.x/itop-change-mgmt-1.0.0/images/change-approved.png diff --git a/datamodel/itop-change-mgmt-1.0.0/images/change-closed.png b/datamodels/1.x/itop-change-mgmt-1.0.0/images/change-closed.png similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/images/change-closed.png rename to datamodels/1.x/itop-change-mgmt-1.0.0/images/change-closed.png diff --git a/datamodel/itop-change-mgmt-1.0.0/images/change-rejected.png b/datamodels/1.x/itop-change-mgmt-1.0.0/images/change-rejected.png similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/images/change-rejected.png rename to datamodels/1.x/itop-change-mgmt-1.0.0/images/change-rejected.png diff --git a/datamodel/itop-change-mgmt-1.0.0/images/change.png b/datamodels/1.x/itop-change-mgmt-1.0.0/images/change.png similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/images/change.png rename to datamodels/1.x/itop-change-mgmt-1.0.0/images/change.png diff --git a/datamodel/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/overview.xml b/datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/overview.xml rename to datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml diff --git a/datamodel/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php diff --git a/datamodel/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php b/datamodels/1.x/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php similarity index 100% rename from datamodel/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php rename to datamodels/1.x/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php diff --git a/datamodel/itop-config-mgmt-1.0.0/cis_menu.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/cis_menu.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/cis_menu.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/cis_menu.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/config-dashboard.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/config-dashboard.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/config-dashboard.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/config-dashboard.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/contacts_menu.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/contacts_menu.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/contacts_menu.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.Contact.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Contact.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.Contact.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Contact.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.Location.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Location.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.Location.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Location.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.Organization.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Organization.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.Organization.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Organization.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.Software.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Software.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.Software.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.Software.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/data.struct.Audit.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/data.struct.Audit.xml similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/data.struct.Audit.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/data.struct.Audit.xml diff --git a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml b/datamodels/1.x/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml similarity index 99% rename from datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml rename to datamodels/1.x/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml index ca6369dfe..d10ee8993 100644 --- a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml +++ b/datamodels/1.x/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml @@ -3,6 +3,10 @@ cmdbAbstractObject + + _Organization + _organization.class.inc.php + array( - 'model.itop-config-mgmt.php', 'main.itop-config-mgmt.php', + 'model.itop-config-mgmt.php', ), 'data.struct' => array( 'data.struct.Audit.xml', diff --git a/datamodel/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php b/datamodels/1.x/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php rename to datamodels/1.x/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php diff --git a/datamodel/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php b/datamodels/1.x/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php rename to datamodels/1.x/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php diff --git a/datamodel/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php b/datamodels/1.x/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php rename to datamodels/1.x/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php diff --git a/datamodel/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php b/datamodels/1.x/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php similarity index 100% rename from datamodel/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php rename to datamodels/1.x/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml b/datamodels/1.x/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml rename to datamodels/1.x/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml diff --git a/datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml b/datamodels/1.x/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml rename to datamodels/1.x/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml diff --git a/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml b/datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml rename to datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml diff --git a/datamodel/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/images/incident-closed.png b/datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident-closed.png similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/images/incident-closed.png rename to datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident-closed.png diff --git a/datamodel/itop-incident-mgmt-1.0.0/images/incident-deadline.png b/datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident-deadline.png similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/images/incident-deadline.png rename to datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident-deadline.png diff --git a/datamodel/itop-incident-mgmt-1.0.0/images/incident-escalated.png b/datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident-escalated.png similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/images/incident-escalated.png rename to datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident-escalated.png diff --git a/datamodel/itop-incident-mgmt-1.0.0/images/incident.png b/datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident.png similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/images/incident.png rename to datamodels/1.x/itop-incident-mgmt-1.0.0/images/incident.png diff --git a/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml b/datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml rename to datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml diff --git a/datamodel/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php b/datamodels/1.x/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php similarity index 100% rename from datamodel/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php rename to datamodels/1.x/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/images/known-error.png b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/images/known-error.png similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/images/known-error.png rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/images/known-error.png diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php b/datamodels/1.x/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php similarity index 100% rename from datamodel/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php rename to datamodels/1.x/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml b/datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml rename to datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml diff --git a/datamodel/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/images/problem.png b/datamodels/1.x/itop-problem-mgmt-1.0.0/images/problem.png similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/images/problem.png rename to datamodels/1.x/itop-problem-mgmt-1.0.0/images/problem.png diff --git a/datamodel/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/overview.xml b/datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/overview.xml rename to datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml diff --git a/datamodel/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php b/datamodels/1.x/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php similarity index 100% rename from datamodel/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php rename to datamodels/1.x/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php diff --git a/datamodel/itop-profiles-itil/datamodel.itop-profiles-itil.xml b/datamodels/1.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml similarity index 100% rename from datamodel/itop-profiles-itil/datamodel.itop-profiles-itil.xml rename to datamodels/1.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml diff --git a/datamodel/itop-profiles-itil/module.itop-profiles-itil.php b/datamodels/1.x/itop-profiles-itil/module.itop-profiles-itil.php similarity index 100% rename from datamodel/itop-profiles-itil/module.itop-profiles-itil.php rename to datamodels/1.x/itop-profiles-itil/module.itop-profiles-itil.php diff --git a/datamodel/itop-request-mgmt-1.0.0/data.struct.ta-links.xml b/datamodels/1.x/itop-request-mgmt-1.0.0/data.struct.ta-links.xml similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/data.struct.ta-links.xml rename to datamodels/1.x/itop-request-mgmt-1.0.0/data.struct.ta-links.xml diff --git a/datamodel/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml b/datamodels/1.x/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml rename to datamodels/1.x/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml diff --git a/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml b/datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml rename to datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml diff --git a/datamodel/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/images/user-request-closed.png b/datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request-closed.png similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/images/user-request-closed.png rename to datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request-closed.png diff --git a/datamodel/itop-request-mgmt-1.0.0/images/user-request-deadline.png b/datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request-deadline.png similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/images/user-request-deadline.png rename to datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request-deadline.png diff --git a/datamodel/itop-request-mgmt-1.0.0/images/user-request-escalated.png b/datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request-escalated.png similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/images/user-request-escalated.png rename to datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request-escalated.png diff --git a/datamodel/itop-request-mgmt-1.0.0/images/user-request.png b/datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request.png similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/images/user-request.png rename to datamodels/1.x/itop-request-mgmt-1.0.0/images/user-request.png diff --git a/datamodel/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml b/datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml rename to datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml diff --git a/datamodel/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php diff --git a/datamodel/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php b/datamodels/1.x/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php similarity index 100% rename from datamodel/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php rename to datamodels/1.x/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/contract.png b/datamodels/1.x/itop-service-mgmt-1.0.0/contract.png similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/contract.png rename to datamodels/1.x/itop-service-mgmt-1.0.0/contract.png diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.Contract.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.Contract.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.Contract.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.Contract.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.SLA.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.SLA.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.SLA.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.SLA.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.SLT.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.SLT.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.SLT.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.SLT.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.Service.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.Service.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.Service.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.Service.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml b/datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml rename to datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml diff --git a/datamodel/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/overview.html b/datamodels/1.x/itop-service-mgmt-1.0.0/overview.html similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/overview.html rename to datamodels/1.x/itop-service-mgmt-1.0.0/overview.html diff --git a/datamodel/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/service.png b/datamodels/1.x/itop-service-mgmt-1.0.0/service.png similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/service.png rename to datamodels/1.x/itop-service-mgmt-1.0.0/service.png diff --git a/datamodel/itop-service-mgmt-1.0.0/sla.png b/datamodels/1.x/itop-service-mgmt-1.0.0/sla.png similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/sla.png rename to datamodels/1.x/itop-service-mgmt-1.0.0/sla.png diff --git a/datamodel/itop-service-mgmt-1.0.0/slt.png b/datamodels/1.x/itop-service-mgmt-1.0.0/slt.png similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/slt.png rename to datamodels/1.x/itop-service-mgmt-1.0.0/slt.png diff --git a/datamodel/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php diff --git a/datamodel/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php similarity index 100% rename from datamodel/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php rename to datamodels/1.x/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php diff --git a/datamodel/itop-sla-computation/en.dict.itop-sla-computation.php b/datamodels/1.x/itop-sla-computation/en.dict.itop-sla-computation.php similarity index 100% rename from datamodel/itop-sla-computation/en.dict.itop-sla-computation.php rename to datamodels/1.x/itop-sla-computation/en.dict.itop-sla-computation.php diff --git a/datamodel/itop-sla-computation/main.itop-sla-computation.php b/datamodels/1.x/itop-sla-computation/main.itop-sla-computation.php similarity index 100% rename from datamodel/itop-sla-computation/main.itop-sla-computation.php rename to datamodels/1.x/itop-sla-computation/main.itop-sla-computation.php diff --git a/datamodel/itop-sla-computation/module.itop-sla-computation.php b/datamodels/1.x/itop-sla-computation/module.itop-sla-computation.php similarity index 100% rename from datamodel/itop-sla-computation/module.itop-sla-computation.php rename to datamodels/1.x/itop-sla-computation/module.itop-sla-computation.php diff --git a/datamodel/itop-tickets-1.0.0/data.struct.ta-actions.xml b/datamodels/1.x/itop-tickets-1.0.0/data.struct.ta-actions.xml similarity index 100% rename from datamodel/itop-tickets-1.0.0/data.struct.ta-actions.xml rename to datamodels/1.x/itop-tickets-1.0.0/data.struct.ta-actions.xml diff --git a/datamodel/itop-tickets-1.0.0/datamodel.itop-tickets.xml b/datamodels/1.x/itop-tickets-1.0.0/datamodel.itop-tickets.xml similarity index 100% rename from datamodel/itop-tickets-1.0.0/datamodel.itop-tickets.xml rename to datamodels/1.x/itop-tickets-1.0.0/datamodel.itop-tickets.xml diff --git a/datamodel/itop-tickets-1.0.0/de.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/de.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/de.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/de.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/en.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/en.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/en.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/en.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/exclude.txt b/datamodels/1.x/itop-tickets-1.0.0/exclude.txt similarity index 100% rename from datamodel/itop-tickets-1.0.0/exclude.txt rename to datamodels/1.x/itop-tickets-1.0.0/exclude.txt diff --git a/datamodel/itop-tickets-1.0.0/export_triggers_actions.cmd b/datamodels/1.x/itop-tickets-1.0.0/export_triggers_actions.cmd similarity index 100% rename from datamodel/itop-tickets-1.0.0/export_triggers_actions.cmd rename to datamodels/1.x/itop-tickets-1.0.0/export_triggers_actions.cmd diff --git a/datamodel/itop-tickets-1.0.0/fr.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/fr.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/fr.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/fr.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/hu.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/hu.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/hu.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/hu.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/it.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/it.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/it.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/it.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/ja.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/ja.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/ja.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/ja.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/main.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/main.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/main.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/main.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/module.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/module.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/module.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/module.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/ru.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/ru.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/ru.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/ru.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/tr.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/tr.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/tr.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/tr.dict.itop-tickets.php diff --git a/datamodel/itop-tickets-1.0.0/zh.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/zh.dict.itop-tickets.php similarity index 100% rename from datamodel/itop-tickets-1.0.0/zh.dict.itop-tickets.php rename to datamodels/1.x/itop-tickets-1.0.0/zh.dict.itop-tickets.php diff --git a/datamodel/itop-welcome-itil/main.itop-welcome-itil.php b/datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php similarity index 100% rename from datamodel/itop-welcome-itil/main.itop-welcome-itil.php rename to datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php diff --git a/datamodel/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php similarity index 100% rename from datamodel/itop-welcome-itil/module.itop-welcome-itil.php rename to datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php diff --git a/datamodel/itop-welcome-itil/welcome_menu.xml b/datamodels/1.x/itop-welcome-itil/welcome_menu.xml similarity index 100% rename from datamodel/itop-welcome-itil/welcome_menu.xml rename to datamodels/1.x/itop-welcome-itil/welcome_menu.xml diff --git a/datamodel/wizard_icons/service.png b/datamodels/1.x/wizard_icons/service.png similarity index 100% rename from datamodel/wizard_icons/service.png rename to datamodels/1.x/wizard_icons/service.png