diff --git a/modules/authent-external/de.dict.authent-external.php b/datamodel/authent-external/de.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/de.dict.authent-external.php
rename to datamodel/authent-external/de.dict.authent-external.php
diff --git a/modules/authent-external/en.dict.authent-external.php b/datamodel/authent-external/en.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/en.dict.authent-external.php
rename to datamodel/authent-external/en.dict.authent-external.php
diff --git a/modules/authent-external/fr.dict.authent-external.php b/datamodel/authent-external/fr.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/fr.dict.authent-external.php
rename to datamodel/authent-external/fr.dict.authent-external.php
diff --git a/modules/authent-external/hu.dict.authent-external.php b/datamodel/authent-external/hu.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/hu.dict.authent-external.php
rename to datamodel/authent-external/hu.dict.authent-external.php
diff --git a/modules/authent-external/it.dict.authent-external.php b/datamodel/authent-external/it.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/it.dict.authent-external.php
rename to datamodel/authent-external/it.dict.authent-external.php
diff --git a/modules/authent-external/ja.dict.authent-external.php b/datamodel/authent-external/ja.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/ja.dict.authent-external.php
rename to datamodel/authent-external/ja.dict.authent-external.php
diff --git a/modules/authent-external/model.authent-external.php b/datamodel/authent-external/model.authent-external.php
similarity index 100%
rename from modules/authent-external/model.authent-external.php
rename to datamodel/authent-external/model.authent-external.php
diff --git a/modules/authent-external/module.authent-external.php b/datamodel/authent-external/module.authent-external.php
similarity index 100%
rename from modules/authent-external/module.authent-external.php
rename to datamodel/authent-external/module.authent-external.php
diff --git a/modules/authent-external/pt_br.dict.authent-external.php b/datamodel/authent-external/pt_br.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/pt_br.dict.authent-external.php
rename to datamodel/authent-external/pt_br.dict.authent-external.php
diff --git a/modules/authent-external/ru.dict.authent-external.php b/datamodel/authent-external/ru.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/ru.dict.authent-external.php
rename to datamodel/authent-external/ru.dict.authent-external.php
diff --git a/modules/authent-external/tr.dict.authent-external.php b/datamodel/authent-external/tr.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/tr.dict.authent-external.php
rename to datamodel/authent-external/tr.dict.authent-external.php
diff --git a/modules/authent-external/zh.dict.authent-external.php b/datamodel/authent-external/zh.dict.authent-external.php
similarity index 100%
rename from modules/authent-external/zh.dict.authent-external.php
rename to datamodel/authent-external/zh.dict.authent-external.php
diff --git a/modules/authent-ldap/de.dict.authent-ldap.php b/datamodel/authent-ldap/de.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/de.dict.authent-ldap.php
rename to datamodel/authent-ldap/de.dict.authent-ldap.php
diff --git a/modules/authent-ldap/en.dict.authent-ldap.php b/datamodel/authent-ldap/en.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/en.dict.authent-ldap.php
rename to datamodel/authent-ldap/en.dict.authent-ldap.php
diff --git a/modules/authent-ldap/fr.dict.authent-ldap.php b/datamodel/authent-ldap/fr.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/fr.dict.authent-ldap.php
rename to datamodel/authent-ldap/fr.dict.authent-ldap.php
diff --git a/modules/authent-ldap/hu.dict.authent-ldap.php b/datamodel/authent-ldap/hu.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/hu.dict.authent-ldap.php
rename to datamodel/authent-ldap/hu.dict.authent-ldap.php
diff --git a/modules/authent-ldap/it.dict.authent-ldap.php b/datamodel/authent-ldap/it.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/it.dict.authent-ldap.php
rename to datamodel/authent-ldap/it.dict.authent-ldap.php
diff --git a/modules/authent-ldap/ja.dict.authent-ldap.php b/datamodel/authent-ldap/ja.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/ja.dict.authent-ldap.php
rename to datamodel/authent-ldap/ja.dict.authent-ldap.php
diff --git a/modules/authent-ldap/model.authent-ldap.php b/datamodel/authent-ldap/model.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/model.authent-ldap.php
rename to datamodel/authent-ldap/model.authent-ldap.php
diff --git a/modules/authent-ldap/module.authent-ldap.php b/datamodel/authent-ldap/module.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/module.authent-ldap.php
rename to datamodel/authent-ldap/module.authent-ldap.php
diff --git a/modules/authent-ldap/pt_br.dict.authent-ldap.php b/datamodel/authent-ldap/pt_br.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/pt_br.dict.authent-ldap.php
rename to datamodel/authent-ldap/pt_br.dict.authent-ldap.php
diff --git a/modules/authent-ldap/ru.dict.authent-ldap.php b/datamodel/authent-ldap/ru.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/ru.dict.authent-ldap.php
rename to datamodel/authent-ldap/ru.dict.authent-ldap.php
diff --git a/modules/authent-ldap/tr.dict.authent-ldap.php b/datamodel/authent-ldap/tr.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/tr.dict.authent-ldap.php
rename to datamodel/authent-ldap/tr.dict.authent-ldap.php
diff --git a/modules/authent-ldap/zh.dict.authent-ldap.php b/datamodel/authent-ldap/zh.dict.authent-ldap.php
similarity index 100%
rename from modules/authent-ldap/zh.dict.authent-ldap.php
rename to datamodel/authent-ldap/zh.dict.authent-ldap.php
diff --git a/modules/authent-local/de.dict.authent-local.php b/datamodel/authent-local/de.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/de.dict.authent-local.php
rename to datamodel/authent-local/de.dict.authent-local.php
diff --git a/modules/authent-local/en.dict.authent-local.php b/datamodel/authent-local/en.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/en.dict.authent-local.php
rename to datamodel/authent-local/en.dict.authent-local.php
diff --git a/modules/authent-local/fr.dict.authent-local.php b/datamodel/authent-local/fr.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/fr.dict.authent-local.php
rename to datamodel/authent-local/fr.dict.authent-local.php
diff --git a/modules/authent-local/hu.dict.authent-local.php b/datamodel/authent-local/hu.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/hu.dict.authent-local.php
rename to datamodel/authent-local/hu.dict.authent-local.php
diff --git a/modules/authent-local/it.dict.authent-local.php b/datamodel/authent-local/it.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/it.dict.authent-local.php
rename to datamodel/authent-local/it.dict.authent-local.php
diff --git a/modules/authent-local/ja.dict.authent-local.php b/datamodel/authent-local/ja.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/ja.dict.authent-local.php
rename to datamodel/authent-local/ja.dict.authent-local.php
diff --git a/modules/authent-local/model.authent-local.php b/datamodel/authent-local/model.authent-local.php
similarity index 100%
rename from modules/authent-local/model.authent-local.php
rename to datamodel/authent-local/model.authent-local.php
diff --git a/modules/authent-local/module.authent-local.php b/datamodel/authent-local/module.authent-local.php
similarity index 100%
rename from modules/authent-local/module.authent-local.php
rename to datamodel/authent-local/module.authent-local.php
diff --git a/modules/authent-local/pt_br.dict.authent-local.php b/datamodel/authent-local/pt_br.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/pt_br.dict.authent-local.php
rename to datamodel/authent-local/pt_br.dict.authent-local.php
diff --git a/modules/authent-local/ru.dict.authent-local.php b/datamodel/authent-local/ru.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/ru.dict.authent-local.php
rename to datamodel/authent-local/ru.dict.authent-local.php
diff --git a/modules/authent-local/tr.dict.authent-local.php b/datamodel/authent-local/tr.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/tr.dict.authent-local.php
rename to datamodel/authent-local/tr.dict.authent-local.php
diff --git a/modules/authent-local/zh.dict.authent-local.php b/datamodel/authent-local/zh.dict.authent-local.php
similarity index 100%
rename from modules/authent-local/zh.dict.authent-local.php
rename to datamodel/authent-local/zh.dict.authent-local.php
diff --git a/modules/itop-attachments/ajax.attachment.php b/datamodel/itop-attachments/ajax.attachment.php
similarity index 100%
rename from modules/itop-attachments/ajax.attachment.php
rename to datamodel/itop-attachments/ajax.attachment.php
diff --git a/modules/itop-attachments/ajaxfileupload.js b/datamodel/itop-attachments/ajaxfileupload.js
similarity index 100%
rename from modules/itop-attachments/ajaxfileupload.js
rename to datamodel/itop-attachments/ajaxfileupload.js
diff --git a/modules/itop-attachments/datamodel.itop-attachments.xml b/datamodel/itop-attachments/datamodel.itop-attachments.xml
similarity index 100%
rename from modules/itop-attachments/datamodel.itop-attachments.xml
rename to datamodel/itop-attachments/datamodel.itop-attachments.xml
diff --git a/modules/itop-attachments/de.dict.attachments.php b/datamodel/itop-attachments/de.dict.attachments.php
similarity index 100%
rename from modules/itop-attachments/de.dict.attachments.php
rename to datamodel/itop-attachments/de.dict.attachments.php
diff --git a/modules/itop-attachments/en.dict.attachments.php b/datamodel/itop-attachments/en.dict.attachments.php
similarity index 100%
rename from modules/itop-attachments/en.dict.attachments.php
rename to datamodel/itop-attachments/en.dict.attachments.php
diff --git a/modules/itop-attachments/fr.dict.attachments.php b/datamodel/itop-attachments/fr.dict.attachments.php
similarity index 100%
rename from modules/itop-attachments/fr.dict.attachments.php
rename to datamodel/itop-attachments/fr.dict.attachments.php
diff --git a/modules/itop-attachments/icons/doc.png b/datamodel/itop-attachments/icons/doc.png
similarity index 100%
rename from modules/itop-attachments/icons/doc.png
rename to datamodel/itop-attachments/icons/doc.png
diff --git a/modules/itop-attachments/icons/document.png b/datamodel/itop-attachments/icons/document.png
similarity index 100%
rename from modules/itop-attachments/icons/document.png
rename to datamodel/itop-attachments/icons/document.png
diff --git a/modules/itop-attachments/icons/html.png b/datamodel/itop-attachments/icons/html.png
similarity index 100%
rename from modules/itop-attachments/icons/html.png
rename to datamodel/itop-attachments/icons/html.png
diff --git a/modules/itop-attachments/icons/image.png b/datamodel/itop-attachments/icons/image.png
similarity index 100%
rename from modules/itop-attachments/icons/image.png
rename to datamodel/itop-attachments/icons/image.png
diff --git a/modules/itop-attachments/icons/odp.png b/datamodel/itop-attachments/icons/odp.png
similarity index 100%
rename from modules/itop-attachments/icons/odp.png
rename to datamodel/itop-attachments/icons/odp.png
diff --git a/modules/itop-attachments/icons/ods.png b/datamodel/itop-attachments/icons/ods.png
similarity index 100%
rename from modules/itop-attachments/icons/ods.png
rename to datamodel/itop-attachments/icons/ods.png
diff --git a/modules/itop-attachments/icons/odt.png b/datamodel/itop-attachments/icons/odt.png
similarity index 100%
rename from modules/itop-attachments/icons/odt.png
rename to datamodel/itop-attachments/icons/odt.png
diff --git a/modules/itop-attachments/icons/pdf.png b/datamodel/itop-attachments/icons/pdf.png
similarity index 100%
rename from modules/itop-attachments/icons/pdf.png
rename to datamodel/itop-attachments/icons/pdf.png
diff --git a/modules/itop-attachments/icons/ppt.png b/datamodel/itop-attachments/icons/ppt.png
similarity index 100%
rename from modules/itop-attachments/icons/ppt.png
rename to datamodel/itop-attachments/icons/ppt.png
diff --git a/modules/itop-attachments/icons/rtf.png b/datamodel/itop-attachments/icons/rtf.png
similarity index 100%
rename from modules/itop-attachments/icons/rtf.png
rename to datamodel/itop-attachments/icons/rtf.png
diff --git a/modules/itop-attachments/icons/txt.png b/datamodel/itop-attachments/icons/txt.png
similarity index 100%
rename from modules/itop-attachments/icons/txt.png
rename to datamodel/itop-attachments/icons/txt.png
diff --git a/modules/itop-attachments/icons/xls.png b/datamodel/itop-attachments/icons/xls.png
similarity index 100%
rename from modules/itop-attachments/icons/xls.png
rename to datamodel/itop-attachments/icons/xls.png
diff --git a/modules/itop-attachments/icons/zip.png b/datamodel/itop-attachments/icons/zip.png
similarity index 100%
rename from modules/itop-attachments/icons/zip.png
rename to datamodel/itop-attachments/icons/zip.png
diff --git a/modules/itop-attachments/main.attachments.php b/datamodel/itop-attachments/main.attachments.php
similarity index 100%
rename from modules/itop-attachments/main.attachments.php
rename to datamodel/itop-attachments/main.attachments.php
diff --git a/modules/itop-attachments/module.attachments.php b/datamodel/itop-attachments/module.attachments.php
similarity index 100%
rename from modules/itop-attachments/module.attachments.php
rename to datamodel/itop-attachments/module.attachments.php
diff --git a/modules/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml b/datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml
rename to datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml
diff --git a/modules/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/en.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/es_cr.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/fr.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/hu.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/images/change-approved.png b/datamodel/itop-change-mgmt-1.0.0/images/change-approved.png
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/images/change-approved.png
rename to datamodel/itop-change-mgmt-1.0.0/images/change-approved.png
diff --git a/modules/itop-change-mgmt-1.0.0/images/change-closed.png b/datamodel/itop-change-mgmt-1.0.0/images/change-closed.png
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/images/change-closed.png
rename to datamodel/itop-change-mgmt-1.0.0/images/change-closed.png
diff --git a/modules/itop-change-mgmt-1.0.0/images/change-rejected.png b/datamodel/itop-change-mgmt-1.0.0/images/change-rejected.png
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/images/change-rejected.png
rename to datamodel/itop-change-mgmt-1.0.0/images/change-rejected.png
diff --git a/modules/itop-change-mgmt-1.0.0/images/change.png b/datamodel/itop-change-mgmt-1.0.0/images/change.png
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/images/change.png
rename to datamodel/itop-change-mgmt-1.0.0/images/change.png
diff --git a/modules/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/it.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/ja.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/main.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/overview.html b/datamodel/itop-change-mgmt-1.0.0/overview.html
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/overview.html
rename to datamodel/itop-change-mgmt-1.0.0/overview.html
diff --git a/modules/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/pt_br.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/ru.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/tr.dict.itop-change-mgmt.php
diff --git a/modules/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php b/datamodel/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php
similarity index 100%
rename from modules/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php
rename to datamodel/itop-change-mgmt-1.0.0/zh.dict.itop-change-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/cis_menu.html b/datamodel/itop-config-mgmt-1.0.0/cis_menu.html
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/cis_menu.html
rename to datamodel/itop-config-mgmt-1.0.0/cis_menu.html
diff --git a/modules/itop-config-mgmt-1.0.0/contacts_menu.html b/datamodel/itop-config-mgmt-1.0.0/contacts_menu.html
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/contacts_menu.html
rename to datamodel/itop-config-mgmt-1.0.0/contacts_menu.html
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.Contact.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.Contact.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Location.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.Location.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.Location.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.Location.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Organization.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.Organization.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.Organization.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.Organization.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Software.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.Software.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.Software.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.Software.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml b/datamodel/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml
diff --git a/modules/itop-config-mgmt-1.0.0/data.struct.Audit.xml b/datamodel/itop-config-mgmt-1.0.0/data.struct.Audit.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/data.struct.Audit.xml
rename to datamodel/itop-config-mgmt-1.0.0/data.struct.Audit.xml
diff --git a/modules/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
rename to datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
diff --git a/modules/itop-config-mgmt-1.0.0/de.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/de.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/de.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/de.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/es_cr.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/es_cr.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/es_cr.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/es_cr.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/hu.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/hu.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/hu.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/hu.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/images/application.png b/datamodel/itop-config-mgmt-1.0.0/images/application.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/application.png
rename to datamodel/itop-config-mgmt-1.0.0/images/application.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/business-process.png b/datamodel/itop-config-mgmt-1.0.0/images/business-process.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/business-process.png
rename to datamodel/itop-config-mgmt-1.0.0/images/business-process.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/computer.png b/datamodel/itop-config-mgmt-1.0.0/images/computer.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/computer.png
rename to datamodel/itop-config-mgmt-1.0.0/images/computer.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/contact.png b/datamodel/itop-config-mgmt-1.0.0/images/contact.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/contact.png
rename to datamodel/itop-config-mgmt-1.0.0/images/contact.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/database-instance.png b/datamodel/itop-config-mgmt-1.0.0/images/database-instance.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/database-instance.png
rename to datamodel/itop-config-mgmt-1.0.0/images/database-instance.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/database.png b/datamodel/itop-config-mgmt-1.0.0/images/database.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/database.png
rename to datamodel/itop-config-mgmt-1.0.0/images/database.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/document.png b/datamodel/itop-config-mgmt-1.0.0/images/document.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/document.png
rename to datamodel/itop-config-mgmt-1.0.0/images/document.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/group.png b/datamodel/itop-config-mgmt-1.0.0/images/group.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/group.png
rename to datamodel/itop-config-mgmt-1.0.0/images/group.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/interface.png b/datamodel/itop-config-mgmt-1.0.0/images/interface.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/interface.png
rename to datamodel/itop-config-mgmt-1.0.0/images/interface.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/laptop.png b/datamodel/itop-config-mgmt-1.0.0/images/laptop.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/laptop.png
rename to datamodel/itop-config-mgmt-1.0.0/images/laptop.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/licence.png b/datamodel/itop-config-mgmt-1.0.0/images/licence.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/licence.png
rename to datamodel/itop-config-mgmt-1.0.0/images/licence.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/location.png b/datamodel/itop-config-mgmt-1.0.0/images/location.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/location.png
rename to datamodel/itop-config-mgmt-1.0.0/images/location.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/mobile-phone.png b/datamodel/itop-config-mgmt-1.0.0/images/mobile-phone.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/mobile-phone.png
rename to datamodel/itop-config-mgmt-1.0.0/images/mobile-phone.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/patch.png b/datamodel/itop-config-mgmt-1.0.0/images/patch.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/patch.png
rename to datamodel/itop-config-mgmt-1.0.0/images/patch.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/person.png b/datamodel/itop-config-mgmt-1.0.0/images/person.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/person.png
rename to datamodel/itop-config-mgmt-1.0.0/images/person.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/printer.png b/datamodel/itop-config-mgmt-1.0.0/images/printer.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/printer.png
rename to datamodel/itop-config-mgmt-1.0.0/images/printer.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/server.png b/datamodel/itop-config-mgmt-1.0.0/images/server.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/server.png
rename to datamodel/itop-config-mgmt-1.0.0/images/server.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/software.png b/datamodel/itop-config-mgmt-1.0.0/images/software.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/software.png
rename to datamodel/itop-config-mgmt-1.0.0/images/software.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/solution.png b/datamodel/itop-config-mgmt-1.0.0/images/solution.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/solution.png
rename to datamodel/itop-config-mgmt-1.0.0/images/solution.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/subnet.png b/datamodel/itop-config-mgmt-1.0.0/images/subnet.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/subnet.png
rename to datamodel/itop-config-mgmt-1.0.0/images/subnet.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/switch.png b/datamodel/itop-config-mgmt-1.0.0/images/switch.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/switch.png
rename to datamodel/itop-config-mgmt-1.0.0/images/switch.png
diff --git a/modules/itop-config-mgmt-1.0.0/images/team.png b/datamodel/itop-config-mgmt-1.0.0/images/team.png
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/images/team.png
rename to datamodel/itop-config-mgmt-1.0.0/images/team.png
diff --git a/modules/itop-config-mgmt-1.0.0/it.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/it.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/it.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/it.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/ja.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/ja.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/ja.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/ja.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/main.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/main.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/main.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/main.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/overview.html b/datamodel/itop-config-mgmt-1.0.0/overview.html
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/overview.html
rename to datamodel/itop-config-mgmt-1.0.0/overview.html
diff --git a/modules/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/ru.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/tr.dict.itop-config-mgmt.php
diff --git a/modules/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php b/datamodel/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php
similarity index 100%
rename from modules/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php
rename to datamodel/itop-config-mgmt-1.0.0/zh.dict.itop-config-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml b/datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml
rename to datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-links.xml
diff --git a/modules/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml b/datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml
rename to datamodel/itop-incident-mgmt-1.0.0/data.struct.ta-triggers.xml
diff --git a/modules/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml b/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml
rename to datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml
diff --git a/modules/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/en.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/es_cr.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/fr.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/hu.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/images/incident-closed.png b/datamodel/itop-incident-mgmt-1.0.0/images/incident-closed.png
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/images/incident-closed.png
rename to datamodel/itop-incident-mgmt-1.0.0/images/incident-closed.png
diff --git a/modules/itop-incident-mgmt-1.0.0/images/incident-deadline.png b/datamodel/itop-incident-mgmt-1.0.0/images/incident-deadline.png
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/images/incident-deadline.png
rename to datamodel/itop-incident-mgmt-1.0.0/images/incident-deadline.png
diff --git a/modules/itop-incident-mgmt-1.0.0/images/incident-escalated.png b/datamodel/itop-incident-mgmt-1.0.0/images/incident-escalated.png
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/images/incident-escalated.png
rename to datamodel/itop-incident-mgmt-1.0.0/images/incident-escalated.png
diff --git a/modules/itop-incident-mgmt-1.0.0/images/incident.png b/datamodel/itop-incident-mgmt-1.0.0/images/incident.png
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/images/incident.png
rename to datamodel/itop-incident-mgmt-1.0.0/images/incident.png
diff --git a/modules/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/it.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/ja.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/main.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/overview.html b/datamodel/itop-incident-mgmt-1.0.0/overview.html
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/overview.html
rename to datamodel/itop-incident-mgmt-1.0.0/overview.html
diff --git a/modules/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/pt_br.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/ru.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/tr.dict.itop-incident-mgmt.php
diff --git a/modules/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php b/datamodel/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php
similarity index 100%
rename from modules/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php
rename to datamodel/itop-incident-mgmt-1.0.0/zh.dict.itop-incident-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml b/datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml
rename to datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml
diff --git a/modules/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/de.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/en.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/es_cr.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/fr.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/hu.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/images/known-error.png b/datamodel/itop-knownerror-mgmt-1.0.0/images/known-error.png
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/images/known-error.png
rename to datamodel/itop-knownerror-mgmt-1.0.0/images/known-error.png
diff --git a/modules/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/it.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/main.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/pt_br.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/ru.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/tr.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php b/datamodel/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php
similarity index 100%
rename from modules/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php
rename to datamodel/itop-knownerror-mgmt-1.0.0/zh.dict.itop-knownerror-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml b/datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml
rename to datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml
diff --git a/modules/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/de.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/es_cr.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/fr.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/hu.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/images/problem.png b/datamodel/itop-problem-mgmt-1.0.0/images/problem.png
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/images/problem.png
rename to datamodel/itop-problem-mgmt-1.0.0/images/problem.png
diff --git a/modules/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/it.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/ja.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/main.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/overview.html b/datamodel/itop-problem-mgmt-1.0.0/overview.html
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/overview.html
rename to datamodel/itop-problem-mgmt-1.0.0/overview.html
diff --git a/modules/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/pt_br.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/ru.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/tr.dict.itop-problem-mgmt.php
diff --git a/modules/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php b/datamodel/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php
similarity index 100%
rename from modules/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php
rename to datamodel/itop-problem-mgmt-1.0.0/zh.dict.itop-problem-mgmt.php
diff --git a/modules/itop-profiles-itil/module.itop-profiles-itil.php b/datamodel/itop-profiles-itil/module.itop-profiles-itil.php
similarity index 100%
rename from modules/itop-profiles-itil/module.itop-profiles-itil.php
rename to datamodel/itop-profiles-itil/module.itop-profiles-itil.php
diff --git a/modules/itop-request-mgmt-1.0.0/data.struct.ta-links.xml b/datamodel/itop-request-mgmt-1.0.0/data.struct.ta-links.xml
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/data.struct.ta-links.xml
rename to datamodel/itop-request-mgmt-1.0.0/data.struct.ta-links.xml
diff --git a/modules/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml b/datamodel/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml
rename to datamodel/itop-request-mgmt-1.0.0/data.struct.ta-triggers.xml
diff --git a/modules/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml b/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml
rename to datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml
diff --git a/modules/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/de.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/en.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/es_cr.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/fr.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/hu.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/images/user-request-closed.png b/datamodel/itop-request-mgmt-1.0.0/images/user-request-closed.png
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/images/user-request-closed.png
rename to datamodel/itop-request-mgmt-1.0.0/images/user-request-closed.png
diff --git a/modules/itop-request-mgmt-1.0.0/images/user-request-deadline.png b/datamodel/itop-request-mgmt-1.0.0/images/user-request-deadline.png
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/images/user-request-deadline.png
rename to datamodel/itop-request-mgmt-1.0.0/images/user-request-deadline.png
diff --git a/modules/itop-request-mgmt-1.0.0/images/user-request-escalated.png b/datamodel/itop-request-mgmt-1.0.0/images/user-request-escalated.png
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/images/user-request-escalated.png
rename to datamodel/itop-request-mgmt-1.0.0/images/user-request-escalated.png
diff --git a/modules/itop-request-mgmt-1.0.0/images/user-request.png b/datamodel/itop-request-mgmt-1.0.0/images/user-request.png
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/images/user-request.png
rename to datamodel/itop-request-mgmt-1.0.0/images/user-request.png
diff --git a/modules/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/it.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/ja.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/overview.html b/datamodel/itop-request-mgmt-1.0.0/overview.html
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/overview.html
rename to datamodel/itop-request-mgmt-1.0.0/overview.html
diff --git a/modules/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/pt_br.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/ru.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/tr.dict.itop-request-mgmt.php
diff --git a/modules/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php b/datamodel/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php
similarity index 100%
rename from modules/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php
rename to datamodel/itop-request-mgmt-1.0.0/zh.dict.itop-request-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/contract.png b/datamodel/itop-service-mgmt-1.0.0/contract.png
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/contract.png
rename to datamodel/itop-service-mgmt-1.0.0/contract.png
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.Contract.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.Contract.xml
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.SLA.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.SLA.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.SLA.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.SLA.xml
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.SLT.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.SLT.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.SLT.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.SLT.xml
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.Service.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.Service.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.Service.xml
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml b/datamodel/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml
rename to datamodel/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml
diff --git a/modules/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml b/datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml
rename to datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml
diff --git a/modules/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/es_cr.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/fr.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/hu.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/it.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/ja.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/main.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/overview.html b/datamodel/itop-service-mgmt-1.0.0/overview.html
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/overview.html
rename to datamodel/itop-service-mgmt-1.0.0/overview.html
diff --git a/modules/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/pt_br.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/ru.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/service.png b/datamodel/itop-service-mgmt-1.0.0/service.png
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/service.png
rename to datamodel/itop-service-mgmt-1.0.0/service.png
diff --git a/modules/itop-service-mgmt-1.0.0/sla.png b/datamodel/itop-service-mgmt-1.0.0/sla.png
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/sla.png
rename to datamodel/itop-service-mgmt-1.0.0/sla.png
diff --git a/modules/itop-service-mgmt-1.0.0/slt.png b/datamodel/itop-service-mgmt-1.0.0/slt.png
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/slt.png
rename to datamodel/itop-service-mgmt-1.0.0/slt.png
diff --git a/modules/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/tr.dict.itop-service-mgmt.php
diff --git a/modules/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php b/datamodel/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php
similarity index 100%
rename from modules/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php
rename to datamodel/itop-service-mgmt-1.0.0/zh.dict.itop-service-mgmt.php
diff --git a/modules/itop-sla-computation/en.dict.itop-sla-computation.php b/datamodel/itop-sla-computation/en.dict.itop-sla-computation.php
similarity index 100%
rename from modules/itop-sla-computation/en.dict.itop-sla-computation.php
rename to datamodel/itop-sla-computation/en.dict.itop-sla-computation.php
diff --git a/modules/itop-sla-computation/main.itop-sla-computation.php b/datamodel/itop-sla-computation/main.itop-sla-computation.php
similarity index 100%
rename from modules/itop-sla-computation/main.itop-sla-computation.php
rename to datamodel/itop-sla-computation/main.itop-sla-computation.php
diff --git a/modules/itop-sla-computation/module.itop-sla-computation.php b/datamodel/itop-sla-computation/module.itop-sla-computation.php
similarity index 100%
rename from modules/itop-sla-computation/module.itop-sla-computation.php
rename to datamodel/itop-sla-computation/module.itop-sla-computation.php
diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml b/datamodel/itop-tickets-1.0.0/data.struct.ta-actions.xml
similarity index 100%
rename from modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
rename to datamodel/itop-tickets-1.0.0/data.struct.ta-actions.xml
diff --git a/modules/itop-tickets-1.0.0/datamodel.itop-tickets.xml b/datamodel/itop-tickets-1.0.0/datamodel.itop-tickets.xml
similarity index 100%
rename from modules/itop-tickets-1.0.0/datamodel.itop-tickets.xml
rename to datamodel/itop-tickets-1.0.0/datamodel.itop-tickets.xml
diff --git a/modules/itop-tickets-1.0.0/de.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/de.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/de.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/de.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/en.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/en.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/en.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/en.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/es_cr.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/exclude.txt b/datamodel/itop-tickets-1.0.0/exclude.txt
similarity index 100%
rename from modules/itop-tickets-1.0.0/exclude.txt
rename to datamodel/itop-tickets-1.0.0/exclude.txt
diff --git a/modules/itop-tickets-1.0.0/export_triggers_actions.cmd b/datamodel/itop-tickets-1.0.0/export_triggers_actions.cmd
similarity index 100%
rename from modules/itop-tickets-1.0.0/export_triggers_actions.cmd
rename to datamodel/itop-tickets-1.0.0/export_triggers_actions.cmd
diff --git a/modules/itop-tickets-1.0.0/fr.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/fr.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/fr.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/fr.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/hu.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/hu.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/hu.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/hu.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/it.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/it.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/it.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/it.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/ja.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/ja.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/ja.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/ja.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/main.itop-tickets.php b/datamodel/itop-tickets-1.0.0/main.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/main.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/main.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/module.itop-tickets.php b/datamodel/itop-tickets-1.0.0/module.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/module.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/module.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/pt_br.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/ru.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/ru.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/ru.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/ru.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/tr.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/tr.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/tr.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/tr.dict.itop-tickets.php
diff --git a/modules/itop-tickets-1.0.0/zh.dict.itop-tickets.php b/datamodel/itop-tickets-1.0.0/zh.dict.itop-tickets.php
similarity index 100%
rename from modules/itop-tickets-1.0.0/zh.dict.itop-tickets.php
rename to datamodel/itop-tickets-1.0.0/zh.dict.itop-tickets.php
diff --git a/modules/itop-welcome-itil/main.itop-welcome-itil.php b/datamodel/itop-welcome-itil/main.itop-welcome-itil.php
similarity index 100%
rename from modules/itop-welcome-itil/main.itop-welcome-itil.php
rename to datamodel/itop-welcome-itil/main.itop-welcome-itil.php
diff --git a/modules/itop-welcome-itil/module.itop-welcome-itil.php b/datamodel/itop-welcome-itil/module.itop-welcome-itil.php
similarity index 100%
rename from modules/itop-welcome-itil/module.itop-welcome-itil.php
rename to datamodel/itop-welcome-itil/module.itop-welcome-itil.php
diff --git a/modules/itop-welcome-itil/welcome_menu.html b/datamodel/itop-welcome-itil/welcome_menu.html
similarity index 100%
rename from modules/itop-welcome-itil/welcome_menu.html
rename to datamodel/itop-welcome-itil/welcome_menu.html