diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 82dd64455db9a007802dabc852d2eb99a3072bb6..f92410dc6e452781251f2c741f9e2a4632626f17 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3001,6 +3001,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_CONTEXT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -3541,8 +3569,8 @@
                 <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -3646,6 +3674,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_CONTEXT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
index 7d0ae33708ceeb3ebe7cb1d2abfba943e2ab862b..9e9a4d6125d879ef8fdae6a6a34b2549ab017f47 100644
--- a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
+++ b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
@@ -1,17 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.1.8">
-  <name>_____SYSTEM_APPLICATION</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <entityNode name="_____SYSTEM_COMPANY" kind="200">
-    <node name="Group" kind="123" title="">
-      <node name="Group2" kind="123" title="">
-        <node name="Util_lib" kind="103" />
-        <node name="INTERNAL_ADMINISTRATOR" kind="159" />
-      </node>
-    </node>
-  </entityNode>
-  <company>
-    <name>company</name>
-    <backgroundColor v="0xff83cbd8" />
-  </company>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.1.8">
+  <name>_____SYSTEM_APPLICATION</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+  <company>
+    <name>company</name>
+    <backgroundColor v="0xff83cbd8" />
+  </company>
+</application>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c87bb1efc1619306e28b8fa5b550a04239efdafa..d3c741ac844494f461972cab8c0b16c468abdc50 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -279,6 +279,60 @@
       <searchable v="false" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
     </entityField>
+    <entityConsumer>
+      <name>ModuleTrees</name>
+      <title>Baum</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ModuleTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContextName</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>ID</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aktivität</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aufgabe</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>ParentId_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentid_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ParentContext_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>PARENT_ID</name>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_context/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -330,6 +384,14 @@
           <name>CREATOR.value</name>
           <recordfield>ACTIVITY.CREATOR</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+          <recordfield>ACTIVITY.PARENT_CONTEXT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+          <recordfield>ACTIVITY.PARENT_ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js b/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..109d9bf5c8ea2825f9da796529721deab9a96d9f
--- /dev/null
+++ b/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Activity");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/moduletrees/children/id/code.js b/entity/Activity_entity/entityfields/moduletrees/children/id/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..06fe7d36324315ad85bfd6d0099c5aa6b2da98d4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/moduletrees/children/id/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js b/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..39352aaa738090de2afb9e23b20d769ab3da2c9e
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.ACTIVITYID"),
+  "ParentContext_param": "Activity"
+};
+
+neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js b/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9417c7e293f407d60d36e775d581f8887d582633
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.ACTIVITYID"),
+  "ParentContext_param": "Activity"
+};
+
+neon.openContext("Task", "TaskEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/parent_context/valueProcess.js b/entity/Activity_entity/entityfields/parent_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..348cc486cbe308a212dab0374b6e3fad11cba07d
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parent_context/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ParentContext_param"));
diff --git a/entity/Activity_entity/entityfields/parent_id/valueProcess.js b/entity/Activity_entity/entityfields/parent_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ee2e311077e9a265cb4dcc8429ed2beee9f3fc4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parent_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ParentId_param"));
diff --git a/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc b/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d2438f42033bbf4ef941406a062b8e671852c462
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc
@@ -0,0 +1,3 @@
+Describes the name of the parent element's context name. 
+This parameter is used to link a new activity to an existing.
+(Also see `ParentId_param`)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/parentid_param/documentation.adoc b/entity/Activity_entity/entityfields/parentid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..06e595d64fc0592edf8102f6fde9cc7c913a542c
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parentid_param/documentation.adoc
@@ -0,0 +1,3 @@
+Describes the ID of the parent element's context name. 
+This parameter is used to link a new activity to an existing.
+(Also see `ParentContextName_param`)
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index c13c98c8e85d98a9ec58064b1ce447edbd77fca9..e014c096bd5a961e40db0b8f38e6fd74e664adaf 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -59,6 +59,12 @@
           <fieldName>AttributeChildren</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>ba8046ba-f58c-48f1-9c35-fe897247534a</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Attributes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 3032d15a7f9cfa12ed50a252ae4551ceadb4e0da..19200a77d9fa5e23d745fab789b98709c7f8c658 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -23,6 +23,7 @@
       <title>Type</title>
       <consumer>KeywordAttributeType</consumer>
       <mandatory v="true" />
+      <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
     </entityField>
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b768fb2fba7336e45a6e5c99d6224d9e623d4e5b
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+{
+    var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
+    if (type == $AttributeTypes.COMBO)
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index 1a5a7ef8aa7f0828ba0791f1ea8a2acd3e99f354..bdd0ea7449ed0bd35470a8ac8dffb388034951c6 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -7,24 +7,8 @@ import("Attribute_lib");
 var condition = "AB_ATTRIBUTE.ATTRIBUTE_TYPE = '" + $AttributeTypes.GROUP + "'";
 
 if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
-    condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
+    condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
 else if (vars.get("$param.attrParentId_param") !== "")
     condition = "";
 
 result.string(condition);
-
-function getAllChildren (pAttributeId)
-{
-    var childIds = [];
-    var attributes= [pAttributeId];
-    while (attributes.length > 0)
-    {
-        attributes = db.array(db.COLUMN, SqlCondition.begin()
-            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
-            .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
-        );
-        if (attributes.length > 0)
-            childIds = childIds.concat(attributes);
-    }
-    return childIds;
-}
diff --git a/entity/Attribute_entity/recordcontainers/db/onDBDelete.js b/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
index 504e2d5e4f82c9ccbdeb7b380f546003c3f5f9a8..7d1eb8b477436101b8cacb2fa7aa00241708adae 100644
--- a/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
@@ -1,11 +1,29 @@
 import("system.vars");
 import("system.db");
 import("Sql_lib");
+import("Attribute_lib");
 
 var attributeId = vars.get("$field.AB_ATTRIBUTEID");
-var usageCondition = SqlCondition.begin()
-    .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId)
+
+var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
+
+var condition = SqlCondition.begin()
+    .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
     .build();
 
 //delete all entries in AB_ATTRIBUTEUSAGE belonging to the attribute to avoid unrelated entries
-db.deleteData("AB_ATTRIBUTEUSAGE", usageCondition);
\ No newline at end of file
+db.deleteData("AB_ATTRIBUTEUSAGE", condition);
+
+condition = SqlCondition.begin()
+    .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+    .build();
+
+//delete all entries in AB_ATTRIBUTERELATION for the attributes
+db.deleteData("AB_ATTRIBUTERELATION", condition);
+
+condition = SqlCondition.begin()
+    .and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + childIds.join("','") + "')")
+    .build();
+
+//delete all attribute children
+db.deleteData("AB_ATTRIBUTE", condition);
diff --git a/entity/Communication_entity/entityfields/communicationid/valueProcess.js b/entity/Communication_entity/entityfields/communicationid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..86ef789e064a4016f2d12c432498dc23474807aa
--- /dev/null
+++ b/entity/Communication_entity/entityfields/communicationid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 26a3cc11148f4c3ba051ee2c16769f3199f9af9c..e1079bb8c8e2765881abf59cddf9d4dcee1d8f8d 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -92,6 +92,7 @@
       <name>db</name>
       <alias>Data_alias</alias>
       <conditionProcess>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <onDBDelete>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
           <name>bd113d67-34ab-4708-b0e5-60a44332e6b8</name>
diff --git a/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js b/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..106ba3d52cf62b33fe39087d4a893ea7821b9462
--- /dev/null
+++ b/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,5 @@
+import("Sql_lib");
+import("system.db");
+
+var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", "$field.AB_KEYWORD_ATTRIBUTEID").build("1=2");
+db.deleteData("AB_KEYWORD_ATTRIBUTERELATION", cond);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 97125bb8039cdfc95b82b1a17c2dc1f1e9d0d198..5460a7848abff474a7e42230bd91080ef97f3c21 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -22,6 +22,8 @@
       <mandatory v="true" />
       <possibleItemsProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/possibleItemsProcess.js</possibleItemsProcess>
       <groupable v="true" />
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
     </entityField>
     <entityField>
       <name>AB_KEYWORD_ENTRYID</name>
@@ -30,10 +32,13 @@
     </entityField>
     <entityField>
       <name>KEYID</name>
+      <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
       <title>Key</title>
+      <mandatory v="true" />
       <state>READONLY</state>
       <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>TITLE</name>
@@ -294,7 +299,7 @@
       <alias>Data_alias</alias>
       <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
-      <onDBUpdate>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
           <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
diff --git a/entity/KeywordEntry_entity/entityfields/container/documentation.adoc b/entity/KeywordEntry_entity/entityfields/container/documentation.adoc
index b46aaac93ed420d5150d4d5202dc302a4898ca70..e1cfb215ac798637843c387c914479f4428e301a 100644
--- a/entity/KeywordEntry_entity/entityfields/container/documentation.adoc
+++ b/entity/KeywordEntry_entity/entityfields/container/documentation.adoc
@@ -1 +1,2 @@
- `CONTAINER` is the a name and used for grouping keyword-entries. This is was a keyword-container essentially is.
\ No newline at end of file
+ `CONTAINER` is the a name and used for grouping keyword-entries. This is was a keyword-container essentially is.
+After creation of an entry it cannot be changed anymore.
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/container/stateProcess.js b/entity/KeywordEntry_entity/entityfields/container/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82fc64847e6ac4e59a674fac7873eef6161aa741
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/container/stateProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+/*allowing the CONTAINER to change later would result in a lot of problems like
+ * - what happens to SORTING-value?
+ * - what happens with already created keyword-attributerelations?
+ * - what happens when a key is specified twice after the change?
+ * - what happens when the keywordentry has been already used?
+ * 
+ * Therefore just forbid to change it after the record has been inserted
+ */
+var fieldState;
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    fieldState = neon.COMPONENTSTATE_AUTO;
+else
+    fieldState = neon.COMPONENTSTATE_READONLY;
+
+result.string(fieldState);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc b/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..543e079982a272d1ea3414231414004150915df5
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc
@@ -0,0 +1,7 @@
+The key of an keyword-entry is a internal, technical representation which is stored in references.
+It's unique within a keyword-container but not within the whole keyword-module (like the `AB_KEYWORD_ENTRYID` is).
+
+A UUID is generated and used as preset-value but it's possible to overwrite the `KEYID` with an own value (as long as the custom key follows the rules, like keyword-entry-level-uniqueness)
+This could for example be ISO-standardised value or a value that is maintained within an ERP-system.
+
+After creation of an entry it cannot be changed anymore.
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js b/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..a0830f5196463702be757aa76d46e9b3d3c1c8f4
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js
@@ -0,0 +1,26 @@
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+import("Entity_lib");
+
+var container = vars.get("$field.CONTAINER");
+var keyId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.KEYID")).trim();
+
+//a KEY has always to be unique within one container and since the user can specify the key on insert we've to ensure that it's unique
+if (container && keyId)
+{
+    var selfEntryId = vars.get("$field.AB_KEYWORD_ENTRYID");
+    var sqlMasks = new SqlMaskingUtils();
+    var alreadyExistsSql = SqlCondition.begin()
+                                        .andPrepare(sqlMasks.trim("AB_KEYWORD_ENTRY.KEYID"), keyId, null, SqlUtils.getSingleColumnType("AB_KEYWORD_ENTRY", "KEYID"))
+                                        .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", container)
+                                        .andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", selfEntryId, "# != ?")
+                                        .buildSql("select AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID from AB_KEYWORD_ENTRY");
+    var alreadyExistantEntryId = db.cell(alreadyExistsSql);
+    
+    if (alreadyExistantEntryId != "")
+        result.string(translate.text("the specified key has to be unique for that container but does already exist"));
+    
+}
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js b/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js
index 4af99287f59a86e98d9b4c552c010fe13c106cc7..2fc41228ab188dc70af71478adb1d1afd7c1cb77 100644
--- a/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js
+++ b/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
     result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js b/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..5770e446a9d339b5e4aa822f225fa0d36bd3a4ac
--- /dev/null
+++ b/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,5 @@
+import("Sql_lib");
+import("system.db");
+
+var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID", "$field.AB_KEYWORD_ENTRYID").build("1=2");
+db.deleteData("AB_KEYWORD_ATTRIBUTERELATION", cond);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js b/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js
deleted file mode 100644
index d9f8978acd6592e20a2851d1e46b490b2ff398d7..0000000000000000000000000000000000000000
--- a/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.vars");
-import("system.text");
-import("system.neon");
-import("Sql_lib");
-
-var changedFields = vars.get("$local.changed");
-//whenever the container is changed data that depends on the keyword-container has be "fixed" to keep consistency
-//this could be information like Keyword-attributes or the sorting-position
-// TODO: maybe it'd be better to lock KeywordContainer as read-only after creation
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && changedFields.indexOf("AB_KEYWORD_ENTRY.CONTAINER") > -1)
-{
-    var keyContainer = vars.get("$field.CONTAINER");
-    if (keyContainer)
-    {
-        var cond = SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.CONTAINER", keyContainer);
-        var maskingHelper = new SqlMaskingUtils();
-        var newCodeNumber = db.cell(cond.buildSql("select " + maskingHelper.max("AB_KEYWORD_ENTRY.SORTING") + " from AB_KEYWORD_ENTRY", "1 = 2"));
-        newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
-        if (isNaN(newCodeNumber))
-            throw new TypeError(translate.text("The code number is not a valid number."));
-
-        var cols = ["SORTING"];
-        var vals = [++newCodeNumber];
-        cond.clear().andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", vars.get("$sys.uid"));
-        db.updateData("AB_KEYWORD_ENTRY", cols, null, vals, cond.build("1 = 2"));
-    }
-}
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c23de7614329146b8b129bfad95aa7d62c621064
--- /dev/null
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
+  <name>ModuleTree_entity</name>
+  <title>Tree Entity</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>TITLE</name>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+    </entityField>
+    <entityProvider>
+      <name>TreeProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TYPE</targetContextField>
+      <targetIdField>UID</targetIdField>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ModuleTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>ModuleTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>PARENT_ID</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+    </entityField>
+    <entityParameter>
+      <name>ContextName</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ID</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TYPE.value</element>
+        <element>PARENT_ID.value</element>
+        <element>PARENT_CONTEXT.value</element>
+        <element>TITLE.value</element>
+        <element>DESCRIPTION.value</element>
+        <element>ICON.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0710ff8b81a8f85eb8b3f0e9bfa4974574fb74dc
--- /dev/null
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,133 @@
+import("system.vars");
+import("Sql_lib")
+import("system.result");
+import("system.db");
+
+var fixedContextName = vars.get("$param.ContextName");
+var fixedID = vars.get("$param.ID");
+
+let resArray = [];
+
+// Query root element
+var root = queryRootElement(fixedContextName, fixedID);
+if (root !== null) {
+    // Push root element
+    resArray.push(root);
+
+    // Query children of root
+    var children = queryChildrenElements(fixedContextName, fixedID);
+    
+    if (children !== null) {
+     
+       // Push each children
+       for(let i = 0; i < children.length; i++) {
+           resArray.push(children[i]);
+       }
+
+       result.object(resArray);
+    }
+}
+
+/**
+ * Queries the children of the given parent element.
+ * This function will recursively go through each level of children.
+ * 
+ * @param pContextName Context name of the parent element.
+ * @param pID ID of the parent element.
+ */
+function queryChildrenElements (pContextName, pID) {
+    var taskResult = db.table("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where PARENT_ID = '" + pID +"' and PARENT_CONTEXT = '" + pContextName + "'");
+    var activityResult = db.table("select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where PARENT_ID = '" + pID +"' and PARENT_CONTEXT = '" + pContextName + "'");
+  
+    var res = []
+  
+    for (let i = 0; i < taskResult.length; i++) {
+        // Augment data
+        taskResult[i] = augmentData(taskResult[i], "Task");
+        res.push(taskResult[i]);
+        
+        // Query children
+        let children = queryChildrenElements("Task", taskResult[i][0]);
+        for (let i = 0; i < children.length; i++) {
+            res.push(children[i]);
+        }
+    }
+    
+    for (let i = 0; i < activityResult.length; i++) {
+        // Augment data
+        activityResult[i] = augmentData(activityResult[i], "Activity");
+        res.push(activityResult[i]);
+        
+        // Query children
+        let children = queryChildrenElements("Activity", activityResult[i][0]);
+        for (let i = 0; i < children.length; i++) {
+            res.push(children[i]);
+        }
+    }
+      
+    return res;
+}
+
+/**
+ * Queries the root element.
+ * 
+ * @param pContextName Context name of the root element.
+ * @param pID ID of the root element.
+ */
+function queryRootElement (pContextName, pID) {
+    var resultArray;
+    if (pContextName === "Task") {
+        resultArray = db.table("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where TASKID = '" + pID + "'");
+        if (resultArray.length === 0) {
+            return null;
+        }
+        
+        return augmentData(resultArray[0], "Task");
+    } else if (pContextName === "Activity") {
+        resultArray = db.table("select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where ACTIVITYID = '" + pID +"'");
+        if (resultArray.length === 0) {
+            return null;
+        }
+        
+        return augmentData(resultArray[0], "Activity");
+    } else {
+        return null;
+    }
+}
+
+/**
+ * Augments the given row to match the required result signature.
+ * 
+ * @param pDataRow Requires the following format:
+ *                 UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION
+ * @param pType The type of the row which needs adjustment.
+ * @return Returns the following format:
+ *         UID, TYPE, PARENT_ID, PARENT_CONTEX, TITL, DESCRIPTION, ICON
+ * 
+ */
+function augmentData (pDataRow, pType) {
+    if (pDataRow === null || pDataRow === undefined)
+        return null;
+    
+    if (pDataRow.length === 0)
+        return null;
+    
+    if (pType !== "Task" && pType !== "Activity")
+        return null;
+    
+    // PARENT_ID check
+    if (pDataRow[2] === "")
+        pDataRow[2] = null;
+    
+    // PARENT_CONTEXT check
+    if (pDataRow[3] === "")
+        pDataRow[3] = null;
+    
+    // Insert type
+    pDataRow.splice(1, 0, pType);
+    
+    // Insert icon
+    pDataRow.splice(6, 0, pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "NEON:HISTORY": null);
+    
+    return pDataRow;
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 5a3be8bc441a7c7be97e56d8618a0b407e0761b8..7962870d76d7b67f7f3d91d16bb3a4a301c3cc2d 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -40,7 +40,9 @@
       <linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js</linkedContextProcess>
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js</stateProcess>
+      <titleProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js</titleProcess>
       <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>OBJECT2_TYPE</name>
@@ -153,6 +155,14 @@
       <targetIdField>OBJECT2_ROWID</targetIdField>
       <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/bothobjects/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>cb49ee3d-4497-4edc-90b6-82d397464f75</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>TaskObjectRelations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
       <children>
         <entityParameter>
           <name>AnyObjectRowid_param</name>
@@ -165,7 +175,7 @@
         <entityParameter>
           <name>Object1Rowid_param</name>
           <expose v="true" />
-          <mandatory v="true" />
+          <mandatory v="false" />
         </entityParameter>
         <entityParameter>
           <name>Object1Type_param</name>
@@ -175,7 +185,7 @@
         <entityParameter>
           <name>Object2Rowid_param</name>
           <expose v="true" />
-          <mandatory v="true" />
+          <mandatory v="false" />
         </entityParameter>
         <entityParameter>
           <name>Object2Type_param</name>
@@ -323,6 +333,14 @@
       <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js</displayValueProcess>
     </entityField>
+    <entityParameter>
+      <name>Object2RowidTitle_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>EMPTY</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..04cbd7a32102a5efd583a0af62b1ce46ecebdbb7
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js
@@ -0,0 +1,14 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Context_lib");
+
+var recordstate = vars.get("$sys.recordstate");
+if (recordstate == neon.OPERATINGSTATE_EDIT)
+{
+    if (vars.exists("$field.OBJECT1_ROWID") && vars.get("$field.OBJECT1_ROWID") && vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
+    {
+        result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))));
+    }
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc39a528c34c8e610d4f6f53ea6f83b98699f497
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("Context_lib");
+result.string(vars.exists("$param.Object2RowidTitle_param") ? vars.get("$param.Object2RowidTitle_param") : "Object 2");
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 003c2e6a3c7811c6426ca9afdf74c250ab58adae..cba3010100ed198c433c1a2f516d8a2bd7e7ed8c 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -15,6 +15,8 @@
       <name>CURRENCY</name>
       <title>Currency</title>
       <consumer>KeywordCurrencies</consumer>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>OFFERCODE</name>
@@ -87,6 +89,7 @@
       <name>HEADER</name>
       <title>Cover letter</title>
       <contentType>HTML</contentType>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>Offeritems</name>
@@ -181,12 +184,14 @@
       <title>Language</title>
       <consumer>Languages</consumer>
       <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityActionField>
-      <name>newOffer</name>
+      <name>copyOffer</name>
       <fieldType>ACTION</fieldType>
       <title>Copy offer</title>
-      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+      <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
     </entityActionField>
     <entityField>
       <name>VERSNR</name>
@@ -198,6 +203,7 @@
     <entityField>
       <name>OFFER_ID</name>
       <documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_id/valueProcess.js</valueProcess>
     </entityField>
     <entityFieldGroup>
       <name>OfferCode_VersNr_fieldgroup</name>
@@ -314,6 +320,7 @@
       <description></description>
       <contentType>LONG_TEXT</contentType>
       <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/address/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ChosenAddress</name>
@@ -418,6 +425,55 @@
         </entityParameter>
       </children>
     </entityProvider>
+    <entityParameter>
+      <name>OfferCurrency_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferLanguage_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferHeader_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferOriginal_Id_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferAddress_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferCode_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>OfferVersnr_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <mandatory v="false" />
+      <description>PARAMETER</description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -426,6 +482,7 @@
       <maximumDbRows v="0" />
       <fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
diff --git a/entity/Offer_entity/entityfields/address/valueProcess.js b/entity/Offer_entity/entityfields/address/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..160f9518edab8b5ed593d921661aada906512ee4
--- /dev/null
+++ b/entity/Offer_entity/entityfields/address/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferAddress_param")) 
+{
+    result.string(vars.get("$param.OfferAddress_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4957b1ff844fb074b3ffd05533d1e75377f5b96d
--- /dev/null
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.neon");
+import("Offer_lib");
+
+var contactId = vars.getString("$field.CONTACT_ID");
+var currency = vars.getString("$field.CURRENCY");
+var language = vars.getString("$field.LANGUAGE");
+var header = vars.getString("$field.HEADER");
+var offerId = vars.getString("$field.OFFERID");
+
+OfferUtils.copyOffer(offerId, contactId, language, currency, header);
+    
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..251895de0caa384e595ac12282df6a3955093b04
--- /dev/null
+++ b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) 
+{
+    var currency = KeywordUtils.getViewValue($KeywordRegistry.get.Currency, vars.get("$param.OfferCurrency_param"));
+    result.string(currency);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currency/valueProcess.js b/entity/Offer_entity/entityfields/currency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..636be1adc9a7505eea4d957860d46a81856f5a93
--- /dev/null
+++ b/entity/Offer_entity/entityfields/currency/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")) 
+{
+    result.string(vars.get("$param.OfferCurrency_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1dd2bbc6e368ccd25f363f47e8e86f6abceaa55
--- /dev/null
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param")) 
+{
+    result.string(vars.get("$param.OfferHeader_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/language/displayValueProcess.js b/entity/Offer_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..987df7556fbe55afa0152a52e1e8d4c766b4ce39
--- /dev/null
+++ b/entity/Offer_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,15 @@
+import("system.db");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param")) 
+{
+    var iso3 = vars.get("$param.OfferLanguage_param");
+    var latinName = db.cell(SqlCondition.begin()
+        .andPrepare("AB_LANGUAGE.ISO3", iso3)
+        .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=0"));
+    latinName = translate.text(latinName);
+    result.string(latinName);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/language/valueProcess.js b/entity/Offer_entity/entityfields/language/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4fc924e18219f6a6b30f4b3ebb8ffb22d8ed3cb0
--- /dev/null
+++ b/entity/Offer_entity/entityfields/language/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param")) 
+{
+    result.string(vars.get("$param.OfferLanguage_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
deleted file mode 100644
index 1991c7036f76bc53bdb6c9ce2b6abe508001a7a1..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("Util_lib");
-import("Neon_lib");
-import("Offer_lib");
-
-var InputMapping = {
-    
-    "OFFER": {
-            condition: "OFFERID = '" + vars.get("$field.OFFERID") + "'"
-            , ValueMapping: {
-                            "OFFER_ID": ""
-                            , "OFFERCODE":  OfferUtils.getNextOfferNumber()
-                            , "VERSNR": "1"
-                        }
-            , SubModules:{
-                "OFFERITEM": {
-                    condition: "OFFER_ID = '" + vars.get("$field.OFFERID") + "' order by ITEMSORT" 
-            }
-        }
-    }
-}
-
-var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
-
-CopyModuleUtils.openNewModules("Offer", ModulesMapping);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index 0a83f6827223845ef954c036bf5d99866118fe5e..add48fbf11814bdf125f71afc331b9957afa4172 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -1,26 +1,16 @@
 import("system.vars");
 import("system.neon");
-import("Util_lib");
-import("Neon_lib");
 import("Offer_lib");
 
-var InputMapping = {
-    
-    "OFFER": {
-            condition: "OFFERID = '" + vars.get("$field.OFFERID") + "'"
-            , ValueMapping: {
-                            "OFFER_ID": vars.get("$field.OFFERID")
-                            , "OFFERCODE":  vars.get("$field.OFFERCODE")
-                            , "VERSNR":  OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE"))
-                        }
-            , SubModules:{
-                "OFFERITEM": {
-                    condition: "OFFER_ID = '" + vars.get("$field.OFFERID") + "' order by ITEMSORT" 
-            }
-        }
-    }
+var params = {
+    "ContactId_param" : vars.get("$field.CONTACT_ID"),
+    "SalesprojectId_param" : vars.get("$field.SALESPROJECT_ID"),
+    "OfferLanguage_param" : vars.get("$field.LANGUAGE"),
+    "OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
+    "OfferCode_param" : vars.get("$field.OFFERCODE"),
+    "OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
+    "OfferCurrency_param" : vars.get("$field.CURRENCY"),
+    "OfferAddress_param" : vars.get("$field.ADDRESS"),
+    "OfferHeader_param" : vars.get("$field.HEADER")
 }
-
-var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
-
-CopyModuleUtils.openNewModules("Offer", ModulesMapping);
\ No newline at end of file
+neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offer_id/valueProcess.js b/entity/Offer_entity/entityfields/offer_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Offer_entity/entityfields/offercode/onValidation.js b/entity/Offer_entity/entityfields/offercode/onValidation.js
index de949a3e766bbf81de26ee22689c4808a7faae44..3b9c0b76f65fa2b8ae4026d17b1e78d5197d919f 100644
--- a/entity/Offer_entity/entityfields/offercode/onValidation.js
+++ b/entity/Offer_entity/entityfields/offercode/onValidation.js
@@ -6,7 +6,8 @@ import("Salesproject_lib");
 import("Util_lib");
 import("Entity_lib");
 
-if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+    && !vars.exists("$param.OfferCode_param")
     && !OfferUtils.validateOfferNumber(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.OFFERCODE"))) )
 {
     vars.set( "$field.OFFERCODE", OfferUtils.getNextOfferNumber().toString() );
diff --git a/entity/Offer_entity/entityfields/offercode/valueProcess.js b/entity/Offer_entity/entityfields/offercode/valueProcess.js
index 933257e8cc871bfd2d5cb0be92049e55ea93a2b8..502b44731b281c7fc79094de58242869d07e423d 100644
--- a/entity/Offer_entity/entityfields/offercode/valueProcess.js
+++ b/entity/Offer_entity/entityfields/offercode/valueProcess.js
@@ -4,6 +4,9 @@ import("system.neon");
 import("Offer_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{    
-    result.string(OfferUtils.getNextOfferNumber());
+{
+    if (vars.exists("$param.OfferCode_param") && vars.get("$param.OfferCode_param"))
+        result.string(vars.get("$param.OfferCode_param"));
+    else
+        result.string(OfferUtils.getNextOfferNumber());
 }
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/versnr/valueProcess.js b/entity/Offer_entity/entityfields/versnr/valueProcess.js
index f3ad73d05605a0009779e02d2767edba66fe2189..5d3797b77b0fc1e83590585de35fa636da9962aa 100644
--- a/entity/Offer_entity/entityfields/versnr/valueProcess.js
+++ b/entity/Offer_entity/entityfields/versnr/valueProcess.js
@@ -5,5 +5,8 @@ import("Offer_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    result.string( "1" );
+    if (vars.exists("$param.OfferVersnr_param") && vars.get("$param.OfferVersnr_param"))
+        result.string(vars.get("$param.OfferVersnr_param"));
+    else
+        result.string( "1" );
 }
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b3c4033a05890bdd874ce4fa610333b06fdc538
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("Offer_lib");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
+    OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFERID"));
diff --git a/entity/Order_entity/entityfields/currency/displayValueProcess.js b/entity/Order_entity/entityfields/currency/displayValueProcess.js
index 6be00b937833451cf3146a6c30d09c46980cf840..2519786ebebdab4dd7112825bf47108ea7110ead 100644
--- a/entity/Order_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/currency/displayValueProcess.js
@@ -1,5 +1,3 @@
-import("system.db");
-import("system.translate");
 import("system.result");
 import("system.vars");
 import("Keyword_lib");
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 9162c9654de9ae11fc8509b929d8f764d7497db5..c479324ec12198fed69af55498a8f6bc10d18342 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -235,10 +235,6 @@
           <name>ASSIGNEDTO.value</name>
           <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DESCRIPTION.value</name>
-          <recordfield>SALESORDERITEM.DESCRIPTION</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DISCOUNT.value</name>
           <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
@@ -303,6 +299,10 @@
           <name>PRODUCT_ID.displayValue</name>
           <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>INFO.value</name>
+          <recordfield>SALESORDERITEM.INFO</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 844a65942f92a6089f1c7a5197d1065a0a1311d1..2c01c9e912c5329aafa66b08f07e49672f7d733d 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -476,6 +476,57 @@
         <fieldName>LanguagesISO3Code</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>Salesprojects</name>
+      <title>Salesprojects</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Salesproject_entity</entityName>
+        <fieldName>Salesprojects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newTask</name>
+      <fieldType>ACTION</fieldType>
+      <title>New task</title>
+      <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:TASKS</iconId>
+    </entityActionField>
+    <entityConsumer>
+      <name>TaskObjectRelations</name>
+      <title>Tasks</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectRelation_entity</entityName>
+        <fieldName>BothObjects</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Object1Rowid_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>Object1Type_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>Object2Type_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>Object2RowidTitle_param</name>
+          <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -486,14 +537,14 @@
       <onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
       <linkInformation>
         <linkInformation>
-          <name>ff0fa64f-4d73-49b3-bc02-02018392e838</name>
+          <name>47c6c065-ae0e-4cee-b913-335570e3221c</name>
           <tableName>ORGANISATION</tableName>
           <primaryKey>ORGANISATIONID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>e3033b6f-966e-415a-9390-c61d5a1b19fc</name>
+          <name>e6120ee7-e6c3-4f60-9327-417627ba1fac</name>
           <tableName>CONTACT</tableName>
           <primaryKey>CONTACTID</primaryKey>
           <isUIDTable v="false" />
diff --git a/entity/Organisation_entity/entityfields/newtask/onActionProcess.js b/entity/Organisation_entity/entityfields/newtask/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..184aba3ab162e889d040c46a76c62f651e982d86
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/newtask/onActionProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.neon");
+import("Context_lib");
+
+var params = {};
+params["ObjectType_param"] = ContextUtils.getCurrentContextId();
+params["RowId_param"] = vars.get("$field.ORGANISATIONID");
+neon.openContext("Task", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js b/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..835140d0bee877176a6fd5a8e94460e5b5e776d1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..bcfda44fe71eac93b3f8c11cc0c85a496f2cd51c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e273ebaf0d31de77e8d77836146eeb81503ed474
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js
@@ -0,0 +1,3 @@
+import("system.translate");
+import("system.result");
+result.string(translate.text("Task"))
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..86bf9bdfc95f2757f6ee947b7549edad4ce0b154
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Task");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index d3bf5b0f9c4b5cfba5bbf4962a205e425c2d1e39..5670b1cf170b95644959a18c467cbb0853c025ea 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -43,6 +43,8 @@
     <entityField>
       <name>SALUTATION</name>
       <title>Salutation</title>
+      <mandatory v="true" />
+      <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
     <entityField>
       <name>TITLE</name>
@@ -186,6 +188,11 @@
           <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
 Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
+        <entityParameter>
+          <name>CommCategory_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/communications/children/commcategory_param/code.js</code>
+          <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
@@ -524,6 +531,29 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>Attributes</name>
+      <title>Attributes</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>AttributeRelation_entity</entityName>
+        <fieldName>RelationsForSpecificObject</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>objectRowId_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+          <expose v="true" />
+          <triggerRecalculation v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>objectType_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js</code>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee0cddc370f78c08084b64d57e2a36686aad1e82
--- /dev/null
+++ b/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PERSONID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/communications/children/commcategory_param/code.js b/entity/Person_entity/entityfields/communications/children/commcategory_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
index e7afa1485396900885b2a74453df003aa2869337..f8e59e680f629617e444c405a8e6e42c2997c901 100644
--- a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -1,3 +1,3 @@
 import("system.vars");
 import("system.neon");
-neon.openContext("Person", "ContactEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
+neon.openContext("Person", "PersonEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..935c4ef90bfcfae64a38388e2c0c9a44cbec9da2
--- /dev/null
+++ b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object([["Frau", "Frau"], ["Herr", "Herr"]])
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js b/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
index f165ed8fa18606a2080496441041fe5a39a06d59..ee62dca4c5b6641758a1ce2856db770d63641278 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,3 @@
 import("Salesproject_lib");
 
-notifyToUpdateForecast()
\ No newline at end of file
+Salesproject.notifyToUpdateForecast()
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 4c9d02d7b10ceee9d253702cc0069e1efab66c76..7bcd55845a690a27069d3f692ba3141545d364dc 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -301,6 +301,7 @@
       <description>the total hours of all time trackings related to the salesproject</description>
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>IMAGE</name>
@@ -387,9 +388,29 @@
     <entityField>
       <name>DAYS_NOTACTIVE</name>
       <title>Days inactive</title>
+      <contentType>NUMBER</contentType>
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js</valueProcess>
     </entityField>
+    <entityProvider>
+      <name>Salesprojects</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>Salesprojects</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="true" />
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js b/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bfe42a40a4a4811369dc8073130dc00b96032782
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.TIMETRACKINGSUM"))));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js b/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js
index e3ef6877942e157abdbd49460716516416b058d0..83c88895a0224ff240ea0dfbaf5b68249efffe8d 100644
--- a/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js
@@ -1,10 +1,5 @@
-import("system.text");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Timetracking_lib");
-
-var hrs = Timetracking.getTotalTrackingTime(vars.getString("$field.SALESPROJECTID")) / 60;
-hrs = text.formatDouble(hrs, "0.00");
-
-result.string(hrs + " " + translate.text("hrs"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.getTotalTrackingTime(vars.getString("$field.SALESPROJECTID")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index c5ae703c9e1ee768bc4f56bfcbdc6290871d04f6..222926e7c12d2e84a2f409dd5b6698a8bbbf4c87 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -15,7 +15,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
             fieldVar = "$field.STATE";
             break;
     }
-        
+
     if (typeValue) {
         Salesproject.insertMilestone(vars.getString("$field.SALESPROJECTID"), typeValue, vars.getString(fieldVar), true);
     }
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 4e792a2decaf645afe88c4b7bd2b120eea618036..f44e1b225807c52a2803e631d35ab5e81856d732 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -11,6 +11,7 @@
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
+      <recordContainer>db</recordContainer>
     </entityProvider>
     <entityField>
       <name>CODE</name>
@@ -18,9 +19,7 @@
       <title>task number</title>
       <contentType>NUMBER</contentType>
       <outputFormat>0000000</outputFormat>
-      <state>READONLY</state>
-      <stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/code/valueProcess.js</valueProcess>
+      <state>DISABLED</state>
     </entityField>
     <entityField>
       <name>SUBJECT</name>
@@ -77,7 +76,9 @@
       <name>TYPE</name>
       <title>type</title>
       <consumer>KeywordTypes</consumer>
-      <groupable v="true" />
+      <searchable v="false" />
+      <groupable v="false" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DESCRIPTION</name>
@@ -170,12 +171,76 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>ModuleTrees</name>
+      <title>Baum</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ModuleTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ID</name>
+          <code>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id/code.js</code>
+          <description>PARAMETER</description>
+        </entityParameter>
+        <entityParameter>
+          <name>ContextName</name>
+          <code>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT_ID</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ParentId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ParentContext_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>newActivity_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aktivität</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aufgabe</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>RowId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
       <orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBInsert>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <linkInformation>
         <linkInformation>
           <name>47e1b4a5-6901-48b0-85ba-bec39b86a2d7</name>
@@ -250,6 +315,14 @@
           <name>STATUS.displayValue</name>
           <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+          <recordfield>TASK.PARENT_CONTEXT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+          <recordfield>TASK.PARENT_ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Task_entity/entityfields/code/documentation.adoc b/entity/Task_entity/entityfields/code/documentation.adoc
index 418cfa22905051736503922471bcb74502b2508d..23f0e1f5074bd4a70aab2155d98e0127d0430ddc 100644
--- a/entity/Task_entity/entityfields/code/documentation.adoc
+++ b/entity/Task_entity/entityfields/code/documentation.adoc
@@ -1,3 +1 @@
-The `CODE` field is a automatically increased sequential number. 
-It cannot be set by the user.
-Therefore it's only visible after creation of a `TASK` record.
\ No newline at end of file
+The `CODE` field is reserved for future implementations. It's in no view and does not store any value or has any other interaction.
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/stateProcess.js b/entity/Task_entity/entityfields/code/stateProcess.js
deleted file mode 100644
index 3104b5b489485ec14165fc219df0850b233f9827..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/code/stateProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-//the code (tasknumber) value is genereated before save to prevent duplicate numbers
-//so: no need to display it on new
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
-else
-    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/valueProcess.js b/entity/Task_entity/entityfields/code/valueProcess.js
deleted file mode 100644
index 7175621de3beecb887b38e37d160d505af2b2c42..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/code/valueProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("system.logging");
-import("system.neon");
-import("system.db");
-import("system.vars");
-import("Sql_lib");
-
-
-//if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-//{
-//    var maskingHelper = new SqlMaskingUtils();
-//    var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
-//    newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
-//    if (isNaN(newCodeNumber))
-//        throw new TypeError();//TODO:add Message
-//    ++newCodeNumber;
-//    logging.log("newCodeNumber: " + newCodeNumber)
-//    vars.set("$field.CODE", newCodeNumber);
-//}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/contacteditors/children/contactid_param/code.js b/entity/Task_entity/entityfields/contacteditors/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/contactrequestors/children/contactid_param/code.js b/entity/Task_entity/entityfields/contactrequestors/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js b/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..86bf9bdfc95f2757f6ee947b7549edad4ce0b154
--- /dev/null
+++ b/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Task");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc b/entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/moduletrees/children/id/code.js b/entity/Task_entity/entityfields/moduletrees/children/id/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..890f0a3405749e82541e057057f75d24166006d7
--- /dev/null
+++ b/entity/Task_entity/entityfields/moduletrees/children/id/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js b/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3c7bcbb72428414e2f789b2d17b1ba40a916b18
--- /dev/null
+++ b/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.TASKID"),
+  "ParentContext_param": "Task"
+};
+
+neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newtask_action/onActionProcess.js b/entity/Task_entity/entityfields/newtask_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4e2fd874a328729465b5f1d47f86a2352af528c
--- /dev/null
+++ b/entity/Task_entity/entityfields/newtask_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.TASKID"),
+  "ParentContext_param": "Task"
+};
+
+neon.openContext("Task", "TaskEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/parent_context/valueProcess.js b/entity/Task_entity/entityfields/parent_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..348cc486cbe308a212dab0374b6e3fad11cba07d
--- /dev/null
+++ b/entity/Task_entity/entityfields/parent_context/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ParentContext_param"));
diff --git a/entity/Task_entity/entityfields/parent_id/valueProcess.js b/entity/Task_entity/entityfields/parent_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d628d7b12408acee8e94da575abee2e3e846882f
--- /dev/null
+++ b/entity/Task_entity/entityfields/parent_id/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("system.logging");
+
+result.string(vars.get("$param.ParentId_param"));
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..68427766d13467b6bb55261aa6249df15cf8eacb
--- /dev/null
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+// Sets the type to "Task" as default value.
+result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7");
\ No newline at end of file
diff --git a/entity/Task_entity/onValidation.js b/entity/Task_entity/onValidation.js
index 460d1e2fc978a5608fbb4eceab1d59b13374ef12..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Task_entity/onValidation.js
+++ b/entity/Task_entity/onValidation.js
@@ -1,17 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.vars");
-import("system.text");
-import("system.neon");
-import("Sql_lib");
-
-//TODO: this should no happen in onValidation; waiting for #1032668
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
-    var maskingHelper = new SqlMaskingUtils();
-    var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
-    newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
-    if (isNaN(newCodeNumber))
-        throw new TypeError(translate.text("The code number is not a valid number."));
-    neon.setFieldValue("$field.CODE", ++newCodeNumber);
-}
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBInsert.js b/entity/Task_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..333d4d3ca97769c16660a9c6fa7459e28669b98e
--- /dev/null
+++ b/entity/Task_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.util");
+import("system.db");
+
+if (vars.exists("$param.ObjectType_param") && vars.exists("$param.RowId_param") && vars.get("$param.ObjectType_param") && vars.get("$param.RowId_param"))
+    db.insertData("AB_OBJECTRELATION", ["AB_OBJECTRELATIONID", "OBJECT1_TYPE", "OBJECT1_ROWID", "OBJECT2_TYPE", "OBJECT2_ROWID"], null,
+                    [
+                        util.getNewUUID(),
+                        vars.get("$param.ObjectType_param"),
+                        vars.get("$param.RowId_param"),
+                        "Task",
+                        vars.get("$field.TASKID")
+                    ]);
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/orderClauseProcess.js b/entity/Task_entity/recordcontainers/db/orderClauseProcess.js
index a9a4d09c9b79d1a83a4aed6b36cf6420baf8d271..e1eed9e6c15fff6062b3ed8161413699d5301f28 100644
--- a/entity/Task_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Task_entity/recordcontainers/db/orderClauseProcess.js
@@ -1,4 +1,4 @@
 import("system.db");
 import("system.result");
 
-result.object({"TASK.CODE": db.DESCENDING});
\ No newline at end of file
+result.object({"TASK.MATURITY_DATE": db.DESCENDING});
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 4bdee59f79a0d7ca91293f99c44eb094b05b6259..8e52105f68d966cf5b7d9f7dc22db12a9c829bed 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -15,8 +15,10 @@
     </entityField>
     <entityField>
       <name>MINUTES</name>
-      <title>Minutes</title>
+      <title>Time</title>
+      <contentType>NUMBER</contentType>
       <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>OBJECT_ID</name>
diff --git a/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js b/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..326c2a9f306a8a9356e4f895c630ace18a27a91f
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.MINUTES"))));
\ No newline at end of file
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index 58bc65ef52c577062f096bb6e0772453784bd6e9..74fa0b796d49d26a64f3dc1afebdec42fa58ec9d 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,8 @@ import("system.db");
 import("system.result");
 import("system.translate");
 import("Data_lib");
-
+import("Keyword_lib");
+import("Money_lib");
 
 var turnoverCategory = translate.text('Turnover');
 var forecastCategory = translate.text('Forecast');
@@ -13,6 +14,13 @@ var forecastCategory = translate.text('Forecast');
 // load data
 var sumOfMonthTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, sum(NET + VAT) from SALESORDER group by year(SALESORDERDATE), month(SALESORDERDATE) order by yearNum, monthNum");
 var sumOfMonthForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, sum(VOLUME * 1000) from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START) order by yearNum, monthNum");
+var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESORDERITEM.GROUPCODEID") + ") \n\
+                                            from SALESORDER \n\
+                                            join SALESORDERITEM on SALESORDERITEM.SALESORDER_ID = SALESORDER.SALESORDERID \n\
+                                            where SALESORDERITEM.OPTIONAL <> 1 \n\
+                                            group by year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE \n\
+                                            order by yearNum, monthNum");                  //           V--V--> there is no VAT/Discount in forecasts  V-----> forecasts are grouped by grupcode and have always quantity 1
+var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000),                      1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
 
 // build chartData
 var rootNode = "";
@@ -27,30 +35,33 @@ for (let i = 0; i < yearCountToShow; i++)
 {
     var year = i + maxYear - yearCountToShow + 1;
     
-    var TurnoverYearSum = 0;
-    var ForecastYearSum = 0;
+    var turnoverYearSum = 0;
+    var forecastYearSum = 0;
     
     // filter data by current year
-    var TurnoverYearData = sumOfMonthTurnover.filter(function(row)
+    var turnoverYearData = sumOfMonthTurnover.filter(function(row)
     {
-        return row[0] == year
+        return row[0] == year;
     });
     
-    var ForecastYearData = sumOfMonthForecast.filter(function(row)
+    var forecastYearData = sumOfMonthForecast.filter(function(row)
     {
-        return row[0] == year
+        return row[0] == year;
     });
     
     for (let i = 1; i <= 12; i++) 
     { 
         // add months
-        TurnoverYearSum += _addMonth(year, i, TurnoverYearData, turnoverCategory);
-        ForecastYearSum += _addMonth(year, i, ForecastYearData, forecastCategory);
+        turnoverYearSum += _addMonth(year, i, turnoverYearData, turnoverCategory);
+        forecastYearSum += _addMonth(year, i, forecastYearData, forecastCategory);
+        
+        _addProducts(year, i, sumOfMonthProductsTurnover, turnoverCategory);
+        _addProducts(year, i, sumOfMonthProductsForecast, forecastCategory);
     }
     
     // add year nodes
-    chartData.add(turnoverCategory + year, rootNode, [turnoverCategory, year.toString(), TurnoverYearSum]);
-    chartData.add(forecastCategory + year, rootNode, [forecastCategory, year.toString(), ForecastYearSum]);
+    chartData.add(turnoverCategory + year, rootNode, [turnoverCategory, year.toString(), turnoverYearSum]);
+    chartData.add(forecastCategory + year, rootNode, [forecastCategory, year.toString(), forecastYearSum]);
 
 }
 
@@ -86,4 +97,40 @@ function _addMonth(pYear, pMonth, pData, pCategory)
     // add month node
     chartData.add(pCategory + pYear + pMonth, pCategory + pYear, [pCategory, monthDate, monthValue]);
     return yearSum;
-}
\ No newline at end of file
+}
+
+function _addProducts(pYear, pMonth, pData, pCategory)
+{
+    var groupcodeSums = {};
+    
+    for (let i = 0; i < pData.length; i++) 
+    { 
+        if (pData[i][0] == pYear && pData[i][1] == pMonth)
+        {
+            var groupCode = pData[i][6];
+            if (groupCode != undefined)
+            {
+                if (groupcodeSums[groupCode] == undefined)
+                {
+                    groupcodeSums[groupCode] = {
+                        sum: 0,
+                        name: pData[i][7]
+                    }
+                }
+                
+                pData[i][2] = pData[i][2] || 0;
+                pData[i][3] = pData[i][3] || 0;
+                pData[i][4] = pData[i][4] || 0;
+                pData[i][5] = pData[i][5] || 0;
+
+                groupcodeSums[groupCode]["sum"] += MoneyUtils.getGross(parseFloat(pData[i][3]), parseFloat(pData[i][4]), parseFloat(pData[i][5]), parseFloat(pData[i][2]));
+            }
+        }
+    }
+    
+    for (let groupcode in groupcodeSums) 
+    {
+        if (groupcodeSums[groupcode]["sum"])
+            chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"], groupcodeSums[groupcode]["sum"]]);
+    }
+}
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 4cd5a0b8fc7abacca40a1ac7efe2ff3c8d32ac8e..bb50a0cfc5ae38837d03dbd597767fbd1009e531 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -342,6 +342,9 @@
     <entry>
       <key>Rollout</key>
     </entry>
+    <entry>
+      <key>Estimation</key>
+    </entry>
     <entry>
       <key>Phase</key>
     </entry>
@@ -2361,6 +2364,27 @@
     <entry>
       <key>Touchpoint</key>
     </entry>
+    <entry>
+      <key>Combobox Value</key>
+    </entry>
+    <entry>
+      <key>relations</key>
+    </entry>
+    <entry>
+      <key>Time</key>
+    </entry>
+    <entry>
+      <key>New task</key>
+    </entry>
+    <entry>
+      <key>MyTasks</key>
+    </entry>
+    <entry>
+      <key>Show my tasks</key>
+    </entry>
+    <entry>
+      <key>the specified key has to be unique for that container but does already exist</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 5a1ac4e286c447b6aa8e5fdad7a75d3d35b0da29..c296a6d5b7327fc7b1164cd4ed027063141a5314 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1059,6 +1059,10 @@
       <key>My Activities</key>
       <value>Meine Aktivitäten</value>
     </entry>
+    <entry>
+      <key>Combobox Value</key>
+      <value>Combobox-Wert</value>
+    </entry>
     <entry>
       <key>Salesprojects</key>
       <value>Vertriebsprojekte</value>
@@ -1683,9 +1687,11 @@
     </entry>
     <entry>
       <key>Customer</key>
+      <value>Kunde</value>
     </entry>
     <entry>
       <key>Outgoing</key>
+      <value>ausgehend</value>
     </entry>
     <entry>
       <key>Paraguay</key>
@@ -1858,6 +1864,7 @@
     </entry>
     <entry>
       <key>${ORGTYPE_OTHER}</key>
+      <value>Sonstiges</value>
     </entry>
     <entry>
       <key>Haiti</key>
@@ -1870,6 +1877,7 @@
     </entry>
     <entry>
       <key>waiting</key>
+      <value>warten auf Rückmeldung</value>
     </entry>
     <entry>
       <key>American Samoa</key>
@@ -1930,6 +1938,7 @@
     </entry>
     <entry>
       <key>Incoming</key>
+      <value>eingehend</value>
     </entry>
     <entry>
       <key>Ghana</key>
@@ -1981,6 +1990,7 @@
     </entry>
     <entry>
       <key>Supplier</key>
+      <value>Lieferant</value>
     </entry>
     <entry>
       <key>Nigeria</key>
@@ -2005,6 +2015,7 @@
     </entry>
     <entry>
       <key>Prospect</key>
+      <value>Potenzieller Kunde</value>
     </entry>
     <entry>
       <key>Estonia</key>
@@ -2035,6 +2046,7 @@
     </entry>
     <entry>
       <key>new</key>
+      <value>neu</value>
     </entry>
     <entry>
       <key>Adviser</key>
@@ -2365,6 +2377,7 @@
     </entry>
     <entry>
       <key>Internal</key>
+      <value>intern</value>
     </entry>
     <entry>
       <key>Brunei Darussalam</key>
@@ -2425,6 +2438,7 @@
     </entry>
     <entry>
       <key>${GENDER_OTHER}</key>
+      <value>Divers</value>
     </entry>
     <entry>
       <key>Touchpoint</key>
@@ -2475,6 +2489,7 @@
     </entry>
     <entry>
       <key>in process</key>
+      <value>in Bearbeitung</value>
     </entry>
     <entry>
       <key>Saint Martin (French part)</key>
@@ -2514,7 +2529,7 @@
     </entry>
     <entry>
       <key>ended</key>
-      <value></value>
+      <value>abgeschlossen</value>
     </entry>
     <entry>
       <key>Saint Barthélemy</key>
@@ -2640,6 +2655,7 @@
     </entry>
     <entry>
       <key>Checkbox</key>
+      <value></value>
     </entry>
     <entry>
       <key>Numeric value</key>
@@ -2661,6 +2677,7 @@
     </entry>
     <entry>
       <key>${NUMBER}</key>
+      <value>Zahl</value>
     </entry>
     <entry>
       <key>Name \&amp;quot;%0\&amp;quot; already used for container \&amp;quot;%1\&amp;quot;</key>
@@ -2724,6 +2741,28 @@
       <key>Print Offer</key>
       <value>Angebot drucken</value>
     </entry>
+    <entry>
+      <key>relations</key>
+    </entry>
+    <entry>
+      <key>Time</key>
+      <value>Zeit</value>
+    </entry>
+    <entry>
+      <key>New task</key>
+      <value>Neue Aufgabe</value>
+    </entry>
+    <entry>
+      <key>MyTasks</key>
+      <value>Meine Aufgaben</value>
+    </entry>
+    <entry>
+      <key>Show my tasks</key>
+      <value>Meine Aufgaben anzeigen</value>
+    </entry>
+    <entry>
+      <key>the specified key has to be unique for that container but does already exist</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 0d2178cde64a0329f92c0199bf82579eb014211f..647509f8eefbab504f14212ed4ae93b23ffc269e 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2385,6 +2385,27 @@
     <entry>
       <key>Days inactive</key>
     </entry>
+    <entry>
+      <key>Combobox Value</key>
+    </entry>
+    <entry>
+      <key>relations</key>
+    </entry>
+    <entry>
+      <key>Time</key>
+    </entry>
+    <entry>
+      <key>New task</key>
+    </entry>
+    <entry>
+      <key>MyTasks</key>
+    </entry>
+    <entry>
+      <key>Show my tasks</key>
+    </entry>
+    <entry>
+      <key>the specified key has to be unique for that container but does already exist</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index 7e9ce7018b9378bf85def94c6f6ec4f0bdc8148e..3d56373fb0ac8111c7d1df0efc29eee8f5c1b36f 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -10,5 +10,9 @@
       <name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
       <view>AttributeRelationFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
+      <view>AttributeRelationEdit_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/ModuleTree/ModuleTree.aod b/neonContext/ModuleTree/ModuleTree.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4b0216f17ab31b75eb2e81c1ca33ad3433c153b5
--- /dev/null
+++ b/neonContext/ModuleTree/ModuleTree.aod
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>ModuleTree</name>
+  <title>Tree</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ModuleTree_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>90d2e21e-1231-418e-8729-d29f2453dfdd</name>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/ObjectRelation/ObjectRelation.aod b/neonContext/ObjectRelation/ObjectRelation.aod
index 610ecc6e44d59d765957fde0ca29bb669befd723..763a754b47c69d0746663e2b28c48748487daaa0 100644
--- a/neonContext/ObjectRelation/ObjectRelation.aod
+++ b/neonContext/ObjectRelation/ObjectRelation.aod
@@ -19,5 +19,9 @@
       <name>30334c84-5e46-4a4e-a5c4-3c42d1cb109b</name>
       <view>ObjectRelationEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>cec4dc52-b38f-4f7c-b8ca-4b81ccda3ac1</name>
+      <view>Object1RelationFilter_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 968ccbfe817a9cc274763fca03626b25ece07bfa..26e9b98ce2551670cd108cf2ad6cc54f7486eed9 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -31,13 +31,13 @@
       <name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
       <view>OrganisationAttr_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>b1634a51-b3f3-47b7-aea0-b9e8fba851da</name>
-      <view>OrganisationEditDefaults_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
       <view>OrganisationLookup_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>0e8f983b-0ff6-431c-9118-fecd9563c742</name>
+      <view>OrganisationEditDefaults_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 79170c513dfcab35377e2ace6a3e8b6ae2284dfc..5937e2ba7b21546420d60c63fc05da01b31e76f8 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -29,5 +29,10 @@
       <entityField>Links</entityField>
       <view>ActivityLinkFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f6c6888a-f3d6-410a-b97b-30c34a9dd6a2</name>
+      <entityField>ModuleTrees</entityField>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 59adbab341fa443a18be81de0097635898b4fc31..f3e5d5fa9e51b0d3fedf0e8f0b07f37f8c561472 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -20,6 +20,10 @@
       <entityField>#ENTITY</entityField>
       <title></title>
       <fields>
+        <entityFieldLink>
+          <name>5f20a5d4-0343-4b8c-92bf-15eeb2483ba9</name>
+          <entityField>ATTRIBUTE_PARENT_ID</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>e00bfeb1-7003-4d5a-b71a-c6921e255c9d</name>
           <entityField>ATTRIBUTE_ACTIVE</entityField>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b4c8d4ad85db22baaa90965b82fac2e75f090642
--- /dev/null
+++ b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeRelationEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>MultiEdit</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>3da856c1-6a5b-4fc3-aa41-0865b331a5e4</name>
+          <entityField>AB_ATTRIBUTE_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>04dda499-d970-41d1-a524-5e354c0d2bfd</name>
+          <entityField>ATTRIBUTERELATION_VALUE</entityField>
+        </neonTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ModuleTree_view/ModuleTree_view.aod b/neonView/ModuleTree_view/ModuleTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..255c830a3d576467c148efbcc80f6f90635319d9
--- /dev/null
+++ b/neonView/ModuleTree_view/ModuleTree_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>ModuleTree_view</name>
+  <title>Tree</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treetableViewTemplate>
+      <name>Treetable</name>
+      <parentField>PARENT_ID</parentField>
+      <favoriteActionGroup3></favoriteActionGroup3>
+      <titleField>TITLE</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconField>ICON</iconField>
+      <entityField>#ENTITY</entityField>
+      <title></title>
+    </treetableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod b/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bd5d9de2901e7bcb490f61daef99819f696d9c1f
--- /dev/null
+++ b/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>Object1RelationFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Object2</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>9df2f22f-96ab-461e-af54-2dfdfa2de221</name>
+          <entityField>OBJECT2_ROWID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>9df2f22f-96ab-461e-af54-2dfdfa7de221</name>
+          <entityField>EMPTY</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4c660f02d48e4fce4c8af45f2f21198c2cc3fd55
--- /dev/null
+++ b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>OrganisationEditDefaults_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>EditDefaults_template</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>ccc421c9-3943-4668-a6c7-960753c38562</name>
+          <entityField>ADDRESS_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>8625fb63-550c-4ad3-9b39-3091762e3f29</name>
+          <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>a984c913-54e8-492e-928a-3553a1e76726</name>
+          <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 98a781f875c112f8898b153c0acc936b66d172fd..3663da44374d333a97dddbdee952647333d17e74 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -52,5 +52,10 @@
       <entityField>Communications</entityField>
       <view>CommunicationMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>2037ef93-6719-49af-9352-9ca3c03d6972</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationEdit_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 804bbee490041b4c9eb72c6ec7b644071ff661bb..5fcec76945e9d274d53facb435b159b212b99989 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -50,5 +50,15 @@
       <entityField>ObjectRelations</entityField>
       <view>AnyObjectRelationFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>dc1aa0ca-d0bd-45fd-84dc-55cfcf3ca430</name>
+      <entityField>Salesprojects</entityField>
+      <view>SalesprojectFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>331f8519-f112-48c8-8430-85927dd0635e</name>
+      <entityField>TaskObjectRelations</entityField>
+      <view>Object1RelationFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index f846c2c82867c21a3c16c9885c8cac3996c136a6..f284f32b2b819fa90d398b224cfa1c8db9dbeffe 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -70,5 +70,10 @@
       <entityField>Communications</entityField>
       <view>CommunicationMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>520f3056-2a24-4469-a86f-76ba80090829</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationEdit_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index c1585cf24ddda592508fed29d38aaf9d469926d1..93442d69e26e9db2feda7e0dc32b9613366468ff 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -39,5 +39,10 @@
       <entityField>ObjectRelations</entityField>
       <view>AnyObjectRelationFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
+      <entityField>Attributes</entityField>
+      <view>AttributeRelationFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 17c595d7e5a591a458451e2040eb3ba7ff1c83d6..24df599d7a43e21be159443d1179c7aeaa2d5683 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -13,10 +13,6 @@
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>bc1d5872-58e5-4799-a382-79e74945cc75</name>
-          <entityField>CODE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
           <entityField>SUBJECT</entityField>
@@ -37,10 +33,6 @@
           <name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
           <entityField>PRIORITY</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>8173056f-fac6-4ee0-a8ff-c27c8184e6e9</name>
-          <entityField>TYPE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
           <entityField>PROTECTIONLEVEL</entityField>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 685009d266653d324a1b6368fe4d8d75aef30f93..f0c310450207f2295e88da001daa245ae197cfd8 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -3,6 +3,23 @@
   <name>TaskFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name></name>
+      <title>MyTasks</title>
+      <description>Show my tasks</description>
+      <fragment>Task/filter</fragment>
+      <singleton v="true" />
+      <requiresConfiguration v="false" />
+      <icon>VAADIN:TASKS</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>tasks</name>
+          <title>Tasks</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
   <layout>
     <groupLayout>
       <name>layout</name>
@@ -22,10 +39,6 @@
       <entityField>#ENTITY</entityField>
       <title></title>
       <columns>
-        <neonTableColumn>
-          <name>c60f59e5-f56b-4d13-87fc-e8c8e65bebd7</name>
-          <entityField>CODE</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
           <entityField>SUBJECT</entityField>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index c9b298b525883639f21f9e1d86f8e760c1f973ee..89cb729d600f3fd342ccc93240dfe1cefac6c9ea 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -19,10 +19,6 @@
       <showDrawer v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
-          <entityField>CODE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
           <entityField>START_DATE</entityField>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index cc31fbb6b14d6b8fc84c30cbc7e88cf192695088..4be843f93960bac853acd429f72aacbba0c61fae 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -24,10 +24,6 @@
           <name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
           <entityField>PROTECTIONLEVEL</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>e73dda40-22cd-4d2d-abcf-c7fc59ea2e67</name>
-          <entityField>TYPE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>fea59f13-750b-427d-bf33-cc1bead95446</name>
           <entityField>DESCRIPTION</entityField>
@@ -39,5 +35,10 @@
       <entityField>MainDocuments</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
+      <entityField>ModuleTrees</entityField>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 5f1e9c767f3c62cd9a462c6ba3d802b129c1dff9..cce489a22fc53fab49f62e16ecd82e94dec69397 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -20,10 +20,6 @@
       <showDrawer v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
-          <entityField>CODE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
           <entityField>START_DATE</entityField>
@@ -40,10 +36,6 @@
           <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
           <entityField>PROTECTIONLEVEL</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>5bcbaa89-0826-4ef8-872d-bd68dbd8ef77</name>
-          <entityField>TYPE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
           <entityField>REQUESTOR_CONTACT_ID</entityField>
diff --git a/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml b/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
deleted file mode 100644
index 3b0f9e8e11744d7d8f5856ef93daa961680874c4..0000000000000000000000000000000000000000
--- a/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include file="system_alias/struct/create_asys_aliasconfig.xml"/>
-    <include file="system_alias/struct/create_asys_binaries.xml"/>
-    <include file="system_alias/struct/create_asys_dashletconfigurations.xml"/>
-    <include file="system_alias/struct/create_asys_dashlets.xml"/>
-    <include file="system_alias/struct/create_asys_notifications.xml"/>
-    <include file="system_alias/struct/create_asys_sequences.xml"/>
-    <include file="system_alias/struct/create_asys_system.xml"/>
-    <include file="system_alias/struct/create_asys_timer.xml"/>
-    <include file="system_alias/struct/create_asys_users.xml"/>
-    <include file="system_alias/struct/create_asys_calendarbackend.xml"/>
-    <include file="system_alias/struct/create_asys_calendarlink.xml"/>
-    
-    <include file="system_alias/data/insert_asys_aliasconfig.xml"/>
-    <include file="system_alias/data/insert_asys_system.xml"/>
-    <include file="system_alias/data/insert_asys_users-admin.xml"/>
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt b/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a567af3fbd00e9aa95d7858f28965087221b66a3
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
@@ -0,0 +1,4 @@
+* all TaskTypes are deleted, new Type "Task" is created
+ - you may have to update all Tasks to use type "Tak" (keyid: 4dee8727-8299-422e-ae41-6cdf9de2dfd799)
+* Column CODE is reset to NULL on all tasks (it is curently  not needed by basic)
+* ESTIMATION and ESTIMATIONVALUE from salesproject are droped
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/DASHLET_data.xml b/others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml
similarity index 66%
rename from others/db_changes/data_alias/data/DASHLET_data.xml
rename to others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml
index d7e2561fb92ca8ed0cda313aab3a1940d67be47e..11ec89d2691a2c07cd5a3ac448affaf4b7855992 100644
--- a/others/db_changes/data_alias/data/DASHLET_data.xml
+++ b/others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="m.escher" id="1203e9e4-472b-48ac-9d6b-23ebae976beb">
-        <delete tableName="ASYS_DASHLETS"/>
+    <changeSet author="a.loreth" id="31d7b6f2-c376-4bfa-ba42-9aab6f07737c">
+        <addColumn tableName="ACTIVITY">
+            <column name="PARENT_CONTEXT" type="VARCHAR(64)"/>
+            <column name="PARENT_ID" type="CHAR(36)"/>
+        </addColumn>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6677259879dd02f5fd5256bd666331a83fc8e3bc
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_privat.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_kaeltetechnik.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_pichelmaier.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_pfiffig.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_sommer.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_muller.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_leicht.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_kanzler.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_gruener.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_obermeier.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_smith.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_person/PERSON_lustig.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1000.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1001.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>    
+    <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1000.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>    
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
+	
+    <include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
+    
+    <include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
+    
+    <include relativeToChangelogFile="true" file="activity_add_parent.xml"/>
+    <include relativeToChangelogFile="true" file="task_add_parent.xml"/>
+    
+    <include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
diff --git a/others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87.txt b/others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
similarity index 100%
rename from others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87.txt
rename to others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
diff --git a/others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87_1.txt b/others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
similarity index 100%
rename from others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87_1.txt
rename to others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1000.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1000.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1001.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1001.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1002.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1002.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1003.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1003.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1004.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_privat.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_privat.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_gruener.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_leicht.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_lustig.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_muller.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_muller.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_smith.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_smith.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
diff --git a/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml b/others/db_changes/data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
similarity index 95%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
index 90898dfe0d1a58966782e65a7601f3435b8c949a..9629672f13eaf9aeddfcd3df20f57cde4419cbd9 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
@@ -9,8 +9,8 @@
             <column name="SALESORDERCODE" valueNumeric="1004"/>
             <column name="VERSNR" valueNumeric="1"/>
             <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
-            <column name="NET" valueNumeric="840.00"/>
-            <column name="VAT" valueNumeric="159.60"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
             <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="deu"/>
         </insert>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8473f6476873890bd07b7acf404ed49cc4243cbb
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
@@ -0,0 +1,118 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="f834fa51-7c20-4ea8-be57-0780008c49d3">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2017-11-21T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1005"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+            <column name="NET" valueNumeric="210.00"/>
+            <column name="VAT" valueNumeric="39.90"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="92ebcce0-8970-42dc-b32f-b892fe7dbb52"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="1"/>
+            <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="2bf1eb1f-501c-4006-83cb-fb9783272e35"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="1"/>
+            <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+            <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+            <column name="ITEMSORT" valueNumeric="2"/>
+            <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
+            <column name="ITEMNAME" value="AX47"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="dcb02f78-8305-462f-bbeb-f7b5cb102461"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+            <column name="ITEMSORT" valueNumeric="3"/>
+            <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
+            <column name="ITEMNAME" value="Produktname4.1"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1.1"/>
+        </insert>
+
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="a63b3fed-f7a4-4173-ba3e-a893f7186ed6"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+            <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
+            <column name="ITEMSORT" valueNumeric="4"/>
+            <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
+            <column name="ITEMNAME" value="Sonderrabatt"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1.1.1"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="6d59b91d-bfac-46ac-be79-35fdeb793d0d"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+            <column name="ITEMSORT" valueNumeric="5"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="ITEMNAME" value="Produktname4.2a"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1.2"/>
+        </insert>
+
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="b68656aa-84e1-4682-9c2e-2d9ec0810ecb"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+            <column name="ITEMSORT" valueNumeric="6"/>
+            <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
+            <column name="ITEMNAME" value="Produktname1.1"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.2"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="fafb2b07-012e-4d20-b263-2b794e5370a7"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+            <column name="ITEMSORT" valueNumeric="7"/>
+            <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
+            <column name="ITEMNAME" value="Produktname1.2"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.3"/>
+        </insert>
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
new file mode 100644
index 0000000000000000000000000000000000000000..62e06a3e45ed1e6a039442dfcc3a9bed0d0da321
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="2a4e1c95-1827-4716-8875-8086b323caed">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2018-08-12T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1006"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
+            <column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f93270dbd8127527a9af09eb52da8e8507509812
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="7f2fe3fb-52a6-4056-9968-f576be04ab2b">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2016-06-14T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1007"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+            <column name="NET" valueNumeric="630.00"/>
+            <column name="VAT" valueNumeric="119.70"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="c64dc823-98cd-4159-a27d-7167f510fc57"/>
+            <column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
new file mode 100644
index 0000000000000000000000000000000000000000..20e6443c67aa7b2444d7a0d2c45b2839b9a81895
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="bbc9e3d3-8a1d-4411-ba4c-900404d8a010">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2018-08-23T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1008"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
+            <column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52f6e8ced36739ecee4d47f55811e9416c0ce551
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="0a93418f-9c50-4b76-9fb5-f7156f209271">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1009"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="709e37c9-0397-4b82-965c-e11416e6f090"/>
+            <column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+            <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
similarity index 76%
rename from others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
index 78e3fb27480d753b524aa5aa9b5ed5f370c4d41d..2ee7119a4945df11439960372182ca4c38f192c4 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -93,6 +93,58 @@
         <column name="VOLUME" valueNumeric="1.3"/>
     </insert>
 
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="92c4db4d-ed8d-4651-8a2c-797f4ac6237b"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2018-06-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="0.5"/>
+    </insert>
+
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="7c2d866b-abc9-4fa7-8499-ccc82d4097bb"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="1.2"/>
+    </insert>
+
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="11c4125c-5c56-499e-acc9-d879fa09ddf7"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2017-06-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="1.4"/>
+    </insert>
+    
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="e60e5cd9-bbf7-41eb-ae9f-443083052eef"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2017-05-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="1.2"/>
+    </insert>
+
     <insert tableName="SALESPROJECT_COMPETITION">
         <column name="SALESPROJECT_COMPETITIONID" value="a3ae9702-a3da-4d5f-a3ab-e386c8a0ac40"/>
         <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
diff --git a/others/db_changes/data_alias/data/example_task/base.xml b/others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
similarity index 96%
rename from others/db_changes/data_alias/data/example_task/base.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
index 7680d3f8a042b1d4a63335e298f6807899128403..dae1ae32cef285ed93f4692315d9cbcdd971f92a 100644
--- a/others/db_changes/data_alias/data/example_task/base.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
@@ -7,7 +7,7 @@
             </column>
             <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
             <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-
+            <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>            
             <column name="CODE" valueNumeric="10000"/>
             <column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
             <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
@@ -28,7 +28,7 @@
             </column>
             <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
             <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-
+            <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
             <column name="CODE" valueNumeric="10001"/>
             <column name="SUBJECT" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
             <column name="STATUS" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
@@ -49,7 +49,7 @@
             </column>
             <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
             <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-
+            <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
             <column name="CODE" valueNumeric="10002"/>
             <column name="SUBJECT" value="Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris"/>
             <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml b/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab045eecb61425666f5f5a69642cb138dc77cbb5
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="0601eb26-fc5e-4b57-ad18-2b6a064f383f">
+        <dropColumn tableName="SALESPROJECT" columnName="ESTIMATION"/>
+        <dropColumn tableName="SALESPROJECT" columnName="ESTIMATIONVALUE"/>
+        
+        <rollback>
+            <addColumn tableName="SALESPROJECT">
+                <column name="ESTIMATION" type="NVARCHAR(50)"/>
+                <column name="ESTIMATIONVALUE" type="INTEGER"/>
+            </addColumn>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a74490dfcf370d59d36cbb6101152ac162ec0812
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="j.goderbauer" id="598345d1-691b-4cae-b1c0-44c9c48705c8">
+    <dropNotNullConstraint tableName="TASK" columnName="CODE" />
+    <update tableName="TASK">
+        <column name="CODE"/>
+    </update>
+    <rollback>
+        <addNotNullConstraint tableName="TASK" columnName="CODE" />
+        <!--the update which sets everything to null cannot be rolled back-->
+    </rollback>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/DASHLETCONFIGURATION_data.xml b/others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
similarity index 67%
rename from others/db_changes/data_alias/data/DASHLETCONFIGURATION_data.xml
rename to others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
index c70a7012f5aa51beed3b322856ef841bb1bf8758..0bf722803a32e15b3c0661159914fcbc48fa120e 100644
--- a/others/db_changes/data_alias/data/DASHLETCONFIGURATION_data.xml
+++ b/others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="m.escher" id="bd4a9ffe-64d6-4f2d-8006-a29947eba5741">
-        <delete tableName="ASYS_DASHLETCONFIGURATIONS"/>
+    <changeSet author="a.loreth" id="a1890934-4f52-4623-a587-9d690505bbaf">
+        <addColumn tableName="TASK">
+            <column name="PARENT_CONTEXT" type="VARCHAR(64)"/>
+            <column name="PARENT_ID" type="CHAR(36)"/>
+        </addColumn>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml b/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6e9186ce3f0d10263f64b464ab7aeb3a3e2a6755
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml
@@ -0,0 +1,85 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="a.loreth" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+            <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+            <column name="TITLE" value="Task"/>
+            <column name="CONTAINER" value="TaskType"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+
+        <delete tableName="AB_KEYWORD_ENTRY">
+            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0" />
+            </whereParams>
+        </delete>
+        <delete tableName="AB_KEYWORD_ENTRY">
+            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad" />
+            </whereParams>
+        </delete>
+        <delete tableName="AB_KEYWORD_ENTRY">
+            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="54231fc1-050e-4f00-91e1-4968387a6370" />
+            </whereParams>
+        </delete>
+        <delete tableName="AB_KEYWORD_ENTRY">
+            <where>AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b" />
+            </whereParams>
+        </delete>
+    
+    
+        <rollback>
+            <delete tableName="AB_KEYWORD_ENTRY">
+                <where>AB_KEYWORD_ENTRYID = ?</where>
+                <whereParams>
+                    <param value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+                </whereParams>
+            </delete>
+            <insert tableName="AB_KEYWORD_ENTRY">
+                <column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
+                <column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
+                <column name="TITLE" value="Visit"/>
+                <column name="CONTAINER" value="TaskType"/>
+                <column name="SORTING" valueNumeric="0"/>
+                <column name="ISACTIVE" valueNumeric="1"/>
+                <column name="ISESSENTIAL" valueNumeric="0"/>
+            </insert>
+            <insert tableName="AB_KEYWORD_ENTRY">
+                <column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
+                <column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
+                <column name="TITLE" value="E-Mail"/>
+                <column name="CONTAINER" value="TaskType"/>
+                <column name="SORTING" valueNumeric="1"/>
+                <column name="ISACTIVE" valueNumeric="1"/>
+                <column name="ISESSENTIAL" valueNumeric="0"/>
+            </insert>
+            <insert tableName="AB_KEYWORD_ENTRY">
+                <column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
+                <column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
+                <column name="TITLE" value="Phone"/>
+                <column name="CONTAINER" value="TaskType"/>
+                <column name="SORTING" valueNumeric="2"/>
+                <column name="ISACTIVE" valueNumeric="1"/>
+                <column name="ISESSENTIAL" valueNumeric="0"/>
+            </insert>
+            <insert tableName="AB_KEYWORD_ENTRY">
+                <column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
+                <column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
+                <column name="TITLE" value="Online-Meeting"/>
+                <column name="CONTAINER" value="TaskType"/>
+                <column name="SORTING" valueNumeric="3"/>
+                <column name="ISACTIVE" valueNumeric="1"/>
+                <column name="ISESSENTIAL" valueNumeric="0"/>
+            </insert>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/init_ab_language.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/init_ab_language.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/init_ab_language.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/init_ab_language.xml
diff --git a/others/db_changes/data_alias/basic/init/init.xml b/others/db_changes/data_alias/basic/init/init.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4653839c7b975a5f2951845804b0ef995888eeb
--- /dev/null
+++ b/others/db_changes/data_alias/basic/init/init.xml
@@ -0,0 +1,47 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_objectrelation.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_attribute.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_attributerelation.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_attributeusage.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_keyword_entry.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_keyword_attribute.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_keyword_attributerelation.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_countryinfo.xml"/>
+    <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_language.xml"/>
+    
+    <include relativeToChangelogFile="true" file="struct/create_person.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_organisation.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_contact.xml"/>    
+    <include relativeToChangelogFile="true" file="struct/create_activity.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_activitylink.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_appointmentlink.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_address.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_communication.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_contract.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_product.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_prod2prod.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_productprice.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_stock.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject_classification.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject_competition.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject_cycle.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject_forecast.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject_member.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesproject_source.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_offer.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_offeritem.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesorder.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_salesorderitem.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_timetracking.xml"/>
+    <include relativeToChangelogFile="true" file="struct/create_task.xml"/>
+    
+    <!--reference files for keywords:--> 
+    <include relativeToChangelogFile="true" file="data/AditoBasic/ab_keyword_entry.xml"/>
+    <include relativeToChangelogFile="true" file="data/AditoBasic/ab_keyword_attribute.xml"/>
+    <!--special case countryinfo data-->
+    <include relativeToChangelogFile="true" file="data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
+
+    <include relativeToChangelogFile="true" file="data/AditoBasic/init_ab_language.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attribute.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_attribute.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributeusage.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_attributeusage.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_countryinfo.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_countryinfo.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attribute.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attribute.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attributerelation.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attributerelation.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_entry.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_entry.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_language.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_language.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_objectrelation.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_objectrelation.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
diff --git a/others/db_changes/data_alias/struct/create_activity.xml b/others/db_changes/data_alias/basic/init/struct/create_activity.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_activity.xml
rename to others/db_changes/data_alias/basic/init/struct/create_activity.xml
diff --git a/others/db_changes/data_alias/struct/create_activitylink.xml b/others/db_changes/data_alias/basic/init/struct/create_activitylink.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_activitylink.xml
rename to others/db_changes/data_alias/basic/init/struct/create_activitylink.xml
diff --git a/others/db_changes/data_alias/struct/create_address.xml b/others/db_changes/data_alias/basic/init/struct/create_address.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_address.xml
rename to others/db_changes/data_alias/basic/init/struct/create_address.xml
diff --git a/others/db_changes/data_alias/struct/create_appointmentlink.xml b/others/db_changes/data_alias/basic/init/struct/create_appointmentlink.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_appointmentlink.xml
rename to others/db_changes/data_alias/basic/init/struct/create_appointmentlink.xml
diff --git a/others/db_changes/data_alias/struct/create_communication.xml b/others/db_changes/data_alias/basic/init/struct/create_communication.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_communication.xml
rename to others/db_changes/data_alias/basic/init/struct/create_communication.xml
diff --git a/others/db_changes/data_alias/struct/create_contact.xml b/others/db_changes/data_alias/basic/init/struct/create_contact.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_contact.xml
rename to others/db_changes/data_alias/basic/init/struct/create_contact.xml
diff --git a/others/db_changes/data_alias/struct/create_contract.xml b/others/db_changes/data_alias/basic/init/struct/create_contract.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_contract.xml
rename to others/db_changes/data_alias/basic/init/struct/create_contract.xml
diff --git a/others/db_changes/data_alias/struct/create_offer.xml b/others/db_changes/data_alias/basic/init/struct/create_offer.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_offer.xml
rename to others/db_changes/data_alias/basic/init/struct/create_offer.xml
diff --git a/others/db_changes/data_alias/struct/create_offeritem.xml b/others/db_changes/data_alias/basic/init/struct/create_offeritem.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_offeritem.xml
rename to others/db_changes/data_alias/basic/init/struct/create_offeritem.xml
diff --git a/others/db_changes/data_alias/struct/create_organisation.xml b/others/db_changes/data_alias/basic/init/struct/create_organisation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_organisation.xml
rename to others/db_changes/data_alias/basic/init/struct/create_organisation.xml
diff --git a/others/db_changes/data_alias/struct/create_person.xml b/others/db_changes/data_alias/basic/init/struct/create_person.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_person.xml
rename to others/db_changes/data_alias/basic/init/struct/create_person.xml
diff --git a/others/db_changes/data_alias/struct/create_prod2prod.xml b/others/db_changes/data_alias/basic/init/struct/create_prod2prod.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_prod2prod.xml
rename to others/db_changes/data_alias/basic/init/struct/create_prod2prod.xml
diff --git a/others/db_changes/data_alias/struct/create_product.xml b/others/db_changes/data_alias/basic/init/struct/create_product.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_product.xml
rename to others/db_changes/data_alias/basic/init/struct/create_product.xml
diff --git a/others/db_changes/data_alias/struct/create_productprice.xml b/others/db_changes/data_alias/basic/init/struct/create_productprice.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_productprice.xml
rename to others/db_changes/data_alias/basic/init/struct/create_productprice.xml
diff --git a/others/db_changes/data_alias/struct/create_salesorder.xml b/others/db_changes/data_alias/basic/init/struct/create_salesorder.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesorder.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesorder.xml
diff --git a/others/db_changes/data_alias/struct/create_salesorderitem.xml b/others/db_changes/data_alias/basic/init/struct/create_salesorderitem.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesorderitem.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesorderitem.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject.xml
similarity index 93%
rename from others/db_changes/data_alias/struct/create_salesproject.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject.xml
index 76660a3847ca2cb59974b749dea1792bc4ec1bef..1a18e814008c98a7093a6ed5648f0f19ae3d4db4 100644
--- a/others/db_changes/data_alias/struct/create_salesproject.xml
+++ b/others/db_changes/data_alias/basic/init/struct/create_salesproject.xml
@@ -16,6 +16,8 @@
             <column name="VOLUME" type="NUMERIC(14,2)"/>
             <column name="STARTDATE" type="DATETIME"/>
             <column name="ENDDATE" type="DATETIME"/>
+            <column name="ESTIMATION" type="NVARCHAR(50)"/>
+            <column name="ESTIMATIONVALUE" type="INTEGER"/>
             <column name="PROBABILITY" type="CHAR(36)"/>
 
             <column name="SALESPROJECTID" type="CHAR(36)">
diff --git a/others/db_changes/data_alias/struct/create_salesproject_classification.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_classification.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_classification.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_classification.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_competition.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_competition.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_competition.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_competition.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_cycle.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_cycle.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_cycle.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_cycle.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_forecast.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_forecast.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_forecast.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_forecast.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_member.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_member.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_member.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_member.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_source.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_source.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_source.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_source.xml
diff --git a/others/db_changes/data_alias/struct/create_stock.xml b/others/db_changes/data_alias/basic/init/struct/create_stock.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_stock.xml
rename to others/db_changes/data_alias/basic/init/struct/create_stock.xml
diff --git a/others/db_changes/data_alias/struct/create_task.xml b/others/db_changes/data_alias/basic/init/struct/create_task.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_task.xml
rename to others/db_changes/data_alias/basic/init/struct/create_task.xml
diff --git a/others/db_changes/data_alias/struct/create_timetracking.xml b/others/db_changes/data_alias/basic/init/struct/create_timetracking.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_timetracking.xml
rename to others/db_changes/data_alias/basic/init/struct/create_timetracking.xml
diff --git a/others/db_changes/dashboardChangelog.xml b/others/db_changes/data_alias/changelog.xml
similarity index 80%
rename from others/db_changes/dashboardChangelog.xml
rename to others/db_changes/data_alias/changelog.xml
index e47788724f67f0e4f30e5cacd57747370332268a..0754d5e05adc7a470dd86c988b58939825717e3d 100644
--- a/others/db_changes/dashboardChangelog.xml
+++ b/others/db_changes/data_alias/changelog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include file="data_alias/data/DASHLET_data.xml"/>
-    <include file="data_alias/data/DASHLETCONFIGURATION_data.xml"/>
+    <include file="basic/init/init.xml"/>
+    <include file="basic/2019.2/changelog.xml"/>
 </databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
deleted file mode 100644
index 806289ad7ee1782eac9fa94e9047cab38ee53828..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
+++ /dev/null
@@ -1,579 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="j.goderbauer" id="ded084f6-174d-49a9-a829-f49590c1cc85">
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f7310676-b0c6-412d-917f-3b21ad80d610"/>
-            <column name="NAME" value="Sieber Kältetechnik&#10;"/>
-            <column name="CUSTOMERCODE" value="00000006"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>  
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e913fcce-0722-44ee-9964-a91dc90cfefe"/>
-            <column name="ORGANISATION_ID" value="f7310676-b0c6-412d-917f-3b21ad80d610"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="ded2582c-1c97-4e06-8d12-16ae00b60fb7"/>
-            <column name="NAME" value="Amberger Dental &amp; Technik &#10;GmbH &amp; Co.KG&#10;"/>
-            <column name="CUSTOMERCODE" value="00000007"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e1ee1d84-c9eb-4000-8921-b342db81d534"/>
-            <column name="ORGANISATION_ID" value="ded2582c-1c97-4e06-8d12-16ae00b60fb7"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f8bf3212-d698-45a5-8270-5b786a83ce28"/>
-            <column name="NAME" value="Winkelberg Versicherung&#10;"/>
-            <column name="CUSTOMERCODE" value="00000008"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d8ea5981-ab27-4371-8a8b-65225d00dad9"/>
-            <column name="ORGANISATION_ID" value="f8bf3212-d698-45a5-8270-5b786a83ce28"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d7f9af7d-c09b-41dd-88d0-8d66f464be19"/>
-            <column name="NAME" value="Brandenburg  Versicherungs AG&#10;"/>
-            <column name="CUSTOMERCODE" value="00000009"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="de0ec35f-d123-4cbf-aa76-9089fbe6c3c3"/>
-            <column name="ORGANISATION_ID" value="d7f9af7d-c09b-41dd-88d0-8d66f464be19"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e29b1302-68f6-4326-b9b2-dee3da297bc8"/>
-            <column name="NAME" value="Lieferdienst &#10;GmbH und Co.KG"/>
-            <column name="CUSTOMERCODE" value="00000010"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e16eb8a4-dffd-4a4a-8398-d1de4968f64f"/>
-            <column name="ORGANISATION_ID" value="e29b1302-68f6-4326-b9b2-dee3da297bc8"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f304765c-7513-4ad6-89a5-e158c592c8be"/>
-            <column name="NAME" value="Schwan GmbH"/>
-            <column name="CUSTOMERCODE" value="00000011"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="ef9b34a6-c930-4ce0-939d-cdc5417f39d3"/>
-            <column name="ORGANISATION_ID" value="f304765c-7513-4ad6-89a5-e158c592c8be"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="ec6d609f-6623-4589-ae32-9b957a9a0865"/>
-            <column name="NAME" value="Neumann GmbH&#10;Tunnelvortriebstechnik&#10;"/>
-            <column name="CUSTOMERCODE" value="00000012"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="da3fca12-14ae-4d1e-aece-40f96dae345a"/>
-            <column name="ORGANISATION_ID" value="ec6d609f-6623-4589-ae32-9b957a9a0865"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d3138d27-4c09-4c0a-b647-ffe62bb7a425"/>
-            <column name="NAME" value="Liebik KG"/>
-            <column name="CUSTOMERCODE" value="00000013"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f462072b-6ead-4d85-aba2-c87573f8a7b8"/>
-            <column name="ORGANISATION_ID" value="d3138d27-4c09-4c0a-b647-ffe62bb7a425"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="dfcb852d-8730-4fc2-9999-4e5ab86114f7"/>
-            <column name="NAME" value="JKL Ltd."/>
-            <column name="CUSTOMERCODE" value="00000014"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d321e2b4-f97e-4754-ba16-ab4853512c3c"/>
-            <column name="ORGANISATION_ID" value="dfcb852d-8730-4fc2-9999-4e5ab86114f7"/>
-            <column name="LANGUAGE" value="eng"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f0c7b4c7-e9f2-45d0-b823-771483a40c6d"/>
-            <column name="NAME" value="SF Engineering-Services Ltd."/>
-            <column name="CUSTOMERCODE" value="00000015"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="ff7978e6-9053-48fc-8dc2-b6ee93f71b32"/>
-            <column name="ORGANISATION_ID" value="f0c7b4c7-e9f2-45d0-b823-771483a40c6d"/>
-            <column name="LANGUAGE" value="eng"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d9a40db6-7ec7-4271-af7b-649cbc1fd03f"/>
-            <column name="NAME" value="Wolfshofer AG&#10;"/>
-            <column name="CUSTOMERCODE" value="00000016"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d9a72273-fe0c-4461-bff0-851c294718c1"/>
-            <column name="ORGANISATION_ID" value="d9a40db6-7ec7-4271-af7b-649cbc1fd03f"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d07a6321-ac60-4f58-a35d-80f6c8e4fc59"/>
-            <column name="NAME" value="Grün Versicherung AG&#10;"/>
-            <column name="CUSTOMERCODE" value="00000017"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d60e2e0d-bf6a-437d-89a8-841b09f4a899"/>
-            <column name="ORGANISATION_ID" value="d07a6321-ac60-4f58-a35d-80f6c8e4fc59"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d4b18031-b1ad-4a5f-8c3f-1f483775ede3"/>
-            <column name="NAME" value="Verband für Bauwirtschaft&#10;"/>
-            <column name="CUSTOMERCODE" value="00000018"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d94ccadb-0022-4eb7-86ae-ba011fd257eb"/>
-            <column name="ORGANISATION_ID" value="d4b18031-b1ad-4a5f-8c3f-1f483775ede3"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d882e2c8-84bd-411c-84db-81513e8d1918"/>
-            <column name="NAME" value="Paseo S.R.L."/>
-            <column name="CUSTOMERCODE" value="00000019"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e867c779-34bd-4659-88dc-eb0ae056c37f"/>
-            <column name="ORGANISATION_ID" value="d882e2c8-84bd-411c-84db-81513e8d1918"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d4fbee0e-57ac-47bd-bc62-d41d979d97f1"/>
-            <column name="NAME" value="Verband für Druckindustrie&#10;"/>
-            <column name="CUSTOMERCODE" value="00000020"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d15f4906-3898-46f8-a039-03d58cfe56a9"/>
-            <column name="ORGANISATION_ID" value="d4fbee0e-57ac-47bd-bc62-d41d979d97f1"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d27d05dc-d06b-4cc6-8007-d13c0adff070"/>
-            <column name="NAME" value="ZTN Ltd."/>
-            <column name="CUSTOMERCODE" value="00000021"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e69a9f1c-1054-4ccf-8c3b-69ee1e8aa99b"/>
-            <column name="ORGANISATION_ID" value="d27d05dc-d06b-4cc6-8007-d13c0adff070"/>
-            <column name="LANGUAGE" value="eng"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e7d22826-8d4c-428b-a45a-02b4257cc7f4"/>
-            <column name="NAME" value="IKWA Services GmbH&#10;"/>
-            <column name="CUSTOMERCODE" value="00000022"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e9ddbdbd-914f-4ade-944a-6de908168d19"/>
-            <column name="ORGANISATION_ID" value="e7d22826-8d4c-428b-a45a-02b4257cc7f4"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e6f2aeba-ec06-4ebc-b6b3-43b3c977dc7e"/>
-            <column name="NAME" value="KITAMURA MACHINERY CO., LTD."/>
-            <column name="CUSTOMERCODE" value="00000023"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="de2733d3-e40a-4cb2-8c51-f02f36de0b7d"/>
-            <column name="ORGANISATION_ID" value="e6f2aeba-ec06-4ebc-b6b3-43b3c977dc7e"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f71d811c-e7be-486f-95c4-6031dc3d8bbd"/>
-            <column name="NAME" value="Bauunternehmen Wilhelm Huber GmbH"/>
-            <column name="CUSTOMERCODE" value="00000024"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="da0463a5-10c4-4db1-9521-36c4e8d4894d"/>
-            <column name="ORGANISATION_ID" value="f71d811c-e7be-486f-95c4-6031dc3d8bbd"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="efe2dc72-f8e9-42ce-858d-af597c66f9fd"/>
-            <column name="NAME" value="Beck IT Support GmbH"/>
-            <column name="CUSTOMERCODE" value="00000025"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e6b44ceb-2ec6-421f-b50f-33b1d7757cc8"/>
-            <column name="ORGANISATION_ID" value="efe2dc72-f8e9-42ce-858d-af597c66f9fd"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="ff050ff3-ab15-4381-a911-a741425c73eb"/>
-            <column name="NAME" value="Buchberger &amp; Partner"/>
-            <column name="CUSTOMERCODE" value="00000026"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f97c4822-2157-4033-aa83-31c7704e6015"/>
-            <column name="ORGANISATION_ID" value="ff050ff3-ab15-4381-a911-a741425c73eb"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f15728d5-acf6-4dd6-b3ee-27df76a3b91f"/>
-            <column name="NAME" value="CCK GmbH"/>
-            <column name="CUSTOMERCODE" value="00000027"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d6d540c1-3993-4037-98be-499486021b47"/>
-            <column name="ORGANISATION_ID" value="f15728d5-acf6-4dd6-b3ee-27df76a3b91f"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="fbb39871-02d1-4912-86a7-796d261c88f8"/>
-            <column name="NAME" value="Financial Group Chesterfield"/>
-            <column name="CUSTOMERCODE" value="00000028"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="dc63e588-060b-441b-9790-b81574e2c544"/>
-            <column name="ORGANISATION_ID" value="fbb39871-02d1-4912-86a7-796d261c88f8"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d3092cde-649d-4699-b0ae-52c93d639e78"/>
-            <column name="NAME" value="Frankenmann Co.KG"/>
-            <column name="CUSTOMERCODE" value="00000029"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f89cbdb4-0dbf-4df0-8625-88cb4cc3fab1"/>
-            <column name="ORGANISATION_ID" value="d3092cde-649d-4699-b0ae-52c93d639e78"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e5c0aa96-e196-4b5e-9e23-718b9bffc5d0"/>
-            <column name="NAME" value="Friedrich &amp; Frank GmbH"/>
-            <column name="CUSTOMERCODE" value="00000030"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f3641d66-a970-49a6-8143-340bc24cb352"/>
-            <column name="ORGANISATION_ID" value="e5c0aa96-e196-4b5e-9e23-718b9bffc5d0"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d4f7cf2f-5f4f-4857-9f7c-fe3475b2803c"/>
-            <column name="NAME" value="Lesser GmbH &amp; Co.KG"/>
-            <column name="CUSTOMERCODE" value="00000031"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="fea24840-5504-4c4c-86ba-84f0dc50f10e"/>
-            <column name="ORGANISATION_ID" value="d4f7cf2f-5f4f-4857-9f7c-fe3475b2803c"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="d1aeaca7-96bc-4ef4-9aa5-b52e374df6b9"/>
-            <column name="NAME" value="Förderverband Doritz"/>
-            <column name="CUSTOMERCODE" value="00000032"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="dd0bf580-b86b-43c1-b202-fda20711c903"/>
-            <column name="ORGANISATION_ID" value="d1aeaca7-96bc-4ef4-9aa5-b52e374df6b9"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f6763689-5cdc-47e3-97df-a3bdc579a383"/>
-            <column name="NAME" value="GHG Consulting"/>
-            <column name="CUSTOMERCODE" value="00000033"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e6ee4479-4f68-4002-a18b-b3cd0109fc18"/>
-            <column name="ORGANISATION_ID" value="f6763689-5cdc-47e3-97df-a3bdc579a383"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f974fcf9-51f9-4469-b772-223ee625f5e2"/>
-            <column name="NAME" value="Gorch Systems Engineering GmbH"/>
-            <column name="CUSTOMERCODE" value="00000034"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="ecde89ab-4e30-484a-aec2-cff3069d25f6"/>
-            <column name="ORGANISATION_ID" value="f974fcf9-51f9-4469-b772-223ee625f5e2"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e58a9160-d480-42c3-8ab3-7ca01f964570"/>
-            <column name="NAME" value="Gußberg Software KG"/>
-            <column name="CUSTOMERCODE" value="00000035"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f0360f92-b881-4448-b250-d9f3cf18d9c1"/>
-            <column name="ORGANISATION_ID" value="e58a9160-d480-42c3-8ab3-7ca01f964570"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e9c73782-7c8f-492e-8fa0-971b43f02710"/>
-            <column name="NAME" value="Hartmann Großbau AG"/>
-            <column name="CUSTOMERCODE" value="00000036"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f191c170-84c3-4bcd-baf6-4b4b1e99bdf9"/>
-            <column name="ORGANISATION_ID" value="e9c73782-7c8f-492e-8fa0-971b43f02710"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e717a3d3-9f83-45bc-8779-f17cee22ea5a"/>
-            <column name="NAME" value="Immobilien &amp; Vermögensberatung Steinmeier"/>
-            <column name="CUSTOMERCODE" value="00000037"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d5dd7578-868e-4cc6-9c0f-27625c62c0be"/>
-            <column name="ORGANISATION_ID" value="e717a3d3-9f83-45bc-8779-f17cee22ea5a"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="fd0da4f9-0898-48f7-bf35-b7d29a2e78d0"/>
-            <column name="NAME" value="KPO Kernsysteme"/>
-            <column name="CUSTOMERCODE" value="00000038"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="dae79c22-a04b-4948-97ee-a41d2d4c187b"/>
-            <column name="ORGANISATION_ID" value="fd0da4f9-0898-48f7-bf35-b7d29a2e78d0"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f9842336-8544-4c58-9bac-f957e8ef22d6"/>
-            <column name="NAME" value="Kfz Verkaufsgruppe PHK"/>
-            <column name="CUSTOMERCODE" value="00000039"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="d1d6c1cd-23d9-46a5-a560-df7f11cc63ea"/>
-            <column name="ORGANISATION_ID" value="f9842336-8544-4c58-9bac-f957e8ef22d6"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f7aaa4f6-340a-48e4-874f-7287e440f6e0"/>
-            <column name="NAME" value="Marketingcenter Eyespace"/>
-            <column name="CUSTOMERCODE" value="00000040"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e6b57b4e-3776-4e79-9998-3aba2ee46923"/>
-            <column name="ORGANISATION_ID" value="f7aaa4f6-340a-48e4-874f-7287e440f6e0"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f61b71b4-9e5f-4fee-929c-c13ded95ece6"/>
-            <column name="NAME" value="Rüdiger Marsenburg GmbH"/>
-            <column name="CUSTOMERCODE" value="00000041"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="ed394880-74d7-4b2c-b781-b24b003b6871"/>
-            <column name="ORGANISATION_ID" value="f61b71b4-9e5f-4fee-929c-c13ded95ece6"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f4bb9045-7280-4f21-a0f9-c909fac23b23"/>
-            <column name="NAME" value="Van Hug Financial Service"/>
-            <column name="CUSTOMERCODE" value="00000042"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f4a95bcf-799f-41ab-b77c-8f05e3a66627"/>
-            <column name="ORGANISATION_ID" value="f4bb9045-7280-4f21-a0f9-c909fac23b23"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="e54e7d63-6bfc-46a6-a0c7-0fca2478331e"/>
-            <column name="NAME" value="Versicherungen ABK AG"/>
-            <column name="CUSTOMERCODE" value="00000043"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e808ba75-6c12-4b0a-88ae-779fb9894fda"/>
-            <column name="ORGANISATION_ID" value="e54e7d63-6bfc-46a6-a0c7-0fca2478331e"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f6f65e33-95b2-4aeb-ac30-6b33ea00f595"/>
-            <column name="NAME" value="Weinbuch Deutschland GmbH"/>
-            <column name="CUSTOMERCODE" value="00000044"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e465cc10-0fb9-4a67-a135-e10c72c10f49"/>
-            <column name="ORGANISATION_ID" value="f6f65e33-95b2-4aeb-ac30-6b33ea00f595"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="f1eabc20-c1b1-4865-aded-db902c3ab1f5"/>
-            <column name="NAME" value="Wellington Wings Corp."/>
-            <column name="CUSTOMERCODE" value="00000045"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="e6d8384e-4ba1-4784-86b4-18e36e1b33d5"/>
-            <column name="ORGANISATION_ID" value="f1eabc20-c1b1-4865-aded-db902c3ab1f5"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-        <insert tableName="ORGANISATION">
-            <column name="ORGANISATIONID" value="dfaf3c29-5317-46e3-be83-cff4a52cd6fd"/>
-            <column name="NAME" value="Zimmermann Logistik AG"/>
-            <column name="CUSTOMERCODE" value="00000046"/>
-            <column name="PRICE_POLITICS" valueNumeric="1"/>    
-            <column name="STRENGTH" valueNumeric="1"/>    
-            <column name="WEAKNESS" valueNumeric="1"/>
-        </insert>
-        <insert tableName="CONTACT">
-            <column name="CONTACTID" value="f7179fda-231d-40d4-a7b6-b2dab5cd76cf"/>
-            <column name="ORGANISATION_ID" value="dfaf3c29-5317-46e3-be83-cff4a52cd6fd"/>
-            <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-        </insert>
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_andre.xml b/others/db_changes/data_alias/data/example_person/PERSON_andre.xml
deleted file mode 100644
index 1cd2295f16078c45252599c0a730f6cef626be03..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_andre.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Peter"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Andre"/>
-            <column name="SALUTATION" value="Herr"/>
-            <column name="TITLE" value="Dr."/>
-		<column name="DATEOFBIRTH" valueDate="1980-10-14"/>
-	</insert>
-		<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_braun.xml b/others/db_changes/data_alias/data/example_person/PERSON_braun.xml
deleted file mode 100644
index d9b3f6058fecfb5ccedc4fdd18899fcef827cc98..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_braun.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-	    	<column name="PERSONID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Herbert"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Braun"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1994-04-08"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-		<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml b/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
deleted file mode 100644
index 5a1cec1c52b17b2b2a927f945b345ec79a85c22c..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Carolin"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Schmitt"/>
-            <column name="SALUTATION" value="Frau"/>
-		<column name="DATEOFBIRTH" valueDate="1960-12-16"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml b/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
deleted file mode 100644
index ffa0cd46f9e681d69a08b5a081d6036e4be67894..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Peter"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Grenzer"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1982-08-25"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_haller.xml b/others/db_changes/data_alias/data/example_person/PERSON_haller.xml
deleted file mode 100644
index 8bc9519adaa91bbc29adb66ad4cf830fdaf1c323..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_haller.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Erna"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Haller"/>
-            <column name="SALUTATION" value="Mrs."/>
-		<column name="DATEOFBIRTH" valueDate="1961-09-29"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml b/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
deleted file mode 100644
index a227f859dfcefa9de75e7a60b68f95c99798c036..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Suse"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Hamann"/>
-            <column name="SALUTATION" value="Mrs."/>
-		<column name="DATEOFBIRTH" valueDate="1985-03-24"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml b/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
deleted file mode 100644
index b13f079e828f12dc3c7ff6529a3637e46c277c29..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Gerd"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Hausler"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1988-12-23"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml b/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
deleted file mode 100644
index 20a783b033e90d9549114ed305c3065b3a2e41cc..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Thomas"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Hinterecker"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1955-08-15"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml b/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
deleted file mode 100644
index ee624ba82d12e745345f4b211eb56614bdfd051c..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Josef"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Hugenmaier"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1960-11-13"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml b/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
deleted file mode 100644
index f67fb96d8fd080672e781616b2ed87dfe34520f2..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Annette"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Kormann"/>
-            <column name="SALUTATION" value="Madame"/>
-		<column name="DATEOFBIRTH" valueDate="1986-02-17"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_miller.xml b/others/db_changes/data_alias/data/example_person/PERSON_miller.xml
deleted file mode 100644
index 4ae837c5b06e8baafb3f3c0d4b79abeec107ff35..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_miller.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Berd"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Miller"/>
-            <column name="SALUTATION" value="Herr"/>
-            <column name="TITLE" value="Dr."/>
-		<column name="DATEOFBIRTH" valueDate="1971-05-21"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml b/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
deleted file mode 100644
index 5b8ad4496da078c71f1c2f3ef357131bd0dc12f1..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Peter"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Petersen"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1991-03-17"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml b/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
deleted file mode 100644
index 3b1bfa89f37252ade6bd69781029489fd8436517..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Claudia"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Reisecker"/>
-            <column name="SALUTATION" value="Frau"/>
-            <column name="TITLE"/>
-		<column name="DATEOFBIRTH" valueDate="1967-09-03"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml b/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
deleted file mode 100644
index 66b73d866d74cce15f941b214e00eb47d5e01cc5..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Mark"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Rieber"/>
-            <column name="SALUTATION" value="Mr."/>
-		<column name="DATEOFBIRTH" valueDate="1948-02-09"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml b/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
deleted file mode 100644
index 23abe3cf862f760d8905c726b75a15cc6a9bcce2..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Robert"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Sommer"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1956-07-02"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml b/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
deleted file mode 100644
index fcd1003977eee51351b0e6f9b6f1086344542059..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Walter"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Saubermann"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1985-10-22"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml b/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
deleted file mode 100644
index 4d55e6d169ec2a21a444deb9aa0276683218d273..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Paula"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Schmitt"/>
-            <column name="SALUTATION" value="Frau"/>
-		<column name="DATEOFBIRTH" valueDate="1988-05-06"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_stone.xml b/others/db_changes/data_alias/data/example_person/PERSON_stone.xml
deleted file mode 100644
index 83fe11ccd0450b587bed56ffd1adbfce824e5049..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_stone.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Sharon"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Stone"/>
-            <column name="SALUTATION" value="Frau"/>
-            <column name="TITLE" value="Prof."/>
-		<column name="DATEOFBIRTH" valueDate="1976-03-15"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml b/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
deleted file mode 100644
index 6e7e5dc09220adf13e16a4d7e104531d4d626106..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Kristiane"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Thaler"/>
-            <column name="SALUTATION" value="Frau"/>
-		<column name="DATEOFBIRTH" valueDate="2001-02-23"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_traum.xml b/others/db_changes/data_alias/data/example_person/PERSON_traum.xml
deleted file mode 100644
index 040b5f4e190d81013c3d9beba1a4c20748e00866..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_traum.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Prinz"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Traum"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="2002-02-26"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml b/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
deleted file mode 100644
index e0e8207a020c6d38da2ad0aa9b49d1f30bf2e2d1..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Franz"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Vogel"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="2011-10-16"/>
-		<column name="MIDDLENAME" value=""/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_walter.xml b/others/db_changes/data_alias/data/example_person/PERSON_walter.xml
deleted file mode 100644
index 4b0b2b40869aa665ee5fefc3dfb4cfe7c5f17b18..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_walter.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
-	<insert tableName="PERSON">
-		<column name="PERSONID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
-            <column name="FIRSTNAME" value="Fritz"/>
-            <column name="MIDDLENAME"/>
-            <column name="LASTNAME" value="Walter"/>
-            <column name="SALUTATION" value="Herr"/>
-		<column name="DATEOFBIRTH" valueDate="1957-03-05"/>
-	</insert>
-	<insert tableName="CONTACT">
-                <column name="RELATIONSHIP" valueNumeric="1"/>
-                <column name="LANGUAGE" value="deu"/>
-		<column name="PERSON_ID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="CONTACTID" value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
-		<column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
-		<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
-	</insert>
-	<rollback>
-		<delete tableName="CONTACT">
-			<where>CONTACTID = ?</where>
-			<whereParams>
-				<param value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-		<delete tableName="PERSON">
-			<where>PERSONID = ?</where>
-			<whereParams>
-				<param value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1" />
-			</whereParams>
-		</delete>
-	</rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/readme.adoc b/others/db_changes/data_alias/data/readme.adoc
deleted file mode 100644
index cd184b938dd78eab57a32d0e3f7bbd9f61314e63..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/readme.adoc
+++ /dev/null
@@ -1 +0,0 @@
-== Readme
\ No newline at end of file
diff --git a/others/db_changes/data_alias/struct/readme.adoc b/others/db_changes/data_alias/struct/readme.adoc
deleted file mode 100644
index cd184b938dd78eab57a32d0e3f7bbd9f61314e63..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/struct/readme.adoc
+++ /dev/null
@@ -1 +0,0 @@
-== Readme
\ No newline at end of file
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
deleted file mode 100644
index c93c6d8738b5756915ce0d6cf2bd8c0f049d5167..0000000000000000000000000000000000000000
--- a/others/db_changes/masterChangelog.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include file="data_alias/struct/AditoBasic/create_ab_objectrelation.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_attribute.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_attributerelation.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_attributeusage.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_keyword_entry.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_keyword_attribute.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_keyword_attributerelation.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_countryinfo.xml"/>
-    <include file="data_alias/struct/AditoBasic/create_ab_language.xml"/>
-    
-    <include file="data_alias/struct/create_person.xml"/>
-    <include file="data_alias/struct/create_organisation.xml"/>
-    <include file="data_alias/struct/create_contact.xml"/>    
-    <include file="data_alias/struct/create_activity.xml"/>
-    <include file="data_alias/struct/create_activitylink.xml"/>
-    <include file="data_alias/struct/create_appointmentlink.xml"/>
-    <include file="data_alias/struct/create_address.xml"/>
-    <include file="data_alias/struct/create_communication.xml"/>
-    <include file="data_alias/struct/create_contract.xml"/>
-    <include file="data_alias/struct/create_product.xml"/>
-    <include file="data_alias/struct/create_prod2prod.xml"/>
-    <include file="data_alias/struct/create_productprice.xml"/>
-    <include file="data_alias/struct/create_stock.xml"/>
-    <include file="data_alias/struct/create_salesproject.xml"/>
-    <include file="data_alias/struct/create_salesproject_classification.xml"/>
-    <include file="data_alias/struct/create_salesproject_competition.xml"/>
-    <include file="data_alias/struct/create_salesproject_cycle.xml"/>
-    <include file="data_alias/struct/create_salesproject_forecast.xml"/>
-    <include file="data_alias/struct/create_salesproject_member.xml"/>
-    <include file="data_alias/struct/create_salesproject_source.xml"/>
-    <include file="data_alias/struct/create_offer.xml"/>
-    <include file="data_alias/struct/create_offeritem.xml"/>
-    <include file="data_alias/struct/create_salesorder.xml"/>
-    <include file="data_alias/struct/create_salesorderitem.xml"/>
-    <include file="data_alias/struct/create_timetracking.xml"/>
-    <include file="data_alias/struct/create_task.xml"/>
-    
-    <include file="data_alias/data/example_organisation/ORGANISATION_privat.xml"/>
-    <include file="data_alias/data/example_organisation/ORGANISATION_gfk.xml"/>
-    <include file="data_alias/data/example_organisation/ORGANISATION_mnf.xml"/>
-    <include file="data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml"/>
-    <include file="data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml"/>
-    <include file="data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml"/>
-    <include file="data_alias/data/example_person/PERSON_pfiffig.xml"/>
-    <include file="data_alias/data/example_person/PERSON_sommer.xml"/>
-    <include file="data_alias/data/example_person/PERSON_muller.xml"/>
-    <include file="data_alias/data/example_person/PERSON_leicht.xml"/>
-    <include file="data_alias/data/example_person/PERSON_kanzler.xml"/>
-    <include file="data_alias/data/example_person/PERSON_gruener.xml"/>
-    <include file="data_alias/data/example_person/PERSON_obermeier.xml"/>
-    <include file="data_alias/data/example_person/PERSON_smith.xml"/>
-    <include file="data_alias/data/example_person/PERSON_lustig.xml"/>
-    <include file="data_alias/data/example_contract/CONTRACT_1000.xml"/>
-    <include file="data_alias/data/example_contract/CONTRACT_1001.xml"/>
-    <include file="data_alias/data/example_contract/CONTRACT_1002.xml"/>
-    <include file="data_alias/data/example_contract/CONTRACT_1003.xml"/>
-    <include file="data_alias/data/example_contract/CONTRACT_1004.xml"/>
-    <include file="data_alias/data/example_product/PRODUCT_42154311.xml"/>    
-    <include file="data_alias/data/example_salesproject/SALESPROJECT_gfk.xml"/>
-    <include file="data_alias/data/example_salesproject/SALESPROJECT_jkl.xml"/>
-    <include file="data_alias/data/example_activity/example_activity_gfk.xml"/>
-    <include file="data_alias/data/example_offer/OFFER_1000.xml"/>
-    <include file="data_alias/data/example_offer/OFFER_1001.xml"/>
-    <include file="data_alias/data/example_offer/OFFER_1002.xml"/>
-    <include file="data_alias/data/example_offer/OFFER_1003.xml"/>
-    <include file="data_alias/data/example_offer/OFFER_1004.xml"/>    
-    <include file="data_alias/data/example_salesorder/SALESORDER_1000.xml"/>
-    <include file="data_alias/data/example_salesorder/SALESORDER_1001.xml"/>
-    <include file="data_alias/data/example_salesorder/SALESORDER_1002.xml"/>
-    <include file="data_alias/data/example_salesorder/SALESORDER_1003.xml"/>
-    <include file="data_alias/data/example_salesorder/SALESORDER_1004.xml"/>  
-    <include file="data_alias/data/example_task/base.xml"/>
-    
-    <!--reference files for keywords:--> 
-    <include file="data_alias/data/AditoBasic/ab_keyword_entry.xml"/>
-    <include file="data_alias/data/AditoBasic/ab_keyword_attribute.xml"/>
-    <!--special case countryinfo data-->
-    <include file="data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
-
-    <include file="data_alias/data/AditoBasic/init_ab_language.xml"/>
-</databaseChangeLog>
diff --git a/others/db_changes/readme.adoc b/others/db_changes/readme.adoc
index 0eb0f310d1afc59d57d5cff6b0ce5e84543ce4ed..e9bf2e4ff2a4a42d4252dc99c44fc2230751d85d 100644
--- a/others/db_changes/readme.adoc
+++ b/others/db_changes/readme.adoc
@@ -1,6 +1,8 @@
 liquibase-readme
 ================
 
+== TODO: update to new Structure ==
+
 == Structure within  ADITO
 === in theory
 
diff --git a/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml b/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e94f2543871caa8a6c85f12715d0856d3f6a6e2
--- /dev/null
+++ b/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml
@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="struct/create_asys_aliasconfig.xml"/>
+    <include file="struct/create_asys_binaries.xml"/>
+    <include file="struct/create_asys_dashletconfigurations.xml"/>
+    <include file="struct/create_asys_dashlets.xml"/>
+    <include file="struct/create_asys_notifications.xml"/>
+    <include file="struct/create_asys_sequences.xml"/>
+    <include file="struct/create_asys_system.xml"/>
+    <include file="struct/create_asys_timer.xml"/>
+    <include file="struct/create_asys_users.xml"/>
+    <include file="struct/create_asys_calendarbackend.xml"/>
+    <include file="struct/create_asys_calendarlink.xml"/>
+    
+    <include file="data/insert_asys_aliasconfig.xml"/>
+    <include file="data/insert_asys_system.xml"/>
+    <include file="data/insert_asys_users-admin.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/system_alias/system_aliasTestdata.xml b/others/db_changes/system_alias/system_aliasTestdata.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12e4b957ade3bd0f87acb1decb681cb98398f0df
--- /dev/null
+++ b/others/db_changes/system_alias/system_aliasTestdata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <include file="data/example_asys_users/Birgit_Leicht.xml"/>
+    <include file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
+    <include file="data/example_asys_users/Harold_Smith.xml"/>
+    <include file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
+    <include file="data/example_asys_users/Herbert_Obermeier.xml"/>
+    <include file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
+    <include file="data/example_asys_users/Lisa_Sommer.xml"/>
+    <include file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
+    <include file="data/example_asys_users/Susanne_Lustig.xml"/>
+    <include file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/system_aliasTestdata.xml b/others/db_changes/system_aliasTestdata.xml
deleted file mode 100644
index bdd0d606f861dca732d8a5d61549711f09eba4f5..0000000000000000000000000000000000000000
--- a/others/db_changes/system_aliasTestdata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <include file="system_alias/data/example_asys_users/Birgit_Leicht.xml"/>
-    <include file="system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
-    <include file="system_alias/data/example_asys_users/Harold_Smith.xml"/>
-    <include file="system_alias/data/example_asys_binaries/Harold_Smith_Image.xml"/>
-    <include file="system_alias/data/example_asys_users/Herbert_Obermeier.xml"/>
-    <include file="system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
-    <include file="system_alias/data/example_asys_users/Lisa_Sommer.xml"/>
-    <include file="system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
-    <include file="system_alias/data/example_asys_users/Susanne_Lustig.xml"/>
-    <include file="system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
-</databaseChangeLog>
diff --git a/others/guide/how to copy objects with subitems.adoc b/others/guide/how to copy objects with subitems.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..63f85af69459e163f28844400e364f42d7ca8023
--- /dev/null
+++ b/others/guide/how to copy objects with subitems.adoc	
@@ -0,0 +1,100 @@
+How to make an action for copying modules
+=========================================
+:toc2: left
+:numbered:
+
+== What this guide is for ==
+You want to create an action or process that should copy a module with
+related sub-items.
+(for example: Offer + OfferItems, Order + OrderItems)
+
+== How to do it ==
+There are two possibilities when it comes to creating a new dataset based on another one:
+
+* Save it directly and open the created dataset in show-mode
+* Open it in new-mode so that the user can make changes first or cancel the action
+
+=== Save it directly ===
+This is relatively easy to do with the functions in the Neon_lib.
+At first you have make the copy with the method "CopyModuleUtils.copyModule". It requires an InputMapping object that
+defines the structure of the module. For example:
+
+[source, javascript]
+----
+var InputMapping = {
+    "OFFER": {
+            condition: "OFFERID = '" + vars.get("$field.OFFERID") + "'"
+            , ValueMapping: {
+                            "OFFER_ID": ""
+                            , "OFFERCODE":  OfferUtils.getNextOfferNumber()
+                            , "VERSNR": "1"
+                        }
+            , SubModules:{
+                "OFFERITEM": {
+                    condition: "OFFER_ID = '" + vars.get("$field.OFFERID") + "' order by ITEMSORT" 
+            }
+        }
+    }
+}
+----
+
+The root element of the object (in this case 'OFFER') defines what module is copied, the condition is used to select the specific dataset.
+'ValueMapping' should be used when some fields need new values (for example the offercode should not be the same as in the copied object).
+You can also set 'SubModules' in order to copy sub-elements like offerItems.
+Now you just have to use the following code:
+
+[source, javascript]
+----
+var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
+
+CopyModuleUtils.openNewModules("Offer", ModulesMapping);
+----
+
+The first line copies the module and the second line opens the newly created dataset.
+
+=== Open it in new-mode first ===
+For this case it needs a few more steps. For values that should be preset in the edit view, you will need to create
+parameters in the entity for every one (set them exposed, triggerRecalculation and not mandatory). After that you have to use these parameters in the valueProcess of the fields
+they should fill. 
+The next step is to create an action that opens the context in new-mode. That could look like this:
+
+[source, javascript]
+----
+var params = {
+    "ContactId_param" : vars.get("$field.CONTACT_ID"),
+    "SalesprojectId_param" : vars.get("$field.SALESPROJECT_ID"),
+    "OfferLanguage_param" : vars.get("$field.LANGUAGE"),
+    "OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
+    "OfferCode_param" : vars.get("$field.OFFERCODE"),
+    "OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
+    "OfferCurrency_param" : vars.get("$field.CURRENCY"),
+    "OfferAddress_param" : vars.get("$field.ADDRESS"),
+    "OfferHeader_param" : vars.get("$field.HEADER")
+}
+neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
+----
+
+Important: There has to be one parameter for the id, so that sub-items can be copied (see the following).
+
+Now we can preset values of the module, but what about related things like offerItems?
+For that we use the same function as in the section above. Because the offerItems should only be copied to the new offer when the user
+saved it, this has to be done in the onInsert-process of the recordcontainer.
+
+[source, javascript]
+----
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
+{
+    var InputMapping = {
+        "OFFERITEM": {
+            condition: "OFFER_ID = '" + vars.getString("$param.OfferOriginal_Id_param") + "' order by ITEMSORT",
+            ValueMapping: {
+                "OFFER_ID" : vars.get("$field.OFFERID")
+            }
+        }
+    };
+    CopyModuleUtils.copyModule(InputMapping);
+}
+----
+
+The offer is already created, so that only offerItem is needed in the 'InputMapping'. The 'condition' should use the id of the offer
+that is copied and in 'ValueMapping' the foreign-key 'OFFER_ID' gets the value of the id of the newly created offer.
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 7fdcc7c68792930a848c0b46a65caf996eb6a9b8..755d9c190519f25facadb77f0c98302f89293b33 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -5,8 +5,8 @@ import("system.db");
 import("Sql_lib");
 
 /**
- * Provides functions for the work with attributes, like setting or getting the value of an attribute
- * or listing the available attributes for a context.
+ * Provides functions for the work with attributes, like
+ * listing the available attributes for a context.
  * Don't instanciate this!
  * 
  * @class
@@ -91,14 +91,55 @@ AttributeUtil.getSimpleAttributeName = function (pAttributeId)
 }
 
 /**
- * gets the value of an attribute for one dataset (e. g. a person)
+ * returns the ids of all subordinated attributes of an attribute
+ * 
+ * @param {String} pAttributeId the id of the attribute
+ * 
+ * @result {String[]} array with the ids of every subordinated attribute
  */
-AttributeUtil.getAttribute = function (pAttributeId, pObjectType, pObjectRowId, pGetIdValue)
+AttributeUtil.getAllChildren = function (pAttributeId)
 {
-    //TODO: implement
+    var childIds = [];
+    var attributes= [pAttributeId];
+    while (attributes.length > 0)
+    {
+        attributes = db.array(db.COLUMN, SqlCondition.begin()
+            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+            .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
+        );
+        if (attributes.length > 0)
+            childIds = childIds.concat(attributes);
+    }
+    return childIds;
+}
+
+/*********************************************************************************************************************/
+
+/**
+ * Provides functions for the work with attributeRelations, getting the value of an attributeRelation for an object.
+ * Don't instanciate this!
+ * 
+ * @class
+ */
+function AttributeRelationUtils () {}
+
+/**
+ * gets the value of an attributeRelation for one dataset (e. g. a person)
+ */
+AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObjectType)
+{
+    var attrCond = SqlCondition().begin()
+        .andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttributeId)
+        .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId);
+    if (pObjectType != null)
+        attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pAttributeId);
+    
+    var attrSql = AttributeRelationUtils.getSqlUtil();
+    var attributeValues = db.array(db.ROW, attrCond.buildSql(attrSql.sqlSelect));
+    return attrSql.getFieldFromType(attributeValues);
 }
 
-AttributeUtil.getAttributes = function ()
+AttributeRelationUtils.getAttributes = function ()
 {
     //TODO: implement maybe
 }
@@ -106,11 +147,62 @@ AttributeUtil.getAttributes = function ()
 /**
  * sets the value of an attribute for one dataset (e. g. a person)
  */
-AttributeUtil.setAttribute = function ()
+AttributeRelationUtils.setAttribute = function ()
 {
     //TODO: implement
 }
 
+/**
+ * Builds an object for the work with the values of attributeRelations. This should make
+ * the attribute type definition more flexible, the returned object has the following properties
+ * and methods:
+ *
+ * columns = array of all database columns in AB_ATTRIBUTERELATION that hold attribute values
+ * typeColMap = object with the attribute type as key and the index in the columns-array with the column holding
+ *      the value for that attribute type as value
+ * sqlSelect = an sql-select string where the columns are the type of the attribute plus the value columns
+ * getFieldFromType = a method that takes a one-dimensional array that has been created with a query using the 'sqlSelect' property
+ *      and returns the value at the right position of that array depending on the type. For example:
+ *                      //type,   values
+ *          vals = ["TEXT", "abcdef", "", "", "", ""];
+ *      the method would return "abcdef", because it looks at the first position where the type is, e. g. "TEXT"
+ *      and then it gets the value at, for example, index 1 because the typeColMap object says that the value for type "TEXT"
+ *      is at position 1.
+ * 
+ */
+AttributeRelationUtils.getSqlUtil = function ()
+{
+    var types = Object.keys($AttributeTypes);
+    var sqlMap = {
+        columns : [],
+        typeColMap : {}
+    };
+    types.forEach(function (type)
+    {
+        var typeKey = type.toString();
+        var colIndex = this.columns.indexOf(type.databaseField);
+        if (colIndex == -1)
+        {
+            colIndex = this.columns.length;
+            this.columns.push(type.databaseField);
+        }
+        this.typeColMap[typeKey] = colIndex;
+    }, sqlMap);
+    
+    sqlMap.sqlSelect = "select ATTRIBUTE_TYPE, " + sqlMap.columns.join(", ") + " from AB_ATTRIBUTERELATION "
+        + " join AB_ATTRIBUTE on AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID ";
+    
+    sqlMap.getFieldFromType = function (pTypeAndValues)
+    {
+        if (pTypeAndValues.length > 0)
+            return pTypeAndValues[this.typeColMap[pTypeAndValues[0]] + 1];
+        return null;
+    }
+    
+    return sqlMap;
+}
+
+/*********************************************************************************************************************/
 
 /**
  * This is used in the AttributeRelation enitiy to make the work with attributes there
@@ -195,6 +287,7 @@ AttributeHandler.prototype.setAttributeValue = function (pValue)
  * should be done in AttributeUtils.
  * The values for each type are:
  * 
+ * keyword = the key of the corresponding keyword
  * contentType = the value that is returned in the contentType process for the attribute
  * databaseField = the database field that holds values of attributes with the type
  * entityField = the field in the AttributeRelation enity that holds the value of the attribute for that type
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index db0117bcd46b02c19229b2f367da8645e88f5ee7..058f498fa6c9b9fbff0404cc52c957ee07fc974c 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,3 +1,5 @@
+import("system.logging");
+import("system.translate");
 import("system.project");
 import("system.vars");
 import("system.SQLTYPES");
@@ -116,10 +118,20 @@ ContextUtils._getSelectMap = function()
 //        "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
         "Offer": [maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10), "OFFER", "OFFERID"],
         "Order": [maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10), "SALESORDER", "SALESORDERID"],
-        "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID"]
+        "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID"],
+        "Task": ["SUBJECT", "TASK", "TASKID", translate.text("Task")]
     }
 }
 
+ContextUtils.getFieldTitle = function(pContextId, pDefault)
+{
+    if (ContextUtils._getSelectMap()[pContextId] != undefined && ContextUtils._getSelectMap()[pContextId].length >= 3)
+        return ContextUtils._getSelectMap()[pContextId][3];
+    
+    return pDefault;
+}
+
+
 /**
  * TODO: !!!temporary function until you can get fields from another Entity!!!
  */
diff --git a/process/Money_lib/Money_lib.aod b/process/Money_lib/Money_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..61248fd244213806e7a23ebd44d8353bed49dc4b
--- /dev/null
+++ b/process/Money_lib/Money_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
+  <name>Money_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/Money_lib/process.js</process>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/Money_lib/process.js b/process/Money_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b59e2d69db667b7904c12747574f8c20ed65ae8
--- /dev/null
+++ b/process/Money_lib/process.js
@@ -0,0 +1,70 @@
+import("system.logging");
+import("system.eMath");
+
+/**
+ * Class containing static utility functions for working with money
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function MoneyUtils() {}
+
+/**
+ * round a price with eMath.ROUND_HALF_UP
+ * @param {Double} pPrice
+ * 
+ * @return rounded price
+ */
+MoneyUtils.round = function(pPrice) 
+{
+    return eMath.roundDec(pPrice, 2, eMath.ROUND_HALF_UP);
+}
+
+/**
+ * get net price
+ * @param {Double} pPrice
+ * @param {Double} [pQuantity=0.0]
+ * @param {Double} [pDiscount=0.0]
+ * 
+ * @return net of price
+ */
+MoneyUtils.getNet = function(pPrice, pQuantity, pDiscount) 
+{
+    pQuantity = pQuantity || 0;
+    pDiscount = pDiscount || 0;
+    return MoneyUtils.round(pPrice * pQuantity * (100 - pDiscount) / 100);
+}
+
+/**
+ * get vat of a price
+ * @param {Double} pVat
+ * @param {Double} pPrice
+ * @param {Double} [pQuantity=0.0]
+ * @param {Double} [pDiscount=0.0]
+ * 
+ * @return vat of price
+ */
+MoneyUtils.getVat = function(pVat, pPrice, pQuantity, pDiscount) 
+{
+    pQuantity = pQuantity || 0;
+    pDiscount = pDiscount || 0;
+    
+    return MoneyUtils.round(pPrice * pQuantity * (100 - pDiscount) / 100 * pVat / 100);
+}
+
+/**
+ * get gross of a price
+ * @param {Double} pVat
+ * @param {Double} pPrice
+ * @param {Double} [pQuantity=0.0]
+ * @param {Double} [pDiscount=0.0]
+ * 
+ * @return gross of price
+ */
+MoneyUtils.getGross = function(pVat, pPrice, pQuantity, pDiscount) {
+    
+    pQuantity = pQuantity || 0;
+    pDiscount = pDiscount || 0;
+    
+    return eMath.addDec(MoneyUtils.getNet(pPrice, pQuantity, pDiscount), MoneyUtils.getVat(pVat, pPrice, pQuantity, pDiscount));
+}
\ No newline at end of file
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index c811a8f7be0193ac7efff4c6f214d742caebbb3d..65e019d7c4c2bc5f6789467daf8e527f652eccab 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -153,6 +153,7 @@ CopyModuleUtils.copyModule = function(pInputMapping)
         var rootModule = Object.keys(pInputMapping)[0];
         var ModuleMapping = _ModuleMapping(rootModule, pInputMapping[rootModule]);
         var ModuleData = _getModuleData(rootModule, pInputMapping[rootModule].condition);
+        ModulesMapping[rootModule] = ModuleMapping;
 
         for(var row in ModuleData)
         {
@@ -282,7 +283,7 @@ CopyModuleUtils.copyModule = function(pInputMapping)
                 case "OFFERITEM":
                 {
                     //OFFER_ID mappen
-                    if(ModuleRowMapping.ParentModuleMapping.name == "OFFER")
+                    if(ModuleRowMapping.ParentModuleMapping != null && ModuleRowMapping.ParentModuleMapping.name == "OFFER")
                     {
                         ModuleRowMapping.ColumnMapping["OFFER_ID"].newValue = ModulesMapping[ModuleRowMapping.ParentModuleMapping.name].DataRows[ModuleRowMapping.ColumnMapping["OFFER_ID"].oldValue].newPrimaryKey;
                     }
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index cb1dc57b42c964b43850f223dfaee60a8aff5789..d96c87ce756caa5319eac5ad3ddba88aa09625e1 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -6,6 +6,7 @@ import("system.util");
 import("system.eMath");
 import("system.db");
 import("Product_lib");
+import("Money_lib");
 
 /**
  * Abstract class that provides methods for dealing with offer / order items.
@@ -163,8 +164,8 @@ ItemUtils.prototype.getNetAndVat = function(itemIds) {
 
     for (var i = 0; i < orderItems.length; i++)
     {
-        sum += this.getItemSum(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][4]);
-        vat += this.getItemVAT(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][3], orderItems[i][4]);
+        sum = eMath.addDec(sum, this.getItemSum(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][4]));
+        vat = eMath.addDec(vat, this.getItemVAT(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][3], orderItems[i][4]));
     }
 
     return [sum, vat];
@@ -200,33 +201,33 @@ ItemUtils.prototype.initItemTree = function() {
 /**
  * @abstract
  */
-ItemUtils.prototype.getItemSum = function(quantity, price, discount, optional) {
-    quantity = quantity || 0;
-    price = price || 0;
-    discount = discount || 0;
+ItemUtils.prototype.getItemSum = function(pQuantity, pPrice, pDiscount, pOptional) {
+    pQuantity = pQuantity || 0;
+    pPrice = pPrice || 0;
+    pDiscount = pDiscount || 0;
 
-    return optional ? (parseFloat(quantity) * parseFloat(price) * ((100 - parseFloat(discount)) / 100))
+    return pOptional == "0" ? (MoneyUtils.getNet(parseFloat(pPrice), parseFloat(pQuantity), parseFloat(pDiscount)))
                     : 0;
 }
 
 /**
  * @abstract
  */
-ItemUtils.prototype.getItemVAT = function(quantity, price, discount, vat, optional) {
-    quantity = quantity || 0;
-    price = price || 0;
-    discount = discount || 0;
-    vat = vat || 0;
-
-    return optional ? (parseFloat(quantity) * parseFloat(price) * ((100 - parseFloat(discount)) / 100) * (parseFloat(vat) / 100)) 
+ItemUtils.prototype.getItemVAT = function(pQuantity, pPrice, pDiscount, pVat, pOptional) {
+    pQuantity = pQuantity || 0;
+    pPrice = pPrice || 0;
+    pDiscount = pDiscount || 0;
+    pVat = pVat || 0;
+    logging.log(pOptional.toSource())
+    return pOptional == "0" ? (MoneyUtils.getVat(parseFloat(pVat), parseFloat(pPrice), parseFloat(pQuantity), parseFloat(pDiscount))) 
                     : 0;
 }
 
 /**
  * @abstract
  */
-ItemUtils.prototype.roundPrice = function(price) {
-    return eMath.roundDec(price, 2, eMath.ROUND_HALF_UP);
+ItemUtils.prototype.roundPrice = function(pPrice) {
+    return MoneyUtils.round(pPrice);
 }
 
 /**
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 6f7515d1036833af71835a986d51e50568178501..716a56fb2ae06122dde7cf8903132805185f100f 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -13,6 +13,7 @@ import("Product_lib");
 import("Report_lib");
 import("OfferOrder_lib");
 import("PostalAddress_lib");
+import("Neon_lib");
 
 /**
  * Methods used by Offer.
@@ -273,6 +274,54 @@ OfferUtils.openOfferReport = function(pOfferID)
     offerReport.openReport();
 }
 
+/**
+ * opens an offer in NEW mode with values from an offer
+ * 
+ * @param pOfferId {String} id of the offer
+ * @param pContactId {String} contact id
+ * @param pLanguage {String} language
+ * @param pCurrency {String} [currency=""]
+ * @param pHeader {String} [header=""]
+ */
+OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader)
+{
+    var params = {
+        "ContactId_param" : pContactId,
+        "OfferLanguage_param" : pLanguage,
+        "OfferOriginal_Id_param" : pOfferId,
+        "OfferCurrency_param" : pCurrency || "",
+        "OfferHeader_param" : pHeader || ""
+    };
+    neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/**
+ * copies all offerItems from one offer to another
+ * 
+ * @param {String} pSourceOfferId
+ * @param {String} pTargetOfferId
+ */
+OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
+{
+    var InputMapping = {
+        "OFFERITEM": {
+            condition: "OFFER_ID = '" + pSourceOfferId + "' order by ITEMSORT",
+            ValueMapping: {
+                "OFFER_ID" : pTargetOfferId
+            }
+        }
+    };
+    CopyModuleUtils.copyModule(InputMapping);
+    
+    var oiUtils = new OfferItemUtils(pTargetOfferId);
+    
+    //update order price
+    cols = ["NET", "VAT"];
+    var vals = oiUtils.getNetAndVat();
+    
+    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", pTargetOfferId, "1 = 2"));
+}
+
 /**
  * opens an order in NEW mode with values from an offer
  * 
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 0c927b0ed370eb84461c5b0d40ee5c5b69f1a08e..818de7d7027bb5c0994fe4ae5743764e5a69c31f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -82,62 +82,36 @@ OrderUtils.createNewOrder = function(pSalesprojectId, pRelationId)
  * 
  * @param {String} pOfferId the offer to get the items from
  * @param {String} pOrderId the order to create the items for
- * 
- * @return {Number[]} Array with the ids of the inserted orderItems
  */
 OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
 {
-    var cols = [
-        "UNIT", 
-        "QUANTITY", 
-        "GROUPCODEID", 
-        "ASSIGNEDTO", 
-        "PRICE", 
-        "ITEMSORT", 
-        "PRODUCT_ID", 
-        "VAT", 
-        "ITEMNAME", 
-        "OPTIONAL", 
-        "DISCOUNT", 
-        "ITEMPOSITION", 
-        "INFO"
-    ];
-    var offerItemSql = SqlCondition.begin()
-        .andPrepare("OFFERITEM.OFFER_ID", pOfferId)
-        .buildSql("select " + cols.concat(["OFFERITEMID"]).join(", ") + " from OFFERITEM", "1=0");
-    var offerItems = db.table(offerItemSql);
-
-    var table = "SALESORDERITEM";
-    cols = cols.concat(["SALESORDERITEMID", "SALESORDER_ID"]);
-    var types = db.getColumnTypes(table, cols);
-    
-    //the rows need new UIDs, but because items can be related over ASSIGNEDTO, ASSIGNEDTO must also be 
-    //changed to the newly generated id of the parent item, so the "oldId : newId" pairs have to be stored
-    //to set ASSIGNEDTO correctly
-    var idMap = {}; 
-    
-    var toInsert = [];
-    while (offerItems.length > 0)
-        for (let i = 0; i < offerItems.length; i++)
-        {
-            var row = offerItems[i];
-            
-            //checks if the parent attribute has already been put into the insert-array,
-            //otherwise the foreign-key ASSIGNEDTO could have the id of a row that hasn't been inserted yet
-            // -> toInsert needs to be in the correct order
-            if (row[3] == "" || row[3] in idMap)
-            {
-                row[3] = idMap[row[3]] || "";
-                var newId = util.getNewUUID();
-                idMap[row[13]] = newId;
-                row[13] = newId; //replace the UID
-                toInsert.push([table, cols, types, row.concat([pOrderId])]);
-                offerItems.splice(i, 1); //remove the row from offerItems
-                i--;
+    var InputMapping = {
+        "OFFERITEM": {
+            destinationModuleName : "SALESORDERITEM",
+            DestinationColumnMapping : {
+                "OFFERITEMID" : "SALESORDERITEMID",
+                "ITEMPOSITION" : "ITEMPOSITION", 
+                "GROUPCODEID" : "GROUPCODEID", 
+                "OFFER_ID" : "SALESORDER_ID",
+                "ASSIGNEDTO" : "ASSIGNEDTO", 
+                "PRODUCT_ID" : "PRODUCT_ID", 
+                "QUANTITY" : "QUANTITY", 
+                "ITEMSORT" : "ITEMSORT", 
+                "ITEMNAME" : "ITEMNAME", 
+                "OPTIONAL" : "OPTIONAL", 
+                "DISCOUNT" : "DISCOUNT", 
+                "PRICE" : "PRICE", 
+                "UNIT" : "UNIT", 
+                "INFO" : "INFO",
+                "VAT" : "VAT"
+            },
+            condition: "OFFER_ID = '" + pOfferId + "' order by ITEMSORT",
+            ValueMapping: {
+                "OFFER_ID" : pOrderId
             }
         }
-    
-    db.inserts(toInsert);
+    };
+    CopyModuleUtils.copyModule(InputMapping);
     
     var oiUtils = new OrderItemUtils(pOrderId);
     
@@ -146,11 +120,6 @@ OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
     var vals = oiUtils.getNetAndVat();
     
     db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", pOrderId, "1 = 2"));
-    
-    return Object.keys(idMap).map(function (id) 
-    {
-        return idMap[id];
-    });
 }
 
 
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index 3ca5cd3d006d00d888830cf349654874a82ee57d..479848b10d7f01270ceddc1a6456d9a040897b96 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -56,7 +56,7 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
             [util.getNewUUID(), salesprojectId, type, value, vars.get("$sys.date")]);
             
         if (notifyForecast) {
-            this.notifyToUpdateForecast()
+            Salesproject.notifyToUpdateForecast()
         }
         return true;
     }
diff --git a/process/Timetracking_lib/process.js b/process/Timetracking_lib/process.js
index 664d6574bedc18c220cea42395ecf787791d5e83..d2128cd195542977845b87086fe6bc0da1f74520 100644
--- a/process/Timetracking_lib/process.js
+++ b/process/Timetracking_lib/process.js
@@ -44,4 +44,19 @@ Timetracking.createNewTimeTracking = function (pRowId)
     };
     
     neon.openContext("Timetracking", null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/*
+ * converts minutes tho hours and minuets. e.g. 105 to 1:45
+ * 
+ * @param {integer} pMinutes req 
+ * 
+ * @return {String} Hours:Minutes
+ */
+Timetracking.minutesToReadableHour = function(pMinutes) 
+{
+    var timeHour = parseInt(pMinutes / 60);
+    var minutes = parseInt(pMinutes % 60);
+    
+    return "" + timeHour + ":" + ((minutes <= 9) ? "0" + minutes : minutes);
 }
\ No newline at end of file