diff --git a/PRG_talk-Layers.jpg b/PRG_talk-Layers.jpg
index e359e92922eb3169df2345bd91ac073cfba0192e..44c8cbe058e50fc8cdd232af934698bf19b1cba3 100644
Binary files a/PRG_talk-Layers.jpg and b/PRG_talk-Layers.jpg differ
diff --git a/README.md b/README.md
index 2b57b4ee6eca7a61331f93d71aa7458c0236a752..bbc4dc0df4e9d034de57c76840c9912385d356f7 100644
--- a/README.md
+++ b/README.md
@@ -8,19 +8,46 @@ This repository is a centralized version of architecture for IPos software (Indo
     - [diagram](https://drive.google.com/file/d/12oIwl0zkeT2bsS8MUbbtSgFbbirG8Sz1/view?usp=sharing)
 
 
-## How to run?
+## 1. How to run? General 
 
 1. Start [hivemq](http://www.hivemq.com/demos/websocket-client/). It's a client for an external test MQTT-broker.
     1. Establish a connection with the standard parameters (WS coonection).
     2. Add new subscriptions with `Add New Topic Subscription` button
-        - `test51/subscribe/positions`: responses
-        - `test51/publish/positions`: requests
+        - `ipos52/user/position`: responses
+        - `ipos52/sensor/measurement/position`: requests
 2. Start Spring boot project from this repository
     - from console (`./gradlew bootRun`) or your favorite IDE
 3. Return to a web-browser tab with an external MQTT client
-    1. Send valid json representation of position in `test51/publish/positions` topic
+    1. Send valid json representation of position in `ipos52/sensor/measurement/position` topic
         - Message example: `{"x": 3.0,"y": 2.0,"z": 3.0,"accuracy": 0.9}`
-    2. If successful, the same message should come from `test51/subscribe/positions` topic.
+    2. If successful, the same message should come from `ipos52/user/position` topic.
+
+
+## 2. 🚧 How to run? Demo
+
+### Topics
+- `ipos52/user/monitoring-request`
+  - Monitoring requests from users
+  - Example:
+    - ```json
+      {
+        "frameId": "frame-1",
+        "delta": 0.1,
+        "updateFrequency": 0.1,
+        "type": ["ROBOT"],
+        "id": ["obj-123"],
+        "fusionStrategy": "f-strategy",
+        "exit_notification": false,
+        "properties": ["prop-1"],
+        "monitoringTaskId": "mon-id-1234",
+        "requestorProtocol": "MQTT"
+      }
+      ```
+    - should be valid for `IposMonitoringRequest` from `SimpleScene.proto`
+- `ipos52/sensor/measurement/position`
+- `ipos52/user/position`
+- `local/user/monitoring-request`
+- `local/user/position`
 
 
 ![](demo.v1.jpg)
@@ -33,7 +60,16 @@ This repository is a centralized version of architecture for IPos software (Indo
   - [ ] TODO: fix database schema
 
 
+### Notes
+- MQTT
+  - Ensure topic levels only use lowercase letters, numbers, and dashes. Customers should avoid camel casing and using hard to debug characters such as spaces [5].
+  - Topic's names. From general to specific [5].
+
+    
 ## Links
-- [Messaging with JMS](https://spring.io/guides/gs/messaging-jms/)
-- [Using WebSocket to build an interactive web application](https://spring.io/guides/gs/messaging-stomp-websocket/)
-- [Java Message Service API via Apache ActiveMQ Classic](https://spring.io/guides/gs/messaging-jms/)
+
+1. [Messaging with JMS](https://spring.io/guides/gs/messaging-jms/)
+2. [Using WebSocket to build an interactive web application](https://spring.io/guides/gs/messaging-stomp-websocket/)
+3. [Java Message Service API via Apache ActiveMQ Classic](https://spring.io/guides/gs/messaging-jms/)
+4. [MQTT Topics & Best Practices](https://www.hivemq.com/blog/mqtt-essentials-part-5-mqtt-topics-best-practices/)
+5. [MQTT Design Best Practices](https://docs.aws.amazon.com/whitepapers/latest/designing-mqtt-topics-aws-iot-core/mqtt-design-best-practices.html)
\ No newline at end of file
diff --git a/demo.v1.jpg b/demo.v1.jpg
index 537e669ef7ce5c8d943d074cd9be1f7d2c7b4d8d..252affd7f99d314f49724b78c4dc7313488fb26f 100644
Binary files a/demo.v1.jpg and b/demo.v1.jpg differ
diff --git a/emf_datamodel/META-INF/MANIFEST.MF b/emf_datamodel/META-INF/MANIFEST.MF
index 0477ff71b166ba9357eb1e253c5467b79fe0f7b1..c26b79fe896aaffda754e703ad558662b5ea2401 100644
--- a/emf_datamodel/META-INF/MANIFEST.MF
+++ b/emf_datamodel/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: ipos.project.DataModellntegration.iPos_Datamodel,
- ipos.project.DataModellntegration.iPos_Datamodel.impl,
- ipos.project.DataModellntegration.iPos_Datamodel.util
+Export-Package: ipos.project.data.datamodel,
+ ipos.project.data.datamodel.impl,
+ ipos.project.data.datamodel.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/emf_datamodel/plugin.xml b/emf_datamodel/plugin.xml
index 0cd6dff1645466b194dacefd34b051157a83c48a..d4d0499fc8e21ec61a4818f76290e17a013c3bd4 100644
--- a/emf_datamodel/plugin.xml
+++ b/emf_datamodel/plugin.xml
@@ -10,7 +10,7 @@
       <!-- @generated iPos_Datamodel -->
       <package
             uri="http://www.example.org/iPos_Datamodel"
-            class="ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage"
+            class="ipos.project.data.datamodel.IPos_DatamodelPackage"
             genModel="model/iPos_Datamodel.genmodel"/>
    </extension>
 
diff --git a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java
index f8468f55fff11e24e8737c7fa2356ac8d2b688a4..f8c74993d99ada57b304bc9fdc23b638412862d4 100644
--- a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java
+++ b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/SimpleSceneIntegration.java
@@ -2,7 +2,7 @@ package ipos.project.DataModellntegration.SimpleSceneIntegration;
 
 import ipos.models.SimpleScene.IposPosition;
 import ipos.project.DataModellntegration.SimpleSceneIntegration.service.impl.ExternalPubServiceImpl;
-import ipos.project.mapper.ProtoJsonMap;
+import ipos.project.mapper.ProtoMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,13 +16,13 @@ public class SimpleSceneIntegration {
     @Autowired
     private ExternalPubServiceImpl mqttService;
 
-    @JmsListener(destination = "/positions", containerFactory = "jmsListenFactory")
+    @JmsListener(destination = "local/user/position", containerFactory = "jmsListenFactory")
     public void receiveMessage(IposPosition pos) {
         LOG.trace("Data integration get: " + pos);
         // we can translate a class into a string using several methods: 1) `.toString()` 2) `JsonFormat` in `ProtoJsonMap`
-        String jsonPos = ProtoJsonMap.toJson(pos);
+        String jsonPos = ProtoMapper.toJson(pos);
         if (jsonPos != null) {
-            this.mqttService.publish("test51/subscribe/positions", jsonPos, 0, false);
+            this.mqttService.publish("ipos52/user/position", jsonPos, 0, false);
         }
     }
 }
diff --git a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/api/MqttRequestHandler.java b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/api/MqttRequestHandler.java
index 0b451171c166a8aacf01d685ba9e632e2e78a65a..bf30315f3dd914d1c11847fcb59aaf36d8810332 100644
--- a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/api/MqttRequestHandler.java
+++ b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/api/MqttRequestHandler.java
@@ -2,8 +2,8 @@ package ipos.project.DataModellntegration.SimpleSceneIntegration.api;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import ipos.models.SimpleScene.IposMonitoringRequest;
-import ipos.project.DataModellntegration.SimpleSceneIntegration.service.SimpleSceneTransformer;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest;
+import ipos.project.mapper.DataModelMapper;
+import ipos.project.data.datamodel.MonitoringRequest;
 import ipos.project.config.mqtt.Handler;
 import ipos.project.config.mqtt.MqttListener;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
@@ -12,9 +12,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.core.JmsTemplate;
 
-
-// subscribe to the topic. It's example
-@MqttListener("usertopic/IposMonitoringRequest")
+@MqttListener("ipos/user/monitoring-request")
 public class MqttRequestHandler implements Handler {
 
     private final Logger LOG = LoggerFactory.getLogger(getClass());
@@ -31,10 +29,10 @@ public class MqttRequestHandler implements Handler {
             IposMonitoringRequest monReqProto = IposMonitoringRequest.parseFrom(message.getPayload());
             LOG.info("IposMonitoringRequest received: \n"
                     + monReqProto.toString());
-            MonitoringRequest monReqInternal = SimpleSceneTransformer.monReq_SScene2Internal(monReqProto);
+            MonitoringRequest monReqInternal = DataModelMapper.toEntity(monReqProto);
             // TODO: send request via JMS to MonitoringController
 
-            this.jmsTemplate.convertAndSend("/request123", monReqInternal); // submit request to the internal broker
+            this.jmsTemplate.convertAndSend("local/user/monitoring-request", monReqInternal); // submit request to the internal broker
         } catch (InvalidProtocolBufferException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java b/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java
deleted file mode 100644
index 1924476217ce2c45e6b35e561506774d494471e8..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/DataModellntegration/SimpleSceneIntegration/service/SimpleSceneTransformer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package ipos.project.DataModellntegration.SimpleSceneIntegration.service;
-
-import ipos.models.SimpleScene;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelFactory;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest;
-import com.google.protobuf.ProtocolStringList;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SimpleSceneTransformer {
-
-    private static IPos_DatamodelFactory modelFactory = IPos_DatamodelFactory.eINSTANCE;
-
-    public static MonitoringRequest monReq_SScene2Internal(SimpleScene.IposMonitoringRequest monReqProto){
-        MonitoringRequest monReqInt = modelFactory.createMonitoringRequest();
-        monReqInt.setFrameId(monReqProto.getFrameId());
-        monReqInt.setDelta(monReqProto.getDelta());
-        monReqInt.setUpdateFrequency(monReqProto.getUpdateFrequency());
-        monReqInt.setType(toJavaStringList(monReqProto.getTypeList()));
-        monReqInt.setId(toJavaStringList(monReqProto.getIdList()));
-        monReqInt.setFusionStrategy(monReqProto.getFusionStrategy());
-        monReqInt.setExitNotification(monReqProto.getExitNotification());
-        monReqInt.setProperties(monReqProto.getPropertiesList());
-        monReqInt.setMonitoringTaskId(monReqProto.getMonitoringTaskId());
-        monReqInt.setRequestorProtocol(monReqProto.getRequestorProtocol());
-        return monReqInt;
-    }
-
-    private static List<String> toJavaStringList(ProtocolStringList protoList){
-        List<String> javaList = new ArrayList<String>();
-        for(int i = 0; i < protoList.size(); i++ ){
-            javaList.set(i, protoList.get(i));
-        }
-        return javaList;
-    }
-
-    public static SimpleScene.IposMonitoringRequest monReq_Internal2SScene(){
-        return null;
-    }
-
-}
diff --git a/src/main/java/ipos/project/Functionality/Odometry.java b/src/main/java/ipos/project/Functionality/Odometry.java
index 876404b2bddfcf033b08d69afcbc08286e7f077f..4bf2000ebb97739a5a8816396a3408c85ab4620f 100644
--- a/src/main/java/ipos/project/Functionality/Odometry.java
+++ b/src/main/java/ipos/project/Functionality/Odometry.java
@@ -11,8 +11,8 @@ public class Odometry {
     private final Logger LOG = LoggerFactory.getLogger(getClass());
 
     //TODO
-//    @JmsListener(destination = "/positions123", containerFactory = "myFactory")
-//    public void receiveMessage(IposPosition pos) {
-//        LOG.info("Odometry <" + pos + ">");
+//    @JmsListener(destination = "local/user/measurements/imu", containerFactory = "jmsListenFactory")
+//    public void receiveMessage(Imu mess) {
+//        LOG.info("Odometry <" + mess + ">");
 //    }
 }
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/Cell/Quaternion.java b/src/main/java/ipos/project/Functionality/eventfilter/Cell/Quaternion.java
deleted file mode 100644
index 60d1f5068efafa83813bc434053431b06f974c6e..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/Cell/Quaternion.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package ipos.project.Functionality.eventfilter.Cell;
-
-public final class Quaternion {
-    private double x;
-    private double y;
-    private double z;
-    private double w;
-    //private float[] matrixs;
-
-    public Quaternion(final Quaternion q) {
-        this(q.x, q.y, q.z, q.w);
-    }
-
-    public Quaternion(double x, double y, double z, double w) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.w = w;
-    }
-
-    public void set(final Quaternion q) {
-        //matrixs = null;
-        this.x = q.x;
-        this.y = q.y;
-        this.z = q.z;
-        this.w = q.w;
-    }
-
-    public Quaternion(Vector3 axis, double angle) {
-        set(axis, angle);
-    }
-
-    public double norm() {
-        return Math.sqrt(dot(this));
-    }
-
-    public double getW() {
-        return w;
-    }
-
-    public double getX() {
-        return x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public double getZ() {
-        return z;
-    }
-
-    /**
-     * @param axis
-     *            rotation axis, unit vector
-     * @param angle
-     *            the rotation angle
-     * @return this
-     */
-    public Quaternion set(Vector3 axis, double angle) {
-        //matrixs = null;
-        double s = Math.sin(angle / 2);
-        w = Math.cos(angle / 2);
-        x = axis.getX() * s;
-        y = axis.getY() * s;
-        z = axis.getZ() * s;
-        return this;
-    }
-
-    public Quaternion mulThis(Quaternion q) {
-        //matrixs = null;
-        double nw = w * q.w - x * q.x - y * q.y - z * q.z;
-        double nx = w * q.x + x * q.w + y * q.z - z * q.y;
-        double ny = w * q.y + y * q.w + z * q.x - x * q.z;
-        z = w * q.z + z * q.w + x * q.y - y * q.x;
-        w = nw;
-        x = nx;
-        y = ny;
-        return this;
-    }
-
-    public Quaternion scaleThis(double scale) {
-        if (scale != 1) {
-            //matrixs = null;
-            w *= scale;
-            x *= scale;
-            y *= scale;
-            z *= scale;
-        }
-        return this;
-    }
-
-    public Quaternion divThis(double scale) {
-        if (scale != 1) {
-            //matrixs = null;
-            w /= scale;
-            x /= scale;
-            y /= scale;
-            z /= scale;
-        }
-        return this;
-    }
-
-    public double dot(Quaternion q) {
-        return x * q.x + y * q.y + z * q.z + w * q.w;
-    }
-
-    public boolean equals(Quaternion q) {
-        return x == q.x && y == q.y && z == q.z && w == q.w;
-    }
-
-    public Quaternion interpolateThis(Quaternion q, double t) {
-        if (!equals(q)) {
-            double d = dot(q);
-            double qx, qy, qz, qw;
-
-            if (d < 0f) {
-                qx = -q.x;
-                qy = -q.y;
-                qz = -q.z;
-                qw = -q.w;
-                d = -d;
-            } else {
-                qx = q.x;
-                qy = q.y;
-                qz = q.z;
-                qw = q.w;
-            }
-
-            double f0, f1;
-
-            if ((1 - d) > 0.1f) {
-                double angle = (double) Math.acos(d);
-                double s = (double) Math.sin(angle);
-                double tAngle = t * angle;
-                f0 = (double) Math.sin(angle - tAngle) / s;
-                f1 = (double) Math.sin(tAngle) / s;
-            } else {
-                f0 = 1 - t;
-                f1 = t;
-            }
-
-            x = f0 * x + f1 * qx;
-            y = f0 * y + f1 * qy;
-            z = f0 * z + f1 * qz;
-            w = f0 * w + f1 * qw;
-        }
-
-        return this;
-    }
-
-    public Quaternion normalizeThis() {
-        return divThis(norm());
-    }
-
-    public Quaternion interpolate(Quaternion q, double t) {
-        return new Quaternion(this).interpolateThis(q, t);
-    }
-
-    /**
-     * Converts this Quaternion into a matrix, returning it as a float array.
-     */
-    public float[] toMatrix() {
-        float[] matrixs = new float[16];
-        toMatrix(matrixs);
-        return matrixs;
-    }
-
-    /**
-     * Converts this Quaternion into a matrix, placing the values into the given array.
-     * @param matrixs 16-length float array.
-     */
-    public final void toMatrix(float[] matrixs) {
-        matrixs[3] = 0.0f;
-        matrixs[7] = 0.0f;
-        matrixs[11] = 0.0f;
-        matrixs[12] = 0.0f;
-        matrixs[13] = 0.0f;
-        matrixs[14] = 0.0f;
-        matrixs[15] = 1.0f;
-
-        matrixs[0] = (float) (1.0f - (2.0f * ((y * y) + (z * z))));
-        matrixs[1] = (float) (2.0f * ((x * y) - (z * w)));
-        matrixs[2] = (float) (2.0f * ((x * z) + (y * w)));
-
-        matrixs[4] = (float) (2.0f * ((x * y) + (z * w)));
-        matrixs[5] = (float) (1.0f - (2.0f * ((x * x) + (z * z))));
-        matrixs[6] = (float) (2.0f * ((y * z) - (x * w)));
-
-        matrixs[8] = (float) (2.0f * ((x * z) - (y * w)));
-        matrixs[9] = (float) (2.0f * ((y * z) + (x * w)));
-        matrixs[10] = (float) (1.0f - (2.0f * ((x * x) + (y * y))));
-    }
-
-}
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/Cell/Vector3.java b/src/main/java/ipos/project/Functionality/eventfilter/Cell/Vector3.java
deleted file mode 100644
index d28b8cea245c56be50962f34c65096a137be9504..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/Cell/Vector3.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package ipos.project.Functionality.eventfilter.Cell;
-
-public class Vector3 {
-    private double x,y,z;
-
-    public double getX() {
-        return x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public double getZ() {
-        return z;
-    }
-
-    public Vector3(double ix, double iy, double iz) {
-        x = ix;
-        y = iy;
-        z = iz;
-    }
-
-    public void sub(Vector3 ref) {
-        x = x - ref.getX();
-        y = y - ref.getY();
-        z = z - ref.getZ();
-    }
-
-    public void set(double ix, double iy, double iz) {
-        x = ix;
-        y = iy;
-        z = iz;
-    }
-
-    public double magnitude() {
-        return Math.sqrt(x*x+y*y+z*z);
-    }
-
-    public void multiply(double f) {
-        x *= f;
-        y *= f;
-        z *= f;
-    }
-
-    public void normalise() {
-        double mag = magnitude();
-        x /= mag;
-        y /= mag;
-        z /= mag;
-    }
-}
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/TestEventFilter.java b/src/main/java/ipos/project/Functionality/eventfilter/TestEventFilter.java
deleted file mode 100644
index 050002bef3441a0886ac4bb0d59b62d0a0acf724..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/TestEventFilter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package ipos.project.Functionality.eventfilter;
-
-import ipos.project.Functionality.eventfilter.*;
-import ipos.project.DataModellntegration.iPos_Datamodel.*;
-import org.springframework.stereotype.Component;
-
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-
-// --- Internal data model
-
-@Component
-public class TestEventFilter {
-    public static void test() throws ParseException {
-        IPos_DatamodelFactory datamodelFactory = IPos_DatamodelFactory.eINSTANCE;
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
-        //HashMap events = new HashMap<String, String>();
-        PositionEvent testPositionEvent = datamodelFactory.createPositionEvent();
-        Placing testPlacing = datamodelFactory.createPlacing();
-        LocalizableObject testLObject = datamodelFactory.createLocalizableObject();
-        PositionSensor testPSensor = datamodelFactory.createPositionSensor();
-        RelativePosition testPosition = datamodelFactory.createRelativePosition();
-        Point3D testPoint3D = datamodelFactory.createPoint3D();
-
-        eventFilter filter = new eventFilter();
-        EventFilterCondition config = datamodelFactory.createEventFilterCondition();
-        String jsonPath = System.getProperty("user.dir") + "\\src\\main\\java\\ipos\\project\\Functionality\\eventfilter\\configExample.json"; //assign your JSON file here
-		
-		try {
-            readConfig.readFilterConfigFromJson(jsonPath, config);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        readConfig.printFilterConfig(config);
-        filter.init(config);
-
-        String message = "";
-        /* events.put(tagNames.tagTime,"2021-07-05 14:09:03.591");
-        events.put(tagNames.tagDriverID,"driverid");
-        events.put(tagNames.tagObjectID,"AGV001");
-        events.put(tagNames.category, "AGV");
-        events.put(tagNames.tagSensorID, "UWB");
-        events.put(tagNames.tagPositionTechnology,"positiontech");
-        events.put(tagNames.tagCoordinateSystem,"coordsys");
-        events.put(tagNames.tagX,"1.34");
-        events.put(tagNames.tagY,"2.456");
-        events.put(tagNames.tagZ, "1");
-        events.put(tagNames.tagAccuracy,"0.15"); */
-        testPoint3D.setX((float) 3.34);
-        testPoint3D.setY((float) 2.656);
-        testPoint3D.setZ((float) 2);
-        testPosition.setPoint(testPoint3D);
-        testPlacing.setPosition(testPosition);
-        testLObject.setId("AGV001");
-        testLObject.setType("AGV");
-        testPSensor.setType("UWB");
-        testLObject.setPSensor(testPSensor);
-        testPlacing.setLObject(testLObject);
-        testPositionEvent.setTimeStamp("2021-07-05 14:09:03.591");
-        testPositionEvent.setPlacing(testPlacing);
-        System.out.println("Filter result " + ": " + filter.process(testPositionEvent));
-    }
-}
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/configExample.json b/src/main/java/ipos/project/Functionality/eventfilter/configExample.json
deleted file mode 100644
index f2f452991ffd8ffdb0ec83791d5747862f1cd1dd..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/configExample.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "time_condition": [
-    ["2021-07-05 14:09:03.591", "2021-07-06 14:09:03.591"],
-    ["2018-09-05 14:00:00.000", "2018-09-05 15:00:00.000"]
-  ],
-  "category_condition": [
-    "human",
-    "AGV"
-  ],
-  "id_condition": [
-    "AGV001"
-  ],
-  "sensor_id_condition": [
-    "UWB*",
-    "SLAM*"
-  ],
-  "accuracy_condition": [
-    0.5
-  ],
-  "position_condition": [
-    [2, 3, 1, 1],
-    [1, 2, 1, 1]
-  ],
-  "time_min_interval": [
-    1000
-  ],
-  "position_delta": [
-    1
-  ],
-  "position_condition_cell": [
-    [[1, 2, 3], [4, 5, 6], [7, 8, 9, 10]],
-    [[11, 12, 13], [14, 15, 16], [17, 18, 19, 20]]
-  ]
-}
\ No newline at end of file
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/eventFilter.java b/src/main/java/ipos/project/Functionality/eventfilter/eventFilter.java
deleted file mode 100644
index f75f81c49a27e58c68f5577bc319cbe734f37ea0..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/eventFilter.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package ipos.project.Functionality.eventfilter;
-
-import ipos.project.Functionality.eventfilter.Cell.Quaternion;
-import ipos.project.Functionality.eventfilter.Cell.Vector3;
-import ipos.project.DataModellntegration.iPos_Datamodel.*;
-
-import java.sql.Timestamp;
-import java.lang.Math;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-public class eventFilter {
-    private boolean[] filterStructure;
-    //
-    private PositionEvent last_position_event;
-
-    {
-        filterStructure = new boolean[9];
-    }
-
-    //Conditions: unique conditions are defined as single values, Parallel conditions are defined in lists.
-    //initial value: 0 (for float and int) and empty (for arrays), it's not always possible to determine the status of the filter with just the condition value, so a filterStructure is defined to register which conditions are active.
-
-    private ArrayList<String[]> timeCondition;
-    private List<String> categoryCondition;
-    private List<String> sensorIdCondition;
-    private List<String> idCondition;
-    private float accuracyCondition;
-    private ArrayList<Float[]> positionCondition;
-    private int timeMinInterval;
-    private float positionDelta;
-    private ArrayList<Float[][]> positionConditionCell;
-
-    public void init(EventFilterCondition conf) {
-        filterStructure = conf.getFilterStructure();
-        timeCondition = conf.getTimeCondition();
-        categoryCondition = conf.getCategoryCondition();
-        sensorIdCondition = conf.getSensorIdCondition(); //regular expression of match condition
-        idCondition = conf.getIdCondition();
-        accuracyCondition = conf.getAccuracyCondition();
-        positionCondition = conf.getPositionCondition();
-        timeMinInterval = conf.getTimeMinInterval();
-        positionDelta = conf.getPositionDelta();
-        positionConditionCell = conf.getPositionConditionCell();
-    }
-
-    private static String createRegexFromGlob(String glob) {
-        StringBuilder out = new StringBuilder("^");
-        for(int i = 0; i < glob.length(); ++i) {
-            final char c = glob.charAt(i);
-            switch(c) {
-                case '*': out.append(".*"); break;
-                case '?': out.append('.'); break;
-                case '.': out.append("\\."); break;
-                case '\\': out.append("\\\\"); break;
-                default: out.append(c);
-            }
-        }
-        out.append('$');
-        return out.toString();
-    }
-    
-    private static float cal_distance(Point3D cod1, Point3D cod2){
-        float dx = Math.abs(cod1.getX() - cod2.getX());
-        float dy = Math.abs(cod1.getY() - cod2.getY());
-        float dz = Math.abs(cod1.getZ() - cod2.getZ());
-        return (float) Math.hypot(Math.hypot(dx, dy), dz);
-    }
-
-    private static boolean is_in_cell(Point3D cod, Float[] ref, Float[] size, Float[] rot){
-        if ((Math.abs(cod.getX()-ref[0])<= size[0]/2) && (Math.abs(cod.getY()-ref[1])<= size[1]/2) && (Math.abs(cod.getZ()-ref[2])<= size[2]/2)) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    public boolean process(PositionEvent event) throws ParseException {
-        IPos_DatamodelFactory dataModelFactory = IPos_DatamodelFactory.eINSTANCE;
-        boolean flag = false; //false for pass, true for block
-        System.out.println("Filter structure: " + filterStructure[0] + ", " + filterStructure[1] + ", " + filterStructure[2] + ", " + filterStructure[3] + ", " + filterStructure[4] + ", " + filterStructure[5] + ", " + filterStructure[6] + ", " + filterStructure[7]);
-        //filter time conditions
-        if (filterStructure[0]) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            System.out.println("Time condition: " + timeCondition);
-            for (int i = 0; i < timeCondition.size(); i++) {
-                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-                Date date = formatter.parse(event.getTimeStamp());
-                Date lower_date = formatter.parse(timeCondition.get(i)[0]);
-                Date upper_date = formatter.parse(timeCondition.get(i)[1]);
-                Timestamp ts = new Timestamp(date.getTime());
-                Timestamp lower_ts = new Timestamp(lower_date.getTime());
-                Timestamp upper_ts = new Timestamp(upper_date.getTime());
-
-                System.out.println("Time in event" + ": " + date);
-
-                if (lower_ts.equals(upper_ts) || ts.equals(lower_ts)) {
-                    flag = false;
-                    break;
-                }
-                else if (ts.after(lower_ts) && ts.before(upper_ts)) {
-                    flag = false;
-                    break;
-                }
-            }
-        }
-        System.out.println("Filter status (Time) " + ": " + flag);
-        //filter category conditions
-        if (filterStructure[1] && !flag) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            for (int i = 0; i < categoryCondition.size(); i++) {
-                System.out.println("Type in event: " + event.getPlacing().getLObject().getType());
-                if (event.getPlacing().getLObject().getType().equals(categoryCondition.get(i))) {
-                    flag = false;
-                    break;
-                }
-            }
-        }
-        System.out.println("Filter status (category) " + ": " + flag);
-        //filter id conditions
-        if (filterStructure[2] && !flag) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            for (int i = 0; i < idCondition.size(); i++) {
-                if (event.getPlacing().getLObject().getId().matches(idCondition.get(i))) {
-                    flag = false;
-                    break;
-                }
-            }
-        }
-        System.out.println("Filter status (id) " + ": " + flag);
-        //filter sensor_id conditions
-        if (filterStructure[3] && !flag) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            for (int i = 0; i < sensorIdCondition.size(); i++) {
-                String patternString = createRegexFromGlob(sensorIdCondition.get(i));
-                if (event.getPlacing().getLObject().getPSensor().getType().matches(patternString)) {
-                    flag = false;
-                    break;
-                }
-            }
-        }
-        System.out.println("Filter status (sensor_id) " + ": " + flag);
-
-        //filter accuracy condition
-        if (filterStructure[4] && !flag) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            //System.out.println("Accuracy condition: " + accuracyCondition);
-            //System.out.println("Accuracy event: " + event.getPositionInfo().getPosition().getAccuracy());
-            if (event.getPlacing().getPosition().getAccuracy() instanceof Gaussian) {
-                Gaussian gAccuracy = (Gaussian) event.getPlacing().getPosition().getAccuracy();
-                if (gAccuracy.getConfidenceInterval() <= accuracyCondition) {
-                    flag = false;
-                }
-            }
-        }
-        System.out.println("Filter status (accuracy) " + ": " + flag);
-
-
-        //filter position conditions
-        if (filterStructure[5] && !flag) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            if (event.getPlacing().getPosition() instanceof RelativePosition) {
-                RelativePosition rPosition = (RelativePosition) event.getPlacing().getPosition();
-                if (rPosition.getPoint() instanceof Point3D) {
-                    Point3D cod2 = dataModelFactory.createPoint3D();
-                    for(int    i=0;    i<sensorIdCondition.size();    i++){
-                        Point3D cod1 = dataModelFactory.createPoint3D();
-                        cod1.setX(positionCondition.get(i)[0]);
-                        cod1.setY(positionCondition.get(i)[1]);
-                        cod1.setZ(positionCondition.get(i)[2]);
-                        if (cal_distance(cod1, cod2)<=positionCondition.get(i)[3]){
-                            flag = false;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        System.out.println("Filter status (position) " + ": " + flag);
-        //filter time_min_interval condition
-        if (filterStructure[6] && !flag && last_position_event !=null) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-            Date date = formatter.parse(event.getTimeStamp());
-            Timestamp ts = new Timestamp(date.getTime());
-            Date last_date = formatter.parse(last_position_event.getTimeStamp());
-            Timestamp last_ts = new Timestamp(last_date.getTime());
-            long interval = date.getTime() - last_date.getTime();
-            //System.out.println("Time stamp" + ": " + ts);
-            //System.out.println("Interval" + ": " + interval);
-            if (interval >= timeMinInterval) {
-                flag = false;
-            }
-        }
-        System.out.println("Filter status (time_min_interval) " + ": " + flag);
-
-        //filter position_delta condition
-        if (filterStructure[7] && !flag && last_position_event !=null) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            if (event.getPlacing().getPosition() instanceof RelativePosition) {
-                RelativePosition rPosition1 = (RelativePosition) event.getPlacing().getPosition();
-                RelativePosition rPosition2 = (RelativePosition) last_position_event.getPlacing().getPosition();
-                if (rPosition1.getPoint() instanceof Point3D) {
-                    Point3D cod1 = (Point3D) rPosition1.getPoint();
-                    Point3D cod2 = (Point3D) rPosition2.getPoint();
-                    float distance = cal_distance(cod1, cod2);
-
-                    System.out.println("Distance: " + distance);
-                    if (distance >= positionDelta) {
-                        flag = false;
-                    }
-                }
-            }
-        }
-        System.out.println("Filter status (position_delta) " + ": " + flag);
-
-        //filter positionCondition_cell condition
-        if (filterStructure[8] && !flag) {
-            flag = true; //switch the filter status to block, if the event meet the filter condition, switch to pass
-            if (event.getPlacing().getPosition() instanceof RelativePosition) {
-                RelativePosition rPosition = (RelativePosition) event.getPlacing().getPosition();
-                for (int i = 0; i < positionConditionCell.size(); i++) {
-                    if (rPosition.getPoint() instanceof Point3D) {
-                        Point3D cod = (Point3D) rPosition.getPoint();
-                        if (is_in_cell(cod, positionConditionCell.get(i)[0], positionConditionCell.get(i)[1], positionConditionCell.get(i)[2])) {
-                            flag = false;
-                        }
-                    }
-                }
-            }
-        }
-        System.out.println("Filter status (positionCondition_cell) " + ": " + flag);
-
-
-        if (!flag) {
-            last_position_event = event;
-        }
-        return flag;
-    }
-}
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/filterTestCases.java b/src/main/java/ipos/project/Functionality/eventfilter/filterTestCases.java
deleted file mode 100644
index 1b472cf2f4316e97527a4b275b81a64ef8ddb6bc..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/filterTestCases.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ipos.project.Functionality.eventfilter;
-
-public class filterTestCases {
-}
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/readConfig.java b/src/main/java/ipos/project/Functionality/eventfilter/readConfig.java
deleted file mode 100644
index a0282d445e08fc02db2d58773307cf35ab2ad2ff..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/readConfig.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package ipos.project.Functionality.eventfilter;
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModel;
-import ipos.project.DataModellntegration.iPos_Datamodel.Zone;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import javax.xml.stream.EventFilter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-
-public class readConfig {
-
-    // kommt später raus, Zugriff auf Weltmodell erfolgt eigentlich über Komponente DataRetrieval
-    private static WorldModel wm;
-
-    public static void readFilterConfigFromMonitoringRequest (MonitoringRequest monReq, EventFilterCondition config){
-        // wichtig bis Freitag: Kriterien "position_delta" und "position_condition_cell" aus config-file
-        float delta_monReq = monReq.getDelta();
-        String frameId_monReq = monReq.getFrameId();
-        Zone zone_monReq = retrieveZone(frameId_monReq);
-        config.setFilterStructure(new boolean[] {false, false, false, false, false, false, false, true, true});
-        config.setPositionDelta(delta_monReq);
-        ArrayList<Float[][]> position_condition_cell = new ArrayList<>();
-        Float[][] cell_c = new Float[3][4];
-        // erste Dimension wählt aus: Position, Space, Quaternion
-        // zweite Dimension wählt aus: x,y,z,w
-    }
-
-    private static Zone retrieveZone(String zoneId){
-        List<Zone> knownZones = wm.getZoneMap().get(0).getZone();
-        for (var zone : knownZones){
-            if(zone.getId().equals(zoneId)){
-                return zone;
-            }
-        }
-        return null;
-    }
-
-    public static void setWM(WorldModel worldModel){
-        wm = worldModel;
-    }
-
-    public static void readFilterConfigFromJson (String json_file, EventFilterCondition config) throws Exception {
-
-        //Time condition: One time condition consist of two timestamp in format "yyyy-MM-dd HH:mm:ss.SSS", if the timestamp of the position event falls in between, the event passes.
-        ArrayList<String[]> time_condition = new ArrayList<>();
-        //Category condition: The category condition is a list of string, if the category of the event matches one value in the list, the event passes.
-        List<String> category_condition = new ArrayList<>();
-        //Sensor_id condition: The sensor id condition is a list of string, if the sensor id of the event matches one value in the list, the event passes. Wild card String match is supported.
-        List<String> sensor_id_condition = new ArrayList<>();
-        //ID condition: The id condition is a list of string, if the id of the event matches one value in the list, the event passes.
-        List<String> id_condition = new ArrayList<>();
-        //Accuracy condition: The accuracy condition is a float value, if the accuracy of the position event is better (smaller) than the accuracy condition, the event passes.
-        float accuracy_condition;
-        //Position condition: One position condition consist of four float values, the first 3 are x-y-z value of a coordinate of a reference point, the 4th float is the distance limit. If the distance between the coordinate of the position event and the reference point is smaller than the distance limit, the event passes.
-        ArrayList<Float[]> position_condition = new ArrayList<>();
-        //Time min interval: The time min interval is a int value (unit ms), if the time difference between the current event and the last event which passes the filter is larger than the interval, the current event passes.
-        int time_min_interval;
-        //Position delta: The position delta is a float value (unit m), if the distance between the current event and the last event which passes the filter is larger than the position delta, the current event passes.
-        float position_delta;
-        //Position condition cell: position condition where the permitted area is defined by a cell. A cell is defined by a reference point, a cell size and a Quaternion vector.
-        ArrayList<Float[][]> position_condition_cell = new ArrayList<>();
-        boolean[] filter_structure = new boolean[9];
-
-        //Converting jsonData string into JSON object
-        JSONObject jsnobject = new JSONObject(Files.readString(Paths.get(json_file)));
-        //Printing JSON object
-        //System.out.println("JSON Object");
-        //System.out.println(jsnobject);
-
-        //------------------read time condition-------------------------------------------------------------
-        //Getting time conditions JSON array from the JSON object
-        JSONArray jsonArray = jsnobject.getJSONArray("time_condition");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray);
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            //Iterating JSON array
-            for (int i=0;i<jsonArray.length();i++) {
-                //Adding each element of JSON array into ArrayList
-                JSONArray jsa1 = jsonArray.getJSONArray(i);
-                String[] time_c = new String[2];
-                int count = jsa1.length();
-                for (int j = 0; j < count; j++) {
-                    time_c[j] = jsa1.getString(j);
-                    //System.out.println("Time limit " + j + ": " + time_c[j]);
-                }
-                //System.out.println("Time lower limit " + 0 + ": " + time_c[0]);
-                //System.out.println("Time upper limit " + 1 + ": " + time_c[1]);
-                time_condition.add(time_c);
-            }
-            filter_structure[0] = true;
-            config.setTimeCondition(time_condition);
-        }
-        else {
-            filter_structure[0]=false;
-        }
-
-        //------------------read category condition---------------------------------------------------------
-        //Getting category conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("category_condition");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray);
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            //Iterating JSON array
-            for (int i=0;i<jsonArray.length();i++) {
-
-                category_condition.add(jsonArray.getString(i));
-
-            }
-            filter_structure[1] = true;
-            config.setCategoryCondition(category_condition);
-        }
-        else {
-            filter_structure[1]=false;
-        }
-
-        //------------------read id condition---------------------------------------------------------
-        //Getting id conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("id_condition");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray.length());
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            //Iterating JSON array
-            for (int i=0;i<jsonArray.length();i++) {
-
-                id_condition.add(jsonArray.getString(i));
-
-            }
-            filter_structure[2] = true;
-            config.setIdCondition(id_condition);
-        }
-        else {
-            filter_structure[2]=false;
-        }
-
-        //------------------read sensor id condition---------------------------------------------------------
-        //Getting sensor id conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("sensor_id_condition");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray.length());
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            //Iterating JSON array
-            for (int i=0;i<jsonArray.length();i++) {
-
-                sensor_id_condition.add(jsonArray.getString(i));
-
-            }
-            filter_structure[3] = true;
-            config.setSensorIdCondition(sensor_id_condition);
-        }
-        else {
-            filter_structure[3]=false;
-        }
-
-        //------------------read accuracy condition---------------------------------------------------------
-        //Getting accuracy conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("accuracy_condition");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray.length());
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            accuracy_condition=(float) jsonArray.getDouble(0);
-            filter_structure[4] = true;
-            config.setAccuracyCondition(accuracy_condition);
-        }
-        else {
-            filter_structure[4]=false;
-        }
-
-        //------------------read position condition-------------------------------------------------------------
-        //Getting position conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("position_condition");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray);
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            //Iterating JSON array
-            for (int i=0;i<jsonArray.length();i++) {
-                //Adding each element of JSON array into ArrayList
-                JSONArray jsa1 = jsonArray.getJSONArray(i);
-                Float[] position_c = new Float[4];
-                int count = jsa1.length();
-                System.out.println(count);
-                for (int j = 0; j < count; j++) {
-                    position_c[j] = (float)jsa1.getDouble(j);
-                }
-                //System.out.println("Time lower limit " + 0 + ": " + time_c[0]);
-                //System.out.println("Time upper limit " + 1 + ": " + time_c[1]);
-                position_condition.add(position_c);
-
-            }
-            filter_structure[5] = true;
-            config.setPositionCondition(position_condition);
-        }
-        else {
-            filter_structure[5]=false;
-        }
-
-        //------------------read time_min_interval condition---------------------------------------------------------
-        //Getting accuracy conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("time_min_interval");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray.length());
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            time_min_interval= jsonArray.getInt(0);
-            filter_structure[6] = true;
-            config.setTimeMinInterval(time_min_interval);
-        }
-        else {
-            filter_structure[6]=false;
-        }
-
-        //------------------read position_delta condition---------------------------------------------------------
-        //Getting position_delta conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("position_delta");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray.length());
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            position_delta= (float)jsonArray.getDouble(0);
-            filter_structure[7] = true;
-            config.setPositionDelta(position_delta);
-        }
-        else {
-            filter_structure[7]=false;
-        }
-
-        //------------------position condition cell-------------------------------------------------------------
-        //Getting time conditions JSON array from the JSON object
-        jsonArray = jsnobject.getJSONArray("position_condition_cell");
-        //Printing JSON array
-        //System.out.println("JSON Array");
-        //System.out.println(jsonArray);
-        //Checking whether the JSON array has some value or not
-        if (jsonArray != null && jsonArray.length()>0) {
-            //Iterating JSON array
-            for (int i=0;i<jsonArray.length();i++) {
-                //Adding each element of JSON array into ArrayList
-                JSONArray jsa1 = jsonArray.getJSONArray(i);
-                Float[][] cell_c = new Float[3][4];
-                int count = jsa1.length();
-                for (int j = 0; j < count; j++) {
-                    JSONArray jsa2 = jsa1.getJSONArray(j);
-                    int count_k = jsa2.length();
-                    for (int k =0; k < count_k; k++) {
-                        cell_c[j][k] = (float) jsa2.getDouble(k);
-                        //System.out.println("cell condition " + j + ", " + k + ": " + cell_c[j][k]);
-                    }
-                }
-                position_condition_cell.add(cell_c);
-            }
-            filter_structure[8] = true;
-            config.setPositionConditionCell(position_condition_cell);
-        }
-        else {
-            filter_structure[8]=false;
-        }
-        config.setFilterStructure(filter_structure);
-
-        /*filterConfig config = new filterConfig();
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            config = objectMapper.readValue(new File(json_file), filterConfig.class);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        this.setTime_condition(config.getTime_condition());
-        this.setCategory_condition(config.getCategory_condition());
-        this.setId_condition(config.getId_condition());
-        this.setSensor_id_condition(config.getSensor_id_condition());
-        this.setAccuracy_condition(config.getAccuracy_condition());
-        this.setPosition_condition(config.getPosition_condition());
-        this.setPosition_delta(config.getPosition_delta());
-        this.setTime_min_interval(config.getTime_min_interval());*/
-    }
-    public static void printFilterConfig(EventFilterCondition config) {
-        System.out.println("\ttime_condition               : " + config.getTimeCondition().get(0)[0] + ", " + config.getTimeCondition().get(0)[1]);
-        System.out.println("\tcategory_condition           : " + config.getCategoryCondition());
-        System.out.println("\tsensor_id_condition          : " + config.getSensorIdCondition());
-        System.out.println("\tid_condition                 : " + config.getIdCondition());
-        System.out.println("\taccuracy_condition           : " + config.getAccuracyCondition());
-        //System.out.println("\tposition_condition           : " + config.getPositionCondition().get(0)[0] + ", " + config.getPositionCondition().get(0)[1] + ", " + config.getPositionCondition().get(0)[2] + ", " + config.getPositionCondition().get(0)[3]);
-        System.out.println("\ttime_min_interval            : " + config.getTimeMinInterval());
-        System.out.println("\tposition_delta               : " + config.getPositionDelta());
-        System.out.println("\tfilter_structure             : " + config.getFilterStructure());
-    }
-}
diff --git a/src/main/java/ipos/project/Functionality/eventfilter/tagNames.java b/src/main/java/ipos/project/Functionality/eventfilter/tagNames.java
deleted file mode 100644
index 50d680cfa335aa0d3866f1371883db065d7e4239..0000000000000000000000000000000000000000
--- a/src/main/java/ipos/project/Functionality/eventfilter/tagNames.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ipos.project.Functionality.eventfilter;
-
-public class tagNames {
-    public static final String tagTime = "time";
-    public static final String tagDriverID = "Driver_id";
-    public static final String tagObjectID = "Object_id";
-    public static final String tagPositionTechnology = "Position_technology";
-    public static final String tagPositionInfo = "PositionInfo";
-    public static final String tagPosition = "Position";
-    public static final String tagCoordinateSystem = "Coordinate_System";
-    public static final String tagCoordinate = "Coordinate";
-    public static final String tagX = "X";
-    public static final String tagY = "Y";
-    public static final String tagZ = "Z";
-    public static final String tagAccuracy = "Accuracy";
-    public static final String tagSender = "Sender";
-    public static final String tagReceiver = "Receiver";
-    public static final String tagUpdateInterval = "UpdateInterval";
-    public static final String category = "Category";
-    public static final String tagSensorID = "Sensor_ID";
-}
diff --git a/src/main/java/ipos/project/MainApp.java b/src/main/java/ipos/project/MainApp.java
index 62704a8d84a60ce5c2269b2b48ee4eda16d4f582..c436a08b029bf3b0f648ebcf8e9b01476c270263 100644
--- a/src/main/java/ipos/project/MainApp.java
+++ b/src/main/java/ipos/project/MainApp.java
@@ -1,20 +1,16 @@
 package ipos.project;
 
-import ipos.project.Functionality.eventfilter.TestEventFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import java.text.ParseException;
 
 @SpringBootApplication
 // @EnableJpaRepositories("ipos.project.models.SimpleScene.*")
-@EnableJpaRepositories("ipos.project.DataModellntegration.iPos_Datamodel.impl")
+@EnableJpaRepositories("ipos.project.data.datamodel.impl")
 public class MainApp {
 	public static void main(String[] args) throws ParseException {
-		TestEventFilter.test();
 		SpringApplication.run(MainApp.class, args);
 	}
 }
diff --git a/src/main/java/ipos/project/SensorValueIntegration/api/MqttPositionHandler.java b/src/main/java/ipos/project/SensorValueIntegration/api/MqttPositionHandler.java
index 900e8bdee1946ee97cbe6fa23c806580840400ae..7908fc49171510374b7cfe0d8e89ea0fd85cfe45 100644
--- a/src/main/java/ipos/project/SensorValueIntegration/api/MqttPositionHandler.java
+++ b/src/main/java/ipos/project/SensorValueIntegration/api/MqttPositionHandler.java
@@ -4,7 +4,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import ipos.models.SimpleScene.IposPosition;
 import ipos.project.config.mqtt.Handler;
 import ipos.project.config.mqtt.MqttListener;
-import ipos.project.mapper.ProtoJsonMap;
+import ipos.project.mapper.ProtoMapper;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,7 +13,7 @@ import org.springframework.jms.core.JmsTemplate;
 
 
 // subscribe to the topic
-@MqttListener("test51/publish/positions")
+@MqttListener("ipos52/sensor/measurement/position")
 public class MqttPositionHandler implements Handler {
 
     private final Logger LOG = LoggerFactory.getLogger(getClass());
@@ -27,13 +27,10 @@ public class MqttPositionHandler implements Handler {
     // method that handle new message from the topic
     public void handle(MqttMessage message) {
         try {
-            IposPosition pos = ProtoJsonMap.fromJson(message.toString(), IposPosition.class);
-            //IposPosition pos = IposPosition.parseFrom(message.toString().getBytes());
+            IposPosition pos = ProtoMapper.fromJson(message.toString(), IposPosition.class);
             assert pos != null;
             LOG.info("IposPosition received: \n" + pos);
-
-            this.jmsTemplate.convertAndSend("/positions", pos); // submit position to the internal broker
-            //TODO: fix message converter for the internal broker
+            this.jmsTemplate.convertAndSend("local/user/position", pos); // submit position to the internal broker
         } catch (InvalidProtocolBufferException e) {
             LOG.error("Invalid mqtt message:", e);
         }
diff --git a/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java b/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java
index 35286a65cca7d0c9c0e0e8f1d2fffdb110823973..0afbffea1baadabc931e6a2c0539766661629b94 100644
--- a/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java
+++ b/src/main/java/ipos/project/UseCaseController/PositionMonitoring.java
@@ -1,17 +1,12 @@
 package ipos.project.UseCaseController;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.*;
-import ipos.project.Functionality.eventfilter.eventFilter;
-import ipos.project.Functionality.eventfilter.readConfig;
+import ipos.project.data.datamodel.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.stereotype.Component;
 import ipos.models.SimpleScene.IposPosition;
 
-import java.lang.ref.Reference;
-import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -22,8 +17,7 @@ public class PositionMonitoring {
     private final Logger LOG = LoggerFactory.getLogger(getClass());
 
     public WorldModel wm;
-    List<eventFilter> eventFilters = new ArrayList<eventFilter>();
-    private IPos_DatamodelFactory modelFactory = IPos_DatamodelFactory.eINSTANCE;
+    private final IPos_DatamodelFactory modelFactory = IPos_DatamodelFactory.eINSTANCE;
 
     public void initialize(){
         wm = modelFactory.createWorldModel();
@@ -121,36 +115,15 @@ public class PositionMonitoring {
         return quaternion;
     }
 
-    @JmsListener(destination = "/positions123", containerFactory = "jmsListenFactory")
+    @JmsListener(destination = "local/user/position", containerFactory = "jmsListenFactory")
     public void receiveMessage(IposPosition pos) {
-        LOG.info("Received <" + pos + ">");
+        LOG.info("Internal: " + pos);
     }
 
-    @JmsListener(destination = "/monitoringRequest", containerFactory = "jmsListenFactory")
+    @JmsListener(destination = "local/user/monitoring-request", containerFactory = "jmsListenFactory")
     public void receiveMessage(MonitoringRequest monReq) {
-        LOG.info("Received <" + monReq + ">");
-        eventFilter filter = new eventFilter();
-        EventFilterCondition config = modelFactory.createEventFilterCondition();
-        readConfig.setWM(wm);
-        readConfig.readFilterConfigFromMonitoringRequest(monReq, config);
-        filter.init(config);
-        eventFilters.add(filter);
-
+        LOG.info("Internal: " + monReq);
         // SimpleSceneIntegration muss MQTT-topic gemäß monreq.MonitoringTaskId einrichten
     }
 
-    @JmsListener(destination = "/PositionEvent", containerFactory = "jmsListenFactory")
-    public void receiveMessage(PositionEvent posEvent) {
-        LOG.info("Received <" + posEvent + ">");
-        for (eventFilter eFilter : eventFilters){
-            try {
-                if(eFilter.process(posEvent)){
-                    // mqtt-topic (=monitoringTaskId) beschaffen
-                    // posEvent mit mqtt-topic an SimpleSceneIntegration-Komponente zum Aussenden weiterleiten
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-    }
 }
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AbsolutePosition.java b/src/main/java/ipos/project/data/datamodel/AbsolutePosition.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AbsolutePosition.java
rename to src/main/java/ipos/project/data/datamodel/AbsolutePosition.java
index 7962df73fd8492b5445f55209d285890b8b5321c..09bd889db42fb1c098f7505ba5c50b14e4aba5cf 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AbsolutePosition.java
+++ b/src/main/java/ipos/project/data/datamodel/AbsolutePosition.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,10 +11,10 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.AbsolutePosition#getPoint <em>Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.AbsolutePosition#getPoint <em>Point</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAbsolutePosition()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAbsolutePosition()
  * @model
  * @generated
  */
@@ -25,14 +25,14 @@ public interface AbsolutePosition extends Position {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Point</em>' reference.
 	 * @see #setPoint(WGS84Point)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAbsolutePosition_Point()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAbsolutePosition_Point()
 	 * @model required="true"
 	 * @generated
 	 */
 	WGS84Point getPoint();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.AbsolutePosition#getPoint <em>Point</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.AbsolutePosition#getPoint <em>Point</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Point</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Acceleration.java b/src/main/java/ipos/project/data/datamodel/Acceleration.java
similarity index 64%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Acceleration.java
rename to src/main/java/ipos/project/data/datamodel/Acceleration.java
index 3069155c119caf040eb1bc89e01c6724ee3d1999..e9fc64f9012f77a5266ece5b258dd946750c11d7 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Acceleration.java
+++ b/src/main/java/ipos/project/data/datamodel/Acceleration.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAcceleration()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAcceleration()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Accuracy.java b/src/main/java/ipos/project/data/datamodel/Accuracy.java
similarity index 63%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Accuracy.java
rename to src/main/java/ipos/project/data/datamodel/Accuracy.java
index f4181d26589d0eb23d7e56b7d30b6e3774ebfd8a..f1aea1863ced2eef8d6f6da4d374978ed9b4365f 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Accuracy.java
+++ b/src/main/java/ipos/project/data/datamodel/Accuracy.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAccuracy()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAccuracy()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Agent.java b/src/main/java/ipos/project/data/datamodel/Agent.java
similarity index 57%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Agent.java
rename to src/main/java/ipos/project/data/datamodel/Agent.java
index d897bd2bbfbe051a26e7ce869f6ce189d02d9914..c104a107a1bc72175219e4acf807c37f41a0f5ee 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Agent.java
+++ b/src/main/java/ipos/project/data/datamodel/Agent.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -13,22 +13,22 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent#getLObject <em>LObject</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent#getAgentType <em>Agent Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Agent#getLObject <em>LObject</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Agent#getAgentType <em>Agent Type</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAgent()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAgent()
  * @model
  * @generated
  */
 public interface Agent extends Entity {
 	/**
 	 * Returns the value of the '<em><b>LObject</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.LocalizableObject}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>LObject</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAgent_LObject()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAgent_LObject()
 	 * @model
 	 * @generated
 	 */
@@ -40,14 +40,14 @@ public interface Agent extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Agent Type</em>' attribute.
 	 * @see #setAgentType(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAgent_AgentType()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAgent_AgentType()
 	 * @model
 	 * @generated
 	 */
 	String getAgentType();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent#getAgentType <em>Agent Type</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Agent#getAgentType <em>Agent Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Agent Type</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AgentRegistrationRequest.java b/src/main/java/ipos/project/data/datamodel/AgentRegistrationRequest.java
similarity index 65%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AgentRegistrationRequest.java
rename to src/main/java/ipos/project/data/datamodel/AgentRegistrationRequest.java
index 245a59a5ea83e5f860e65dadb596edc50600d603..f42e3f7bec86ffcb99474392c01788bd93321776 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AgentRegistrationRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/AgentRegistrationRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAgentRegistrationRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAgentRegistrationRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AngularRate.java b/src/main/java/ipos/project/data/datamodel/AngularRate.java
similarity index 64%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AngularRate.java
rename to src/main/java/ipos/project/data/datamodel/AngularRate.java
index 7d44f0984a7f4cdc55ae24e9c36b5d9152af7faa..da045e5c8f23388efb5dc489aa949975a7c32d3d 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/AngularRate.java
+++ b/src/main/java/ipos/project/data/datamodel/AngularRate.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getAngularRate()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getAngularRate()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Barcode.java b/src/main/java/ipos/project/data/datamodel/Barcode.java
similarity index 59%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Barcode.java
rename to src/main/java/ipos/project/data/datamodel/Barcode.java
index 45b45d9637205ef2a33f74e0ef0cb8045373b46f..8fe29c85cea881ccee791afb9a6a2362beedfee0 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Barcode.java
+++ b/src/main/java/ipos/project/data/datamodel/Barcode.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -8,7 +8,7 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getBarcode()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getBarcode()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Beacon.java b/src/main/java/ipos/project/data/datamodel/Beacon.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Beacon.java
rename to src/main/java/ipos/project/data/datamodel/Beacon.java
index 11f2f0f0f5811b9aba7478df4ee22ca5facf6567..97d03679d24bbbdd5eff02c19cf0218237a0a7fd 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Beacon.java
+++ b/src/main/java/ipos/project/data/datamodel/Beacon.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -13,11 +13,11 @@ import java.util.Map;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getDistances <em>Distances</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Beacon#getDistances <em>Distances</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Beacon#getType <em>Type</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getBeacon()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getBeacon()
  * @model
  * @generated
  */
@@ -28,14 +28,14 @@ public interface Beacon extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Distances</em>' attribute.
 	 * @see #setDistances(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getBeacon_Distances()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getBeacon_Distances()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, Integer> getDistances();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getDistances <em>Distances</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Beacon#getDistances <em>Distances</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Distances</em>' attribute.
@@ -50,14 +50,14 @@ public interface Beacon extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getBeacon_Type()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getBeacon_Type()
 	 * @model
 	 * @generated
 	 */
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getType <em>Type</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Beacon#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Bluetooth.java b/src/main/java/ipos/project/data/datamodel/Bluetooth.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Bluetooth.java
rename to src/main/java/ipos/project/data/datamodel/Bluetooth.java
index d1f98e44798dcced0ecef5717251fb3dd3fa4984..b9d563cfebc836c014d1e32ed40652bf09cc9f67 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Bluetooth.java
+++ b/src/main/java/ipos/project/data/datamodel/Bluetooth.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -13,10 +13,10 @@ import java.util.Map;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth#getRss <em>Rss</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Bluetooth#getRss <em>Rss</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getBluetooth()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getBluetooth()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface Bluetooth extends Beacon {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Rss</em>' attribute.
 	 * @see #setRss(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getBluetooth_Rss()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getBluetooth_Rss()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, Integer> getRss();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth#getRss <em>Rss</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Bluetooth#getRss <em>Rss</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Rss</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/DataStorageQueryRequest.java b/src/main/java/ipos/project/data/datamodel/DataStorageQueryRequest.java
similarity index 65%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/DataStorageQueryRequest.java
rename to src/main/java/ipos/project/data/datamodel/DataStorageQueryRequest.java
index 9ac0c20521c1a22d76c177999b3f1b0fb9d5901d..159bf45040b525ac4016c1e6904deaec71b65f28 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/DataStorageQueryRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/DataStorageQueryRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getDataStorageQueryRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getDataStorageQueryRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/DataStorageRequest.java b/src/main/java/ipos/project/data/datamodel/DataStorageRequest.java
similarity index 64%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/DataStorageRequest.java
rename to src/main/java/ipos/project/data/datamodel/DataStorageRequest.java
index 460d3fea0334ca40d33c5a423fb87e629d07a25c..89116c87168d553f4e11942d96ce9cfeaffeb0a2 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/DataStorageRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/DataStorageRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getDataStorageRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getDataStorageRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Entity.java b/src/main/java/ipos/project/data/datamodel/Entity.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Entity.java
rename to src/main/java/ipos/project/data/datamodel/Entity.java
index 4dca0aefc68b256781a7c9fc34e350ec2adafcea..5ab37bc56e861ecdadbb0b41a171da3badc033b6 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Entity.java
+++ b/src/main/java/ipos/project/data/datamodel/Entity.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Entity#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Entity#getId <em>Id</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEntity()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEntity()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface Entity extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEntity_Id()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEntity_Id()
 	 * @model
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Entity#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Entity#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java b/src/main/java/ipos/project/data/datamodel/EventFilterCondition.java
similarity index 54%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java
rename to src/main/java/ipos/project/data/datamodel/EventFilterCondition.java
index 6aea00da4db647c20055103d4232a441c7d95bc5..4473291b0c3cbaf5807a69612581693f33563d68 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java
+++ b/src/main/java/ipos/project/data/datamodel/EventFilterCondition.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,19 +16,19 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionDelta <em>Position Delta</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getPositionDelta <em>Position Delta</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Time Condition</em>' attribute.
 	 * @see #setTimeCondition(ArrayList)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_TimeCondition()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringArray" transient="true"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_TimeCondition()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.StringArray" transient="true"
 	 * @generated
 	 */
 	ArrayList<String[]> getTimeCondition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Time Condition</em>' attribute.
@@ -61,14 +61,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Category Condition</em>' attribute.
 	 * @see #setCategoryCondition(List)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_CategoryCondition()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList" transient="true"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_CategoryCondition()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.StringList" transient="true"
 	 * @generated
 	 */
 	List<String> getCategoryCondition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Category Condition</em>' attribute.
@@ -84,14 +84,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id Condition</em>' attribute.
 	 * @see #setIdCondition(List)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_IdCondition()
-	 * @model default="" dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList" transient="true"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_IdCondition()
+	 * @model default="" dataType="ipos.project.data.iPos_Datamodel.StringList" transient="true"
 	 * @generated
 	 */
 	List<String> getIdCondition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id Condition</em>' attribute.
@@ -106,14 +106,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Accuracy Condition</em>' attribute.
 	 * @see #setAccuracyCondition(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_AccuracyCondition()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_AccuracyCondition()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float" transient="true"
 	 * @generated
 	 */
 	float getAccuracyCondition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Accuracy Condition</em>' attribute.
@@ -128,14 +128,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position Condition</em>' attribute.
 	 * @see #setPositionCondition(ArrayList)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_PositionCondition()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.FloatArray" transient="true"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_PositionCondition()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.FloatArray" transient="true"
 	 * @generated
 	 */
 	ArrayList<Float[]> getPositionCondition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position Condition</em>' attribute.
@@ -150,14 +150,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Time Min Interval</em>' attribute.
 	 * @see #setTimeMinInterval(int)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_TimeMinInterval()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_TimeMinInterval()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Int"
 	 * @generated
 	 */
 	int getTimeMinInterval();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Time Min Interval</em>' attribute.
@@ -172,14 +172,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position Delta</em>' attribute.
 	 * @see #setPositionDelta(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_PositionDelta()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_PositionDelta()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float" transient="true"
 	 * @generated
 	 */
 	float getPositionDelta();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionDelta <em>Position Delta</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getPositionDelta <em>Position Delta</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position Delta</em>' attribute.
@@ -194,14 +194,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sensor Id Condition</em>' attribute.
 	 * @see #setSensorIdCondition(List)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_SensorIdCondition()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList" transient="true"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_SensorIdCondition()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.StringList" transient="true"
 	 * @generated
 	 */
 	List<String> getSensorIdCondition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sensor Id Condition</em>' attribute.
@@ -216,14 +216,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Filter Structure</em>' attribute.
 	 * @see #setFilterStructure(boolean[])
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_FilterStructure()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.BooleanList" transient="true"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_FilterStructure()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.BooleanList" transient="true"
 	 * @generated
 	 */
 	boolean[] getFilterStructure();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Filter Structure</em>' attribute.
@@ -238,14 +238,14 @@ public interface EventFilterCondition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position Condition Cell</em>' attribute.
 	 * @see #setPositionConditionCell(ArrayList)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_PositionConditionCell()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.FloatArray3d"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterCondition_PositionConditionCell()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.FloatArray3d"
 	 * @generated
 	 */
 	ArrayList<Float[][]> getPositionConditionCell();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position Condition Cell</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterConfiguration.java b/src/main/java/ipos/project/data/datamodel/EventFilterConfiguration.java
similarity index 56%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterConfiguration.java
rename to src/main/java/ipos/project/data/datamodel/EventFilterConfiguration.java
index 23300598f997de738c874155d4a111a8eb859c05..ed75f2c0e0c9dd12e400da41035643379f3f1cb2 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterConfiguration.java
+++ b/src/main/java/ipos/project/data/datamodel/EventFilterConfiguration.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -17,13 +17,13 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getFilterCriteria <em>Filter Criteria</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getEventfiltercondition <em>Eventfiltercondition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterConfiguration#getFilterCriteria <em>Filter Criteria</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.EventFilterConfiguration#getEventfiltercondition <em>Eventfiltercondition</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterConfiguration()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterConfiguration()
  * @model
  * @generated
  */
@@ -34,14 +34,14 @@ public interface EventFilterConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position Ambiguity Strategy</em>' attribute.
 	 * @see #setPositionAmbiguityStrategy(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_PositionAmbiguityStrategy()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_PositionAmbiguityStrategy()
 	 * @model
 	 * @generated
 	 */
 	String getPositionAmbiguityStrategy();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position Ambiguity Strategy</em>' attribute.
@@ -56,14 +56,14 @@ public interface EventFilterConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position Ambiguity Parameters</em>' attribute.
 	 * @see #setPositionAmbiguityParameters(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_PositionAmbiguityParameters()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_PositionAmbiguityParameters()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, String> getPositionAmbiguityParameters();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position Ambiguity Parameters</em>' attribute.
@@ -78,14 +78,14 @@ public interface EventFilterConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Filter Criteria</em>' attribute.
 	 * @see #setFilterCriteria(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_FilterCriteria()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_FilterCriteria()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, EObject> getFilterCriteria();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getFilterCriteria <em>Filter Criteria</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.EventFilterConfiguration#getFilterCriteria <em>Filter Criteria</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Filter Criteria</em>' attribute.
@@ -96,11 +96,11 @@ public interface EventFilterConfiguration extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Eventfiltercondition</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.EventFilterCondition}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Eventfiltercondition</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_Eventfiltercondition()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getEventFilterConfiguration_Eventfiltercondition()
 	 * @model
 	 * @generated
 	 */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Gaussian.java b/src/main/java/ipos/project/data/datamodel/Gaussian.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Gaussian.java
rename to src/main/java/ipos/project/data/datamodel/Gaussian.java
index a24db9029097a70ac2ebf91ddcc6964a6e8f5251..8456a7dc61edea542dbddf0f11af105737350f05 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Gaussian.java
+++ b/src/main/java/ipos/project/data/datamodel/Gaussian.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,10 +11,10 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Gaussian#getConfidenceInterval <em>Confidence Interval</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Gaussian#getConfidenceInterval <em>Confidence Interval</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getGaussian()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getGaussian()
  * @model
  * @generated
  */
@@ -26,14 +26,14 @@ public interface Gaussian extends Accuracy {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Confidence Interval</em>' attribute.
 	 * @see #setConfidenceInterval(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getGaussian_ConfidenceInterval()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getGaussian_ConfidenceInterval()
 	 * @model default="0.0"
 	 * @generated
 	 */
 	float getConfidenceInterval();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Gaussian#getConfidenceInterval <em>Confidence Interval</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Gaussian#getConfidenceInterval <em>Confidence Interval</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Confidence Interval</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IMU.java b/src/main/java/ipos/project/data/datamodel/IMU.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IMU.java
rename to src/main/java/ipos/project/data/datamodel/IMU.java
index a3d48662c6f32a414073b56c9b35af8c4d236a00..a89a995a494fb28d07015bb1de3f1b77c0b5ea01 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IMU.java
+++ b/src/main/java/ipos/project/data/datamodel/IMU.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,11 +11,11 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAngularrate <em>Angularrate</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAcceleration <em>Acceleration</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.IMU#getAngularrate <em>Angularrate</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.IMU#getAcceleration <em>Acceleration</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getIMU()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getIMU()
  * @model
  * @generated
  */
@@ -26,14 +26,14 @@ public interface IMU extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Angularrate</em>' reference.
 	 * @see #setAngularrate(AngularRate)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getIMU_Angularrate()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getIMU_Angularrate()
 	 * @model required="true"
 	 * @generated
 	 */
 	AngularRate getAngularrate();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAngularrate <em>Angularrate</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.IMU#getAngularrate <em>Angularrate</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Angularrate</em>' reference.
@@ -48,14 +48,14 @@ public interface IMU extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Acceleration</em>' reference.
 	 * @see #setAcceleration(Acceleration)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getIMU_Acceleration()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getIMU_Acceleration()
 	 * @model required="true"
 	 * @generated
 	 */
 	Acceleration getAcceleration();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAcceleration <em>Acceleration</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.IMU#getAcceleration <em>Acceleration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Acceleration</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelFactory.java b/src/main/java/ipos/project/data/datamodel/IPos_DatamodelFactory.java
similarity index 97%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelFactory.java
rename to src/main/java/ipos/project/data/datamodel/IPos_DatamodelFactory.java
index 0daeb67d6524cef9184d1870adc86e37ddb18518..a12dc3dd44325003d3855668f8aad6f4b1bc5765 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelFactory.java
+++ b/src/main/java/ipos/project/data/datamodel/IPos_DatamodelFactory.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage
  * @generated
  */
 public interface IPos_DatamodelFactory extends EFactory {
@@ -19,7 +19,7 @@ public interface IPos_DatamodelFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	IPos_DatamodelFactory eINSTANCE = ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelFactoryImpl
+	IPos_DatamodelFactory eINSTANCE = ipos.project.data.datamodel.impl.IPos_DatamodelFactoryImpl
 			.init();
 
 	/**
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java b/src/main/java/ipos/project/data/datamodel/IPos_DatamodelPackage.java
similarity index 66%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java
rename to src/main/java/ipos/project/data/datamodel/IPos_DatamodelPackage.java
index 6c020a7701270cd71e1200b4917c7fb24f57a0a8..1ee7fded5e778aabae648a64775750a37d0ddf6d 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java
+++ b/src/main/java/ipos/project/data/datamodel/IPos_DatamodelPackage.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelFactory
+ * @see ipos.project.data.datamodel.IPos_DatamodelFactory
  * @model kind="package"
  * @generated
  */
@@ -55,15 +55,15 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	IPos_DatamodelPackage eINSTANCE = ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl
+	IPos_DatamodelPackage eINSTANCE = ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl
 			.init();
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EntityImpl <em>Entity</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.EntityImpl <em>Entity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.EntityImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getEntity()
+	 * @see ipos.project.data.datamodel.impl.EntityImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getEntity()
 	 * @generated
 	 */
 	int ENTITY = 1;
@@ -96,11 +96,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ENTITY_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentImpl <em>Agent</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.AgentImpl <em>Agent</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAgent()
+	 * @see ipos.project.data.datamodel.impl.AgentImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAgent()
 	 * @generated
 	 */
 	int AGENT = 0;
@@ -151,11 +151,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int AGENT_OPERATION_COUNT = ENTITY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl <em>Localizable Object</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.LocalizableObjectImpl <em>Localizable Object</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getLocalizableObject()
+	 * @see ipos.project.data.datamodel.impl.LocalizableObjectImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getLocalizableObject()
 	 * @generated
 	 */
 	int LOCALIZABLE_OBJECT = 2;
@@ -224,11 +224,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int LOCALIZABLE_OBJECT_OPERATION_COUNT = ENTITY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PlacingImpl <em>Placing</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.PlacingImpl <em>Placing</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PlacingImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPlacing()
+	 * @see ipos.project.data.datamodel.impl.PlacingImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPlacing()
 	 * @generated
 	 */
 	int PLACING = 3;
@@ -270,11 +270,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int PLACING_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl <em>Position</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.PositionImpl <em>Position</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPosition()
+	 * @see ipos.project.data.datamodel.impl.PositionImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPosition()
 	 * @generated
 	 */
 	int POSITION = 4;
@@ -325,11 +325,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int POSITION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OrientationImpl <em>Orientation</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.OrientationImpl <em>Orientation</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.OrientationImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getOrientation()
+	 * @see ipos.project.data.datamodel.impl.OrientationImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getOrientation()
 	 * @generated
 	 */
 	int ORIENTATION = 5;
@@ -353,31 +353,31 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ORIENTATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl <em>WGS84 Point</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.WGS84PointImpl <em>WGS84 Point</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWGS84Point()
+	 * @see ipos.project.data.datamodel.impl.WGS84PointImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWGS84Point()
 	 * @generated
 	 */
 	int WGS84_POINT = 6;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AccuracyImpl <em>Accuracy</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.AccuracyImpl <em>Accuracy</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AccuracyImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAccuracy()
+	 * @see ipos.project.data.datamodel.impl.AccuracyImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAccuracy()
 	 * @generated
 	 */
 	int ACCURACY = 7;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PointImpl <em>Point</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.PointImpl <em>Point</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PointImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPoint()
+	 * @see ipos.project.data.datamodel.impl.PointImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPoint()
 	 * @generated
 	 */
 	int POINT = 17;
@@ -464,11 +464,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ACCURACY_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point2DImpl <em>Point2 D</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.Point2DImpl <em>Point2 D</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.Point2DImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPoint2D()
+	 * @see ipos.project.data.datamodel.impl.Point2DImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPoint2D()
 	 * @generated
 	 */
 	int POINT2_D = 8;
@@ -510,11 +510,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int POINT2_D_OPERATION_COUNT = POINT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl <em>Point3 D</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.Point3DImpl <em>Point3 D</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPoint3D()
+	 * @see ipos.project.data.datamodel.impl.Point3DImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPoint3D()
 	 * @generated
 	 */
 	int POINT3_D = 9;
@@ -565,11 +565,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int POINT3_D_OPERATION_COUNT = POINT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl <em>Reference System</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.ReferenceSystemImpl <em>Reference System</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getReferenceSystem()
+	 * @see ipos.project.data.datamodel.impl.ReferenceSystemImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getReferenceSystem()
 	 * @generated
 	 */
 	int REFERENCE_SYSTEM = 10;
@@ -620,11 +620,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int REFERENCE_SYSTEM_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl <em>Zone</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.ZoneImpl <em>Zone</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getZone()
+	 * @see ipos.project.data.datamodel.impl.ZoneImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getZone()
 	 * @generated
 	 */
 	int ZONE = 11;
@@ -684,11 +684,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ZONE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MapTypeImpl <em>Map Type</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.MapTypeImpl <em>Map Type</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.MapTypeImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getMapType()
+	 * @see ipos.project.data.datamodel.impl.MapTypeImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getMapType()
 	 * @generated
 	 */
 	int MAP_TYPE = 14;
@@ -712,11 +712,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int MAP_TYPE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneMapImpl <em>Zone Map</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.ZoneMapImpl <em>Zone Map</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneMapImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getZoneMap()
+	 * @see ipos.project.data.datamodel.impl.ZoneMapImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getZoneMap()
 	 * @generated
 	 */
 	int ZONE_MAP = 12;
@@ -749,11 +749,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ZONE_MAP_OPERATION_COUNT = MAP_TYPE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl <em>Space</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.SpaceImpl <em>Space</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getSpace()
+	 * @see ipos.project.data.datamodel.impl.SpaceImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getSpace()
 	 * @generated
 	 */
 	int SPACE = 13;
@@ -804,11 +804,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int SPACE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl <em>Quaternion</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.QuaternionImpl <em>Quaternion</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getQuaternion()
+	 * @see ipos.project.data.datamodel.impl.QuaternionImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getQuaternion()
 	 * @generated
 	 */
 	int QUATERNION = 15;
@@ -868,11 +868,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int QUATERNION_OPERATION_COUNT = ORIENTATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.GaussianImpl <em>Gaussian</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.GaussianImpl <em>Gaussian</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.GaussianImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getGaussian()
+	 * @see ipos.project.data.datamodel.impl.GaussianImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getGaussian()
 	 * @generated
 	 */
 	int GAUSSIAN = 16;
@@ -905,11 +905,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int GAUSSIAN_OPERATION_COUNT = ACCURACY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataImpl <em>Rawdata</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.RawdataImpl <em>Rawdata</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getRawdata()
+	 * @see ipos.project.data.datamodel.impl.RawdataImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getRawdata()
 	 * @generated
 	 */
 	int RAWDATA = 18;
@@ -942,11 +942,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int RAWDATA_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl <em>Proximity</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.ProximityImpl <em>Proximity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getProximity()
+	 * @see ipos.project.data.datamodel.impl.ProximityImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getProximity()
 	 * @generated
 	 */
 	int PROXIMITY = 19;
@@ -1006,11 +1006,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int PROXIMITY_OPERATION_COUNT = RAWDATA_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RFIDImpl <em>RFID</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.RFIDImpl <em>RFID</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.RFIDImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getRFID()
+	 * @see ipos.project.data.datamodel.impl.RFIDImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getRFID()
 	 * @generated
 	 */
 	int RFID = 20;
@@ -1079,11 +1079,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int RFID_OPERATION_COUNT = PROXIMITY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.NFCImpl <em>NFC</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.NFCImpl <em>NFC</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.NFCImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getNFC()
+	 * @see ipos.project.data.datamodel.impl.NFCImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getNFC()
 	 * @generated
 	 */
 	int NFC = 21;
@@ -1152,11 +1152,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int NFC_OPERATION_COUNT = PROXIMITY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.IMUImpl <em>IMU</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.IMUImpl <em>IMU</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IMUImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getIMU()
+	 * @see ipos.project.data.datamodel.impl.IMUImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getIMU()
 	 * @generated
 	 */
 	int IMU = 22;
@@ -1207,11 +1207,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int IMU_OPERATION_COUNT = RAWDATA_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AngularRateImpl <em>Angular Rate</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.AngularRateImpl <em>Angular Rate</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AngularRateImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAngularRate()
+	 * @see ipos.project.data.datamodel.impl.AngularRateImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAngularRate()
 	 * @generated
 	 */
 	int ANGULAR_RATE = 23;
@@ -1235,11 +1235,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ANGULAR_RATE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AccelerationImpl <em>Acceleration</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.AccelerationImpl <em>Acceleration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AccelerationImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAcceleration()
+	 * @see ipos.project.data.datamodel.impl.AccelerationImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAcceleration()
 	 * @generated
 	 */
 	int ACCELERATION = 24;
@@ -1263,11 +1263,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int ACCELERATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BeaconImpl <em>Beacon</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.BeaconImpl <em>Beacon</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.BeaconImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBeacon()
+	 * @see ipos.project.data.datamodel.impl.BeaconImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBeacon()
 	 * @generated
 	 */
 	int BEACON = 25;
@@ -1318,11 +1318,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int BEACON_OPERATION_COUNT = RAWDATA_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionEventImpl <em>Position Event</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.PositionEventImpl <em>Position Event</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionEventImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPositionEvent()
+	 * @see ipos.project.data.datamodel.impl.PositionEventImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPositionEvent()
 	 * @generated
 	 */
 	int POSITION_EVENT = 26;
@@ -1373,11 +1373,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int POSITION_EVENT_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataEventImpl <em>Rawdata Event</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.RawdataEventImpl <em>Rawdata Event</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataEventImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getRawdataEvent()
+	 * @see ipos.project.data.datamodel.impl.RawdataEventImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getRawdataEvent()
 	 * @generated
 	 */
 	int RAWDATA_EVENT = 27;
@@ -1410,11 +1410,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int RAWDATA_EVENT_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingRequestImpl <em>Tracking Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.TrackingRequestImpl <em>Tracking Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getTrackingRequest()
+	 * @see ipos.project.data.datamodel.impl.TrackingRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getTrackingRequest()
 	 * @generated
 	 */
 	int TRACKING_REQUEST = 28;
@@ -1438,11 +1438,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int TRACKING_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl <em>Monitoring Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl <em>Monitoring Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringRequest()
+	 * @see ipos.project.data.datamodel.impl.MonitoringRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringRequest()
 	 * @generated
 	 */
 	int MONITORING_REQUEST = 29;
@@ -1556,11 +1556,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int MONITORING_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelUpdateRequestImpl <em>World Model Update Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.WorldModelUpdateRequestImpl <em>World Model Update Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelUpdateRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelUpdateRequest()
+	 * @see ipos.project.data.datamodel.impl.WorldModelUpdateRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelUpdateRequest()
 	 * @generated
 	 */
 	int WORLD_MODEL_UPDATE_REQUEST = 30;
@@ -1584,11 +1584,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int WORLD_MODEL_UPDATE_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageRequestImpl <em>Data Storage Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.DataStorageRequestImpl <em>Data Storage Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageRequest()
+	 * @see ipos.project.data.datamodel.impl.DataStorageRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageRequest()
 	 * @generated
 	 */
 	int DATA_STORAGE_REQUEST = 31;
@@ -1612,11 +1612,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int DATA_STORAGE_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl <em>Event Filter Configuration</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.EventFilterConfigurationImpl <em>Event Filter Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterConfiguration()
+	 * @see ipos.project.data.datamodel.impl.EventFilterConfigurationImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterConfiguration()
 	 * @generated
 	 */
 	int EVENT_FILTER_CONFIGURATION = 32;
@@ -1676,11 +1676,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int EVENT_FILTER_CONFIGURATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelQueryRequestImpl <em>World Model Query Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.WorldModelQueryRequestImpl <em>World Model Query Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelQueryRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelQueryRequest()
+	 * @see ipos.project.data.datamodel.impl.WorldModelQueryRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelQueryRequest()
 	 * @generated
 	 */
 	int WORLD_MODEL_QUERY_REQUEST = 33;
@@ -1704,11 +1704,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int WORLD_MODEL_QUERY_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageQueryRequestImpl <em>Data Storage Query Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.DataStorageQueryRequestImpl <em>Data Storage Query Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageQueryRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageQueryRequest()
+	 * @see ipos.project.data.datamodel.impl.DataStorageQueryRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageQueryRequest()
 	 * @generated
 	 */
 	int DATA_STORAGE_QUERY_REQUEST = 34;
@@ -1732,11 +1732,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int DATA_STORAGE_QUERY_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentRegistrationRequestImpl <em>Agent Registration Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.AgentRegistrationRequestImpl <em>Agent Registration Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentRegistrationRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAgentRegistrationRequest()
+	 * @see ipos.project.data.datamodel.impl.AgentRegistrationRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAgentRegistrationRequest()
 	 * @generated
 	 */
 	int AGENT_REGISTRATION_REQUEST = 35;
@@ -1760,11 +1760,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int AGENT_REGISTRATION_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringTaskImpl <em>Monitoring Task</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.MonitoringTaskImpl <em>Monitoring Task</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringTaskImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringTask()
+	 * @see ipos.project.data.datamodel.impl.MonitoringTaskImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringTask()
 	 * @generated
 	 */
 	int MONITORING_TASK = 36;
@@ -1797,11 +1797,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int MONITORING_TASK_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingTaskImpl <em>Tracking Task</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.TrackingTaskImpl <em>Tracking Task</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingTaskImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getTrackingTask()
+	 * @see ipos.project.data.datamodel.impl.TrackingTaskImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getTrackingTask()
 	 * @generated
 	 */
 	int TRACKING_TASK = 37;
@@ -1834,11 +1834,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int TRACKING_TASK_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl <em>World Model</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.WorldModelImpl <em>World Model</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWorldModel()
+	 * @see ipos.project.data.datamodel.impl.WorldModelImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWorldModel()
 	 * @generated
 	 */
 	int WORLD_MODEL = 38;
@@ -1898,11 +1898,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int WORLD_MODEL_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BarcodeImpl <em>Barcode</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.BarcodeImpl <em>Barcode</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.BarcodeImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBarcode()
+	 * @see ipos.project.data.datamodel.impl.BarcodeImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBarcode()
 	 * @generated
 	 */
 	int BARCODE = 39;
@@ -1962,11 +1962,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int BARCODE_OPERATION_COUNT = PROXIMITY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherProxImpl <em>Other Prox</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.OtherProxImpl <em>Other Prox</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherProxImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getOtherProx()
+	 * @see ipos.project.data.datamodel.impl.OtherProxImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getOtherProx()
 	 * @generated
 	 */
 	int OTHER_PROX = 40;
@@ -2035,11 +2035,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int OTHER_PROX_OPERATION_COUNT = PROXIMITY_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BluetoothImpl <em>Bluetooth</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.BluetoothImpl <em>Bluetooth</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.BluetoothImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBluetooth()
+	 * @see ipos.project.data.datamodel.impl.BluetoothImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBluetooth()
 	 * @generated
 	 */
 	int BLUETOOTH = 41;
@@ -2099,11 +2099,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int BLUETOOTH_OPERATION_COUNT = BEACON_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.UWBImpl <em>UWB</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.UWBImpl <em>UWB</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.UWBImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getUWB()
+	 * @see ipos.project.data.datamodel.impl.UWBImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getUWB()
 	 * @generated
 	 */
 	int UWB = 42;
@@ -2154,11 +2154,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int UWB_OPERATION_COUNT = BEACON_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SensorConfigurationRequestImpl <em>Sensor Configuration Request</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.SensorConfigurationRequestImpl <em>Sensor Configuration Request</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.SensorConfigurationRequestImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getSensorConfigurationRequest()
+	 * @see ipos.project.data.datamodel.impl.SensorConfigurationRequestImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getSensorConfigurationRequest()
 	 * @generated
 	 */
 	int SENSOR_CONFIGURATION_REQUEST = 43;
@@ -2182,11 +2182,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int SENSOR_CONFIGURATION_REQUEST_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherBeaconImpl <em>Other Beacon</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.OtherBeaconImpl <em>Other Beacon</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherBeaconImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getOtherBeacon()
+	 * @see ipos.project.data.datamodel.impl.OtherBeaconImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getOtherBeacon()
 	 * @generated
 	 */
 	int OTHER_BEACON = 44;
@@ -2246,11 +2246,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int OTHER_BEACON_OPERATION_COUNT = BEACON_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl <em>POI</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.POIImpl <em>POI</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPOI()
+	 * @see ipos.project.data.datamodel.impl.POIImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPOI()
 	 * @generated
 	 */
 	int POI = 45;
@@ -2301,11 +2301,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	int POI_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl <em>Event Filter Condition</em>}' class.
+	 * The meta object id for the '{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl <em>Event Filter Condition</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterCondition()
+	 * @see ipos.project.data.datamodel.impl.EventFilterConditionImpl
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterCondition()
 	 * @generated
 	 */
 	int EVENT_FILTER_CONDITION = 46;
@@ -2423,7 +2423,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see java.util.List
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getStringList()
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getStringList()
 	 * @generated
 	 */
 	int STRING_LIST = 47;
@@ -2432,7 +2432,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 * The meta object id for the '<em>String Array</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getStringArray()
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getStringArray()
 	 * @generated
 	 */
 	int STRING_ARRAY = 48;
@@ -2441,7 +2441,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 * The meta object id for the '<em>Float Array3d</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray3d()
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray3d()
 	 * @generated
 	 */
 	int FLOAT_ARRAY3D = 49;
@@ -2450,7 +2450,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 * The meta object id for the '<em>Boolean List</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBooleanList()
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBooleanList()
 	 * @generated
 	 */
 	int BOOLEAN_LIST = 50;
@@ -2459,1422 +2459,1422 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 * The meta object id for the '<em>Float Array</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray()
+	 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray()
 	 * @generated
 	 */
 	int FLOAT_ARRAY = 51;
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent <em>Agent</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Agent <em>Agent</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Agent</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Agent
+	 * @see ipos.project.data.datamodel.Agent
 	 * @generated
 	 */
 	EClass getAgent();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent#getLObject <em>LObject</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.Agent#getLObject <em>LObject</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>LObject</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Agent#getLObject()
+	 * @see ipos.project.data.datamodel.Agent#getLObject()
 	 * @see #getAgent()
 	 * @generated
 	 */
 	EReference getAgent_LObject();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent#getAgentType <em>Agent Type</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Agent#getAgentType <em>Agent Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Agent Type</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Agent#getAgentType()
+	 * @see ipos.project.data.datamodel.Agent#getAgentType()
 	 * @see #getAgent()
 	 * @generated
 	 */
 	EAttribute getAgent_AgentType();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Entity <em>Entity</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Entity <em>Entity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Entity</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Entity
+	 * @see ipos.project.data.datamodel.Entity
 	 * @generated
 	 */
 	EClass getEntity();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Entity#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Entity#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Entity#getId()
+	 * @see ipos.project.data.datamodel.Entity#getId()
 	 * @see #getEntity()
 	 * @generated
 	 */
 	EAttribute getEntity_Id();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject <em>Localizable Object</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.LocalizableObject <em>Localizable Object</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Localizable Object</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject
+	 * @see ipos.project.data.datamodel.LocalizableObject
 	 * @generated
 	 */
 	EClass getLocalizableObject();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getCurrentPlacing <em>Current Placing</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.LocalizableObject#getCurrentPlacing <em>Current Placing</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Current Placing</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getCurrentPlacing()
+	 * @see ipos.project.data.datamodel.LocalizableObject#getCurrentPlacing()
 	 * @see #getLocalizableObject()
 	 * @generated
 	 */
 	EReference getLocalizableObject_CurrentPlacing();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getLastPosUpdate <em>Last Pos Update</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.LocalizableObject#getLastPosUpdate <em>Last Pos Update</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Last Pos Update</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getLastPosUpdate()
+	 * @see ipos.project.data.datamodel.LocalizableObject#getLastPosUpdate()
 	 * @see #getLocalizableObject()
 	 * @generated
 	 */
 	EAttribute getLocalizableObject_LastPosUpdate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getSensorType <em>Sensor Type</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.LocalizableObject#getSensorType <em>Sensor Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Sensor Type</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getSensorType()
+	 * @see ipos.project.data.datamodel.LocalizableObject#getSensorType()
 	 * @see #getLocalizableObject()
 	 * @generated
 	 */
 	EAttribute getLocalizableObject_SensorType();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getAgent <em>Agent</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.LocalizableObject#getAgent <em>Agent</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Agent</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getAgent()
+	 * @see ipos.project.data.datamodel.LocalizableObject#getAgent()
 	 * @see #getLocalizableObject()
 	 * @generated
 	 */
 	EReference getLocalizableObject_Agent();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing <em>Placing</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Placing <em>Placing</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Placing</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Placing
+	 * @see ipos.project.data.datamodel.Placing
 	 * @generated
 	 */
 	EClass getPlacing();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing#getPosition <em>Position</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.Placing#getPosition <em>Position</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Position</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Placing#getPosition()
+	 * @see ipos.project.data.datamodel.Placing#getPosition()
 	 * @see #getPlacing()
 	 * @generated
 	 */
 	EReference getPlacing_Position();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing#getOrientation <em>Orientation</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.Placing#getOrientation <em>Orientation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Orientation</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Placing#getOrientation()
+	 * @see ipos.project.data.datamodel.Placing#getOrientation()
 	 * @see #getPlacing()
 	 * @generated
 	 */
 	EReference getPlacing_Orientation();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position <em>Position</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Position <em>Position</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Position</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Position
+	 * @see ipos.project.data.datamodel.Position
 	 * @generated
 	 */
 	EClass getPosition();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getAccuracy <em>Accuracy</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.Position#getAccuracy <em>Accuracy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Accuracy</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Position#getAccuracy()
+	 * @see ipos.project.data.datamodel.Position#getAccuracy()
 	 * @see #getPosition()
 	 * @generated
 	 */
 	EReference getPosition_Accuracy();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getPoint <em>Point</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.Position#getPoint <em>Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Point</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Position#getPoint()
+	 * @see ipos.project.data.datamodel.Position#getPoint()
 	 * @see #getPosition()
 	 * @generated
 	 */
 	EReference getPosition_Point();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getReferenceSystem <em>Reference System</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.Position#getReferenceSystem <em>Reference System</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Reference System</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Position#getReferenceSystem()
+	 * @see ipos.project.data.datamodel.Position#getReferenceSystem()
 	 * @see #getPosition()
 	 * @generated
 	 */
 	EReference getPosition_ReferenceSystem();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Orientation <em>Orientation</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Orientation <em>Orientation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Orientation</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Orientation
+	 * @see ipos.project.data.datamodel.Orientation
 	 * @generated
 	 */
 	EClass getOrientation();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point <em>WGS84 Point</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.WGS84Point <em>WGS84 Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>WGS84 Point</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point
+	 * @see ipos.project.data.datamodel.WGS84Point
 	 * @generated
 	 */
 	EClass getWGS84Point();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLongitude <em>Longitude</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.WGS84Point#getLongitude <em>Longitude</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Longitude</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLongitude()
+	 * @see ipos.project.data.datamodel.WGS84Point#getLongitude()
 	 * @see #getWGS84Point()
 	 * @generated
 	 */
 	EAttribute getWGS84Point_Longitude();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLatitude <em>Latitude</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.WGS84Point#getLatitude <em>Latitude</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Latitude</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLatitude()
+	 * @see ipos.project.data.datamodel.WGS84Point#getLatitude()
 	 * @see #getWGS84Point()
 	 * @generated
 	 */
 	EAttribute getWGS84Point_Latitude();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getAltitude <em>Altitude</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.WGS84Point#getAltitude <em>Altitude</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Altitude</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getAltitude()
+	 * @see ipos.project.data.datamodel.WGS84Point#getAltitude()
 	 * @see #getWGS84Point()
 	 * @generated
 	 */
 	EAttribute getWGS84Point_Altitude();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Accuracy <em>Accuracy</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Accuracy <em>Accuracy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Accuracy</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Accuracy
+	 * @see ipos.project.data.datamodel.Accuracy
 	 * @generated
 	 */
 	EClass getAccuracy();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D <em>Point2 D</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Point2D <em>Point2 D</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Point2 D</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point2D
+	 * @see ipos.project.data.datamodel.Point2D
 	 * @generated
 	 */
 	EClass getPoint2D();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getX <em>X</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Point2D#getX <em>X</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getX()
+	 * @see ipos.project.data.datamodel.Point2D#getX()
 	 * @see #getPoint2D()
 	 * @generated
 	 */
 	EAttribute getPoint2D_X();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getY <em>Y</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Point2D#getY <em>Y</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getY()
+	 * @see ipos.project.data.datamodel.Point2D#getY()
 	 * @see #getPoint2D()
 	 * @generated
 	 */
 	EAttribute getPoint2D_Y();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D <em>Point3 D</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Point3D <em>Point3 D</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Point3 D</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point3D
+	 * @see ipos.project.data.datamodel.Point3D
 	 * @generated
 	 */
 	EClass getPoint3D();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getX <em>X</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Point3D#getX <em>X</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getX()
+	 * @see ipos.project.data.datamodel.Point3D#getX()
 	 * @see #getPoint3D()
 	 * @generated
 	 */
 	EAttribute getPoint3D_X();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getY <em>Y</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Point3D#getY <em>Y</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getY()
+	 * @see ipos.project.data.datamodel.Point3D#getY()
 	 * @see #getPoint3D()
 	 * @generated
 	 */
 	EAttribute getPoint3D_Y();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getZ <em>Z</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Point3D#getZ <em>Z</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Z</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getZ()
+	 * @see ipos.project.data.datamodel.Point3D#getZ()
 	 * @see #getPoint3D()
 	 * @generated
 	 */
 	EAttribute getPoint3D_Z();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem <em>Reference System</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.ReferenceSystem <em>Reference System</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Reference System</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem
+	 * @see ipos.project.data.datamodel.ReferenceSystem
 	 * @generated
 	 */
 	EClass getReferenceSystem();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getOrigin <em>Origin</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.ReferenceSystem#getOrigin <em>Origin</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Origin</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getOrigin()
+	 * @see ipos.project.data.datamodel.ReferenceSystem#getOrigin()
 	 * @see #getReferenceSystem()
 	 * @generated
 	 */
 	EReference getReferenceSystem_Origin();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.ReferenceSystem#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getName()
+	 * @see ipos.project.data.datamodel.ReferenceSystem#getName()
 	 * @see #getReferenceSystem()
 	 * @generated
 	 */
 	EAttribute getReferenceSystem_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.ReferenceSystem#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getId()
+	 * @see ipos.project.data.datamodel.ReferenceSystem#getId()
 	 * @see #getReferenceSystem()
 	 * @generated
 	 */
 	EAttribute getReferenceSystem_Id();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone <em>Zone</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Zone <em>Zone</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Zone</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Zone
+	 * @see ipos.project.data.datamodel.Zone
 	 * @generated
 	 */
 	EClass getZone();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getSpace <em>Space</em>}'.
+	 * Returns the meta object for the containment reference list '{@link ipos.project.data.datamodel.Zone#getSpace <em>Space</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Space</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Zone#getSpace()
+	 * @see ipos.project.data.datamodel.Zone#getSpace()
 	 * @see #getZone()
 	 * @generated
 	 */
 	EReference getZone_Space();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Zone#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Zone#getName()
+	 * @see ipos.project.data.datamodel.Zone#getName()
 	 * @see #getZone()
 	 * @generated
 	 */
 	EAttribute getZone_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Zone#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Zone#getId()
+	 * @see ipos.project.data.datamodel.Zone#getId()
 	 * @see #getZone()
 	 * @generated
 	 */
 	EAttribute getZone_Id();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getCentrePoint <em>Centre Point</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.Zone#getCentrePoint <em>Centre Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Centre Point</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Zone#getCentrePoint()
+	 * @see ipos.project.data.datamodel.Zone#getCentrePoint()
 	 * @see #getZone()
 	 * @generated
 	 */
 	EReference getZone_CentrePoint();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap <em>Zone Map</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.ZoneMap <em>Zone Map</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Zone Map</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap
+	 * @see ipos.project.data.datamodel.ZoneMap
 	 * @generated
 	 */
 	EClass getZoneMap();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap#getZone <em>Zone</em>}'.
+	 * Returns the meta object for the containment reference list '{@link ipos.project.data.datamodel.ZoneMap#getZone <em>Zone</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Zone</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap#getZone()
+	 * @see ipos.project.data.datamodel.ZoneMap#getZone()
 	 * @see #getZoneMap()
 	 * @generated
 	 */
 	EReference getZoneMap_Zone();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space <em>Space</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Space <em>Space</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Space</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Space
+	 * @see ipos.project.data.datamodel.Space
 	 * @generated
 	 */
 	EClass getSpace();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getX <em>X</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Space#getX <em>X</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Space#getX()
+	 * @see ipos.project.data.datamodel.Space#getX()
 	 * @see #getSpace()
 	 * @generated
 	 */
 	EAttribute getSpace_X();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getY <em>Y</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Space#getY <em>Y</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Space#getY()
+	 * @see ipos.project.data.datamodel.Space#getY()
 	 * @see #getSpace()
 	 * @generated
 	 */
 	EAttribute getSpace_Y();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getZ <em>Z</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Space#getZ <em>Z</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Z</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Space#getZ()
+	 * @see ipos.project.data.datamodel.Space#getZ()
 	 * @see #getSpace()
 	 * @generated
 	 */
 	EAttribute getSpace_Z();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.MapType <em>Map Type</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.MapType <em>Map Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Map Type</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MapType
+	 * @see ipos.project.data.datamodel.MapType
 	 * @generated
 	 */
 	EClass getMapType();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion <em>Quaternion</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Quaternion <em>Quaternion</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Quaternion</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Quaternion
+	 * @see ipos.project.data.datamodel.Quaternion
 	 * @generated
 	 */
 	EClass getQuaternion();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getX <em>X</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Quaternion#getX <em>X</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getX()
+	 * @see ipos.project.data.datamodel.Quaternion#getX()
 	 * @see #getQuaternion()
 	 * @generated
 	 */
 	EAttribute getQuaternion_X();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getY <em>Y</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Quaternion#getY <em>Y</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getY()
+	 * @see ipos.project.data.datamodel.Quaternion#getY()
 	 * @see #getQuaternion()
 	 * @generated
 	 */
 	EAttribute getQuaternion_Y();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getZ <em>Z</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Quaternion#getZ <em>Z</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Z</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getZ()
+	 * @see ipos.project.data.datamodel.Quaternion#getZ()
 	 * @see #getQuaternion()
 	 * @generated
 	 */
 	EAttribute getQuaternion_Z();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getW <em>W</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Quaternion#getW <em>W</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>W</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getW()
+	 * @see ipos.project.data.datamodel.Quaternion#getW()
 	 * @see #getQuaternion()
 	 * @generated
 	 */
 	EAttribute getQuaternion_W();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Gaussian <em>Gaussian</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Gaussian <em>Gaussian</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Gaussian</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Gaussian
+	 * @see ipos.project.data.datamodel.Gaussian
 	 * @generated
 	 */
 	EClass getGaussian();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Gaussian#getConfidenceInterval <em>Confidence Interval</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Gaussian#getConfidenceInterval <em>Confidence Interval</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Confidence Interval</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Gaussian#getConfidenceInterval()
+	 * @see ipos.project.data.datamodel.Gaussian#getConfidenceInterval()
 	 * @see #getGaussian()
 	 * @generated
 	 */
 	EAttribute getGaussian_ConfidenceInterval();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point <em>Point</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Point <em>Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Point</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point
+	 * @see ipos.project.data.datamodel.Point
 	 * @generated
 	 */
 	EClass getPoint();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Rawdata <em>Rawdata</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Rawdata <em>Rawdata</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Rawdata</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Rawdata
+	 * @see ipos.project.data.datamodel.Rawdata
 	 * @generated
 	 */
 	EClass getRawdata();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Rawdata#getSensorId <em>Sensor Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Rawdata#getSensorId <em>Sensor Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Sensor Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Rawdata#getSensorId()
+	 * @see ipos.project.data.datamodel.Rawdata#getSensorId()
 	 * @see #getRawdata()
 	 * @generated
 	 */
 	EAttribute getRawdata_SensorId();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity <em>Proximity</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Proximity <em>Proximity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Proximity</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Proximity
+	 * @see ipos.project.data.datamodel.Proximity
 	 * @generated
 	 */
 	EClass getProximity();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getTagId <em>Tag Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Proximity#getTagId <em>Tag Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Tag Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getTagId()
+	 * @see ipos.project.data.datamodel.Proximity#getTagId()
 	 * @see #getProximity()
 	 * @generated
 	 */
 	EAttribute getProximity_TagId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getType <em>Type</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Proximity#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getType()
+	 * @see ipos.project.data.datamodel.Proximity#getType()
 	 * @see #getProximity()
 	 * @generated
 	 */
 	EAttribute getProximity_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getScannerId <em>Scanner Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Proximity#getScannerId <em>Scanner Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Scanner Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getScannerId()
+	 * @see ipos.project.data.datamodel.Proximity#getScannerId()
 	 * @see #getProximity()
 	 * @generated
 	 */
 	EAttribute getProximity_ScannerId();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.RFID <em>RFID</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.RFID <em>RFID</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>RFID</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.RFID
+	 * @see ipos.project.data.datamodel.RFID
 	 * @generated
 	 */
 	EClass getRFID();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.RFID#getLocation <em>Location</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.RFID#getLocation <em>Location</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.RFID#getLocation()
+	 * @see ipos.project.data.datamodel.RFID#getLocation()
 	 * @see #getRFID()
 	 * @generated
 	 */
 	EAttribute getRFID_Location();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.NFC <em>NFC</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.NFC <em>NFC</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>NFC</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.NFC
+	 * @see ipos.project.data.datamodel.NFC
 	 * @generated
 	 */
 	EClass getNFC();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.NFC#getTagData <em>Tag Data</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.NFC#getTagData <em>Tag Data</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Tag Data</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.NFC#getTagData()
+	 * @see ipos.project.data.datamodel.NFC#getTagData()
 	 * @see #getNFC()
 	 * @generated
 	 */
 	EAttribute getNFC_TagData();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU <em>IMU</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.IMU <em>IMU</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>IMU</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IMU
+	 * @see ipos.project.data.datamodel.IMU
 	 * @generated
 	 */
 	EClass getIMU();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAngularrate <em>Angularrate</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.IMU#getAngularrate <em>Angularrate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Angularrate</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAngularrate()
+	 * @see ipos.project.data.datamodel.IMU#getAngularrate()
 	 * @see #getIMU()
 	 * @generated
 	 */
 	EReference getIMU_Angularrate();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAcceleration <em>Acceleration</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.IMU#getAcceleration <em>Acceleration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Acceleration</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IMU#getAcceleration()
+	 * @see ipos.project.data.datamodel.IMU#getAcceleration()
 	 * @see #getIMU()
 	 * @generated
 	 */
 	EReference getIMU_Acceleration();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.AngularRate <em>Angular Rate</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.AngularRate <em>Angular Rate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Angular Rate</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.AngularRate
+	 * @see ipos.project.data.datamodel.AngularRate
 	 * @generated
 	 */
 	EClass getAngularRate();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Acceleration <em>Acceleration</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Acceleration <em>Acceleration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Acceleration</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Acceleration
+	 * @see ipos.project.data.datamodel.Acceleration
 	 * @generated
 	 */
 	EClass getAcceleration();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon <em>Beacon</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Beacon <em>Beacon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Beacon</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Beacon
+	 * @see ipos.project.data.datamodel.Beacon
 	 * @generated
 	 */
 	EClass getBeacon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getDistances <em>Distances</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Beacon#getDistances <em>Distances</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Distances</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getDistances()
+	 * @see ipos.project.data.datamodel.Beacon#getDistances()
 	 * @see #getBeacon()
 	 * @generated
 	 */
 	EAttribute getBeacon_Distances();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getType <em>Type</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Beacon#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Beacon#getType()
+	 * @see ipos.project.data.datamodel.Beacon#getType()
 	 * @see #getBeacon()
 	 * @generated
 	 */
 	EAttribute getBeacon_Type();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent <em>Position Event</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.PositionEvent <em>Position Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Position Event</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent
+	 * @see ipos.project.data.datamodel.PositionEvent
 	 * @generated
 	 */
 	EClass getPositionEvent();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getPlacing <em>Placing</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.PositionEvent#getPlacing <em>Placing</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Placing</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getPlacing()
+	 * @see ipos.project.data.datamodel.PositionEvent#getPlacing()
 	 * @see #getPositionEvent()
 	 * @generated
 	 */
 	EReference getPositionEvent_Placing();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getTimeStamp <em>Time Stamp</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.PositionEvent#getTimeStamp <em>Time Stamp</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Time Stamp</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getTimeStamp()
+	 * @see ipos.project.data.datamodel.PositionEvent#getTimeStamp()
 	 * @see #getPositionEvent()
 	 * @generated
 	 */
 	EAttribute getPositionEvent_TimeStamp();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getSensorId <em>Sensor Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.PositionEvent#getSensorId <em>Sensor Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Sensor Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getSensorId()
+	 * @see ipos.project.data.datamodel.PositionEvent#getSensorId()
 	 * @see #getPositionEvent()
 	 * @generated
 	 */
 	EAttribute getPositionEvent_SensorId();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent <em>Rawdata Event</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.RawdataEvent <em>Rawdata Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Rawdata Event</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent
+	 * @see ipos.project.data.datamodel.RawdataEvent
 	 * @generated
 	 */
 	EClass getRawdataEvent();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent#getRawdata <em>Rawdata</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.RawdataEvent#getRawdata <em>Rawdata</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Rawdata</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent#getRawdata()
+	 * @see ipos.project.data.datamodel.RawdataEvent#getRawdata()
 	 * @see #getRawdataEvent()
 	 * @generated
 	 */
 	EReference getRawdataEvent_Rawdata();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingRequest <em>Tracking Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.TrackingRequest <em>Tracking Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Tracking Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.TrackingRequest
+	 * @see ipos.project.data.datamodel.TrackingRequest
 	 * @generated
 	 */
 	EClass getTrackingRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest <em>Monitoring Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.MonitoringRequest <em>Monitoring Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Monitoring Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest
+	 * @see ipos.project.data.datamodel.MonitoringRequest
 	 * @generated
 	 */
 	EClass getMonitoringRequest();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFrameId <em>Frame Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getFrameId <em>Frame Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Frame Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFrameId()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getFrameId()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_FrameId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getDelta <em>Delta</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getDelta <em>Delta</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Delta</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getDelta()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getDelta()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_Delta();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getUpdateFrequency <em>Update Frequency</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getUpdateFrequency <em>Update Frequency</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Update Frequency</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getUpdateFrequency()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getUpdateFrequency()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_UpdateFrequency();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getType <em>Type</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getType()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getType()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getId()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getId()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFusionStrategy <em>Fusion Strategy</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getFusionStrategy <em>Fusion Strategy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Fusion Strategy</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFusionStrategy()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getFusionStrategy()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_FusionStrategy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#isExitNotification <em>Exit Notification</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#isExitNotification <em>Exit Notification</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Exit Notification</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#isExitNotification()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#isExitNotification()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_ExitNotification();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getProperties <em>Properties</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getProperties <em>Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Properties</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getProperties()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getProperties()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_Properties();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Monitoring Task Id</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getMonitoringTaskId()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getMonitoringTaskId()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_MonitoringTaskId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Requestor Protocol</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getRequestorProtocol()
+	 * @see ipos.project.data.datamodel.MonitoringRequest#getRequestorProtocol()
 	 * @see #getMonitoringRequest()
 	 * @generated
 	 */
 	EAttribute getMonitoringRequest_RequestorProtocol();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModelUpdateRequest <em>World Model Update Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.WorldModelUpdateRequest <em>World Model Update Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>World Model Update Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModelUpdateRequest
+	 * @see ipos.project.data.datamodel.WorldModelUpdateRequest
 	 * @generated
 	 */
 	EClass getWorldModelUpdateRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest <em>Data Storage Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.DataStorageRequest <em>Data Storage Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Data Storage Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest
+	 * @see ipos.project.data.datamodel.DataStorageRequest
 	 * @generated
 	 */
 	EClass getDataStorageRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration <em>Event Filter Configuration</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.EventFilterConfiguration <em>Event Filter Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Event Filter Configuration</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration
+	 * @see ipos.project.data.datamodel.EventFilterConfiguration
 	 * @generated
 	 */
 	EClass getEventFilterConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Position Ambiguity Strategy</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy()
+	 * @see ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityStrategy()
 	 * @see #getEventFilterConfiguration()
 	 * @generated
 	 */
 	EAttribute getEventFilterConfiguration_PositionAmbiguityStrategy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Position Ambiguity Parameters</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getPositionAmbiguityParameters()
+	 * @see ipos.project.data.datamodel.EventFilterConfiguration#getPositionAmbiguityParameters()
 	 * @see #getEventFilterConfiguration()
 	 * @generated
 	 */
 	EAttribute getEventFilterConfiguration_PositionAmbiguityParameters();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getFilterCriteria <em>Filter Criteria</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterConfiguration#getFilterCriteria <em>Filter Criteria</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Filter Criteria</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getFilterCriteria()
+	 * @see ipos.project.data.datamodel.EventFilterConfiguration#getFilterCriteria()
 	 * @see #getEventFilterConfiguration()
 	 * @generated
 	 */
 	EAttribute getEventFilterConfiguration_FilterCriteria();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getEventfiltercondition <em>Eventfiltercondition</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.EventFilterConfiguration#getEventfiltercondition <em>Eventfiltercondition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Eventfiltercondition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration#getEventfiltercondition()
+	 * @see ipos.project.data.datamodel.EventFilterConfiguration#getEventfiltercondition()
 	 * @see #getEventFilterConfiguration()
 	 * @generated
 	 */
 	EReference getEventFilterConfiguration_Eventfiltercondition();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModelQueryRequest <em>World Model Query Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.WorldModelQueryRequest <em>World Model Query Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>World Model Query Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModelQueryRequest
+	 * @see ipos.project.data.datamodel.WorldModelQueryRequest
 	 * @generated
 	 */
 	EClass getWorldModelQueryRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.DataStorageQueryRequest <em>Data Storage Query Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.DataStorageQueryRequest <em>Data Storage Query Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Data Storage Query Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.DataStorageQueryRequest
+	 * @see ipos.project.data.datamodel.DataStorageQueryRequest
 	 * @generated
 	 */
 	EClass getDataStorageQueryRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest <em>Agent Registration Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.AgentRegistrationRequest <em>Agent Registration Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Agent Registration Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest
+	 * @see ipos.project.data.datamodel.AgentRegistrationRequest
 	 * @generated
 	 */
 	EClass getAgentRegistrationRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask <em>Monitoring Task</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.MonitoringTask <em>Monitoring Task</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Monitoring Task</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask
+	 * @see ipos.project.data.datamodel.MonitoringTask
 	 * @generated
 	 */
 	EClass getMonitoringTask();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.MonitoringTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Eventfilterconfiguration</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask#getEventfilterconfiguration()
+	 * @see ipos.project.data.datamodel.MonitoringTask#getEventfilterconfiguration()
 	 * @see #getMonitoringTask()
 	 * @generated
 	 */
 	EReference getMonitoringTask_Eventfilterconfiguration();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask <em>Tracking Task</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.TrackingTask <em>Tracking Task</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Tracking Task</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask
+	 * @see ipos.project.data.datamodel.TrackingTask
 	 * @generated
 	 */
 	EClass getTrackingTask();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.TrackingTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Eventfilterconfiguration</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask#getEventfilterconfiguration()
+	 * @see ipos.project.data.datamodel.TrackingTask#getEventfilterconfiguration()
 	 * @see #getTrackingTask()
 	 * @generated
 	 */
 	EReference getTrackingTask_Eventfilterconfiguration();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel <em>World Model</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.WorldModel <em>World Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>World Model</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModel
+	 * @see ipos.project.data.datamodel.WorldModel
 	 * @generated
 	 */
 	EClass getWorldModel();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getAgent <em>Agent</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.WorldModel#getAgent <em>Agent</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Agent</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getAgent()
+	 * @see ipos.project.data.datamodel.WorldModel#getAgent()
 	 * @see #getWorldModel()
 	 * @generated
 	 */
 	EReference getWorldModel_Agent();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getZoneMap <em>Zone Map</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.WorldModel#getZoneMap <em>Zone Map</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Zone Map</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getZoneMap()
+	 * @see ipos.project.data.datamodel.WorldModel#getZoneMap()
 	 * @see #getWorldModel()
 	 * @generated
 	 */
 	EReference getWorldModel_ZoneMap();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getPois <em>Pois</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.WorldModel#getPois <em>Pois</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Pois</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getPois()
+	 * @see ipos.project.data.datamodel.WorldModel#getPois()
 	 * @see #getWorldModel()
 	 * @generated
 	 */
 	EReference getWorldModel_Pois();
 
 	/**
-	 * Returns the meta object for the reference list '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getReferenceSystem <em>Reference System</em>}'.
+	 * Returns the meta object for the reference list '{@link ipos.project.data.datamodel.WorldModel#getReferenceSystem <em>Reference System</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Reference System</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getReferenceSystem()
+	 * @see ipos.project.data.datamodel.WorldModel#getReferenceSystem()
 	 * @see #getWorldModel()
 	 * @generated
 	 */
 	EReference getWorldModel_ReferenceSystem();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Barcode <em>Barcode</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Barcode <em>Barcode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Barcode</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Barcode
+	 * @see ipos.project.data.datamodel.Barcode
 	 * @generated
 	 */
 	EClass getBarcode();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherProx <em>Other Prox</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.OtherProx <em>Other Prox</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Other Prox</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.OtherProx
+	 * @see ipos.project.data.datamodel.OtherProx
 	 * @generated
 	 */
 	EClass getOtherProx();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherProx#getData <em>Data</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.OtherProx#getData <em>Data</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Data</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.OtherProx#getData()
+	 * @see ipos.project.data.datamodel.OtherProx#getData()
 	 * @see #getOtherProx()
 	 * @generated
 	 */
 	EAttribute getOtherProx_Data();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth <em>Bluetooth</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.Bluetooth <em>Bluetooth</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Bluetooth</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth
+	 * @see ipos.project.data.datamodel.Bluetooth
 	 * @generated
 	 */
 	EClass getBluetooth();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth#getRss <em>Rss</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.Bluetooth#getRss <em>Rss</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Rss</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth#getRss()
+	 * @see ipos.project.data.datamodel.Bluetooth#getRss()
 	 * @see #getBluetooth()
 	 * @generated
 	 */
 	EAttribute getBluetooth_Rss();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.UWB <em>UWB</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.UWB <em>UWB</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>UWB</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.UWB
+	 * @see ipos.project.data.datamodel.UWB
 	 * @generated
 	 */
 	EClass getUWB();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.SensorConfigurationRequest <em>Sensor Configuration Request</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.SensorConfigurationRequest <em>Sensor Configuration Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Sensor Configuration Request</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.SensorConfigurationRequest
+	 * @see ipos.project.data.datamodel.SensorConfigurationRequest
 	 * @generated
 	 */
 	EClass getSensorConfigurationRequest();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon <em>Other Beacon</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.OtherBeacon <em>Other Beacon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Other Beacon</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon
+	 * @see ipos.project.data.datamodel.OtherBeacon
 	 * @generated
 	 */
 	EClass getOtherBeacon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon#getData <em>Data</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.OtherBeacon#getData <em>Data</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Data</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon#getData()
+	 * @see ipos.project.data.datamodel.OtherBeacon#getData()
 	 * @see #getOtherBeacon()
 	 * @generated
 	 */
 	EAttribute getOtherBeacon_Data();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI <em>POI</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.POI <em>POI</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>POI</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.POI
+	 * @see ipos.project.data.datamodel.POI
 	 * @generated
 	 */
 	EClass getPOI();
 
 	/**
-	 * Returns the meta object for the reference '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getPosition <em>Position</em>}'.
+	 * Returns the meta object for the reference '{@link ipos.project.data.datamodel.POI#getPosition <em>Position</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Position</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.POI#getPosition()
+	 * @see ipos.project.data.datamodel.POI#getPosition()
 	 * @see #getPOI()
 	 * @generated
 	 */
 	EReference getPOI_Position();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.POI#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.POI#getDescription()
+	 * @see ipos.project.data.datamodel.POI#getDescription()
 	 * @see #getPOI()
 	 * @generated
 	 */
 	EAttribute getPOI_Description();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getData <em>Data</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.POI#getData <em>Data</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Data</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.POI#getData()
+	 * @see ipos.project.data.datamodel.POI#getData()
 	 * @see #getPOI()
 	 * @generated
 	 */
 	EAttribute getPOI_Data();
 
 	/**
-	 * Returns the meta object for class '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition <em>Event Filter Condition</em>}'.
+	 * Returns the meta object for class '{@link ipos.project.data.datamodel.EventFilterCondition <em>Event Filter Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Event Filter Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition
+	 * @see ipos.project.data.datamodel.EventFilterCondition
 	 * @generated
 	 */
 	EClass getEventFilterCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Time Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeCondition()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getTimeCondition()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_TimeCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Category Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getCategoryCondition()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_CategoryCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getIdCondition()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_IdCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Accuracy Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getAccuracyCondition()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getAccuracyCondition()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_AccuracyCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Position Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionCondition()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getPositionCondition()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_PositionCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Time Min Interval</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeMinInterval()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getTimeMinInterval()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_TimeMinInterval();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionDelta <em>Position Delta</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getPositionDelta <em>Position Delta</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Position Delta</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionDelta()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getPositionDelta()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_PositionDelta();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Sensor Id Condition</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getSensorIdCondition()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getSensorIdCondition()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_SensorIdCondition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Filter Structure</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getFilterStructure()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getFilterStructure()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
 	EAttribute getEventFilterCondition_FilterStructure();
 
 	/**
-	 * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}'.
+	 * Returns the meta object for the attribute '{@link ipos.project.data.datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Position Condition Cell</em>'.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionConditionCell()
+	 * @see ipos.project.data.datamodel.EventFilterCondition#getPositionConditionCell()
 	 * @see #getEventFilterCondition()
 	 * @generated
 	 */
@@ -3955,11 +3955,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentImpl <em>Agent</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.AgentImpl <em>Agent</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAgent()
+		 * @see ipos.project.data.datamodel.impl.AgentImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAgent()
 		 * @generated
 		 */
 		EClass AGENT = eINSTANCE.getAgent();
@@ -3981,11 +3981,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute AGENT__AGENT_TYPE = eINSTANCE.getAgent_AgentType();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EntityImpl <em>Entity</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.EntityImpl <em>Entity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.EntityImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getEntity()
+		 * @see ipos.project.data.datamodel.impl.EntityImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getEntity()
 		 * @generated
 		 */
 		EClass ENTITY = eINSTANCE.getEntity();
@@ -3999,11 +3999,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute ENTITY__ID = eINSTANCE.getEntity_Id();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl <em>Localizable Object</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.LocalizableObjectImpl <em>Localizable Object</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getLocalizableObject()
+		 * @see ipos.project.data.datamodel.impl.LocalizableObjectImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getLocalizableObject()
 		 * @generated
 		 */
 		EClass LOCALIZABLE_OBJECT = eINSTANCE.getLocalizableObject();
@@ -4041,11 +4041,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference LOCALIZABLE_OBJECT__AGENT = eINSTANCE.getLocalizableObject_Agent();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PlacingImpl <em>Placing</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.PlacingImpl <em>Placing</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PlacingImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPlacing()
+		 * @see ipos.project.data.datamodel.impl.PlacingImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPlacing()
 		 * @generated
 		 */
 		EClass PLACING = eINSTANCE.getPlacing();
@@ -4067,11 +4067,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference PLACING__ORIENTATION = eINSTANCE.getPlacing_Orientation();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl <em>Position</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.PositionImpl <em>Position</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPosition()
+		 * @see ipos.project.data.datamodel.impl.PositionImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPosition()
 		 * @generated
 		 */
 		EClass POSITION = eINSTANCE.getPosition();
@@ -4101,21 +4101,21 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference POSITION__REFERENCE_SYSTEM = eINSTANCE.getPosition_ReferenceSystem();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OrientationImpl <em>Orientation</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.OrientationImpl <em>Orientation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.OrientationImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getOrientation()
+		 * @see ipos.project.data.datamodel.impl.OrientationImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getOrientation()
 		 * @generated
 		 */
 		EClass ORIENTATION = eINSTANCE.getOrientation();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl <em>WGS84 Point</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.WGS84PointImpl <em>WGS84 Point</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWGS84Point()
+		 * @see ipos.project.data.datamodel.impl.WGS84PointImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWGS84Point()
 		 * @generated
 		 */
 		EClass WGS84_POINT = eINSTANCE.getWGS84Point();
@@ -4145,21 +4145,21 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute WGS84_POINT__ALTITUDE = eINSTANCE.getWGS84Point_Altitude();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AccuracyImpl <em>Accuracy</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.AccuracyImpl <em>Accuracy</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AccuracyImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAccuracy()
+		 * @see ipos.project.data.datamodel.impl.AccuracyImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAccuracy()
 		 * @generated
 		 */
 		EClass ACCURACY = eINSTANCE.getAccuracy();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point2DImpl <em>Point2 D</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.Point2DImpl <em>Point2 D</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.Point2DImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPoint2D()
+		 * @see ipos.project.data.datamodel.impl.Point2DImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPoint2D()
 		 * @generated
 		 */
 		EClass POINT2_D = eINSTANCE.getPoint2D();
@@ -4181,11 +4181,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute POINT2_D__Y = eINSTANCE.getPoint2D_Y();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl <em>Point3 D</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.Point3DImpl <em>Point3 D</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPoint3D()
+		 * @see ipos.project.data.datamodel.impl.Point3DImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPoint3D()
 		 * @generated
 		 */
 		EClass POINT3_D = eINSTANCE.getPoint3D();
@@ -4215,11 +4215,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute POINT3_D__Z = eINSTANCE.getPoint3D_Z();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl <em>Reference System</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.ReferenceSystemImpl <em>Reference System</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getReferenceSystem()
+		 * @see ipos.project.data.datamodel.impl.ReferenceSystemImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getReferenceSystem()
 		 * @generated
 		 */
 		EClass REFERENCE_SYSTEM = eINSTANCE.getReferenceSystem();
@@ -4249,11 +4249,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute REFERENCE_SYSTEM__ID = eINSTANCE.getReferenceSystem_Id();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl <em>Zone</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.ZoneImpl <em>Zone</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getZone()
+		 * @see ipos.project.data.datamodel.impl.ZoneImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getZone()
 		 * @generated
 		 */
 		EClass ZONE = eINSTANCE.getZone();
@@ -4291,11 +4291,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference ZONE__CENTRE_POINT = eINSTANCE.getZone_CentrePoint();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneMapImpl <em>Zone Map</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.ZoneMapImpl <em>Zone Map</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneMapImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getZoneMap()
+		 * @see ipos.project.data.datamodel.impl.ZoneMapImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getZoneMap()
 		 * @generated
 		 */
 		EClass ZONE_MAP = eINSTANCE.getZoneMap();
@@ -4309,11 +4309,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference ZONE_MAP__ZONE = eINSTANCE.getZoneMap_Zone();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl <em>Space</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.SpaceImpl <em>Space</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getSpace()
+		 * @see ipos.project.data.datamodel.impl.SpaceImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getSpace()
 		 * @generated
 		 */
 		EClass SPACE = eINSTANCE.getSpace();
@@ -4343,21 +4343,21 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute SPACE__Z = eINSTANCE.getSpace_Z();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MapTypeImpl <em>Map Type</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.MapTypeImpl <em>Map Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.MapTypeImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getMapType()
+		 * @see ipos.project.data.datamodel.impl.MapTypeImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getMapType()
 		 * @generated
 		 */
 		EClass MAP_TYPE = eINSTANCE.getMapType();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl <em>Quaternion</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.QuaternionImpl <em>Quaternion</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getQuaternion()
+		 * @see ipos.project.data.datamodel.impl.QuaternionImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getQuaternion()
 		 * @generated
 		 */
 		EClass QUATERNION = eINSTANCE.getQuaternion();
@@ -4395,11 +4395,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute QUATERNION__W = eINSTANCE.getQuaternion_W();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.GaussianImpl <em>Gaussian</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.GaussianImpl <em>Gaussian</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.GaussianImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getGaussian()
+		 * @see ipos.project.data.datamodel.impl.GaussianImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getGaussian()
 		 * @generated
 		 */
 		EClass GAUSSIAN = eINSTANCE.getGaussian();
@@ -4413,21 +4413,21 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute GAUSSIAN__CONFIDENCE_INTERVAL = eINSTANCE.getGaussian_ConfidenceInterval();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PointImpl <em>Point</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.PointImpl <em>Point</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PointImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPoint()
+		 * @see ipos.project.data.datamodel.impl.PointImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPoint()
 		 * @generated
 		 */
 		EClass POINT = eINSTANCE.getPoint();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataImpl <em>Rawdata</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.RawdataImpl <em>Rawdata</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getRawdata()
+		 * @see ipos.project.data.datamodel.impl.RawdataImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getRawdata()
 		 * @generated
 		 */
 		EClass RAWDATA = eINSTANCE.getRawdata();
@@ -4441,11 +4441,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute RAWDATA__SENSOR_ID = eINSTANCE.getRawdata_SensorId();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl <em>Proximity</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.ProximityImpl <em>Proximity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getProximity()
+		 * @see ipos.project.data.datamodel.impl.ProximityImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getProximity()
 		 * @generated
 		 */
 		EClass PROXIMITY = eINSTANCE.getProximity();
@@ -4475,11 +4475,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute PROXIMITY__SCANNER_ID = eINSTANCE.getProximity_ScannerId();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RFIDImpl <em>RFID</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.RFIDImpl <em>RFID</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.RFIDImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getRFID()
+		 * @see ipos.project.data.datamodel.impl.RFIDImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getRFID()
 		 * @generated
 		 */
 		EClass RFID = eINSTANCE.getRFID();
@@ -4493,11 +4493,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute RFID__LOCATION = eINSTANCE.getRFID_Location();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.NFCImpl <em>NFC</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.NFCImpl <em>NFC</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.NFCImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getNFC()
+		 * @see ipos.project.data.datamodel.impl.NFCImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getNFC()
 		 * @generated
 		 */
 		EClass NFC = eINSTANCE.getNFC();
@@ -4511,11 +4511,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute NFC__TAG_DATA = eINSTANCE.getNFC_TagData();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.IMUImpl <em>IMU</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.IMUImpl <em>IMU</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IMUImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getIMU()
+		 * @see ipos.project.data.datamodel.impl.IMUImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getIMU()
 		 * @generated
 		 */
 		EClass IMU = eINSTANCE.getIMU();
@@ -4537,31 +4537,31 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference IMU__ACCELERATION = eINSTANCE.getIMU_Acceleration();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AngularRateImpl <em>Angular Rate</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.AngularRateImpl <em>Angular Rate</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AngularRateImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAngularRate()
+		 * @see ipos.project.data.datamodel.impl.AngularRateImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAngularRate()
 		 * @generated
 		 */
 		EClass ANGULAR_RATE = eINSTANCE.getAngularRate();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AccelerationImpl <em>Acceleration</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.AccelerationImpl <em>Acceleration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AccelerationImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAcceleration()
+		 * @see ipos.project.data.datamodel.impl.AccelerationImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAcceleration()
 		 * @generated
 		 */
 		EClass ACCELERATION = eINSTANCE.getAcceleration();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BeaconImpl <em>Beacon</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.BeaconImpl <em>Beacon</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.BeaconImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBeacon()
+		 * @see ipos.project.data.datamodel.impl.BeaconImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBeacon()
 		 * @generated
 		 */
 		EClass BEACON = eINSTANCE.getBeacon();
@@ -4583,11 +4583,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute BEACON__TYPE = eINSTANCE.getBeacon_Type();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionEventImpl <em>Position Event</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.PositionEventImpl <em>Position Event</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionEventImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPositionEvent()
+		 * @see ipos.project.data.datamodel.impl.PositionEventImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPositionEvent()
 		 * @generated
 		 */
 		EClass POSITION_EVENT = eINSTANCE.getPositionEvent();
@@ -4617,11 +4617,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute POSITION_EVENT__SENSOR_ID = eINSTANCE.getPositionEvent_SensorId();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataEventImpl <em>Rawdata Event</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.RawdataEventImpl <em>Rawdata Event</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataEventImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getRawdataEvent()
+		 * @see ipos.project.data.datamodel.impl.RawdataEventImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getRawdataEvent()
 		 * @generated
 		 */
 		EClass RAWDATA_EVENT = eINSTANCE.getRawdataEvent();
@@ -4635,21 +4635,21 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference RAWDATA_EVENT__RAWDATA = eINSTANCE.getRawdataEvent_Rawdata();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingRequestImpl <em>Tracking Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.TrackingRequestImpl <em>Tracking Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getTrackingRequest()
+		 * @see ipos.project.data.datamodel.impl.TrackingRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getTrackingRequest()
 		 * @generated
 		 */
 		EClass TRACKING_REQUEST = eINSTANCE.getTrackingRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl <em>Monitoring Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl <em>Monitoring Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringRequest()
+		 * @see ipos.project.data.datamodel.impl.MonitoringRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringRequest()
 		 * @generated
 		 */
 		EClass MONITORING_REQUEST = eINSTANCE.getMonitoringRequest();
@@ -4735,31 +4735,31 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute MONITORING_REQUEST__REQUESTOR_PROTOCOL = eINSTANCE.getMonitoringRequest_RequestorProtocol();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelUpdateRequestImpl <em>World Model Update Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.WorldModelUpdateRequestImpl <em>World Model Update Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelUpdateRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelUpdateRequest()
+		 * @see ipos.project.data.datamodel.impl.WorldModelUpdateRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelUpdateRequest()
 		 * @generated
 		 */
 		EClass WORLD_MODEL_UPDATE_REQUEST = eINSTANCE.getWorldModelUpdateRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageRequestImpl <em>Data Storage Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.DataStorageRequestImpl <em>Data Storage Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageRequest()
+		 * @see ipos.project.data.datamodel.impl.DataStorageRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageRequest()
 		 * @generated
 		 */
 		EClass DATA_STORAGE_REQUEST = eINSTANCE.getDataStorageRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl <em>Event Filter Configuration</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.EventFilterConfigurationImpl <em>Event Filter Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterConfiguration()
+		 * @see ipos.project.data.datamodel.impl.EventFilterConfigurationImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterConfiguration()
 		 * @generated
 		 */
 		EClass EVENT_FILTER_CONFIGURATION = eINSTANCE.getEventFilterConfiguration();
@@ -4800,41 +4800,41 @@ public interface IPos_DatamodelPackage extends EPackage {
 				.getEventFilterConfiguration_Eventfiltercondition();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelQueryRequestImpl <em>World Model Query Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.WorldModelQueryRequestImpl <em>World Model Query Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelQueryRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelQueryRequest()
+		 * @see ipos.project.data.datamodel.impl.WorldModelQueryRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWorldModelQueryRequest()
 		 * @generated
 		 */
 		EClass WORLD_MODEL_QUERY_REQUEST = eINSTANCE.getWorldModelQueryRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageQueryRequestImpl <em>Data Storage Query Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.DataStorageQueryRequestImpl <em>Data Storage Query Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.DataStorageQueryRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageQueryRequest()
+		 * @see ipos.project.data.datamodel.impl.DataStorageQueryRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getDataStorageQueryRequest()
 		 * @generated
 		 */
 		EClass DATA_STORAGE_QUERY_REQUEST = eINSTANCE.getDataStorageQueryRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentRegistrationRequestImpl <em>Agent Registration Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.AgentRegistrationRequestImpl <em>Agent Registration Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentRegistrationRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getAgentRegistrationRequest()
+		 * @see ipos.project.data.datamodel.impl.AgentRegistrationRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getAgentRegistrationRequest()
 		 * @generated
 		 */
 		EClass AGENT_REGISTRATION_REQUEST = eINSTANCE.getAgentRegistrationRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringTaskImpl <em>Monitoring Task</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.MonitoringTaskImpl <em>Monitoring Task</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringTaskImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringTask()
+		 * @see ipos.project.data.datamodel.impl.MonitoringTaskImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getMonitoringTask()
 		 * @generated
 		 */
 		EClass MONITORING_TASK = eINSTANCE.getMonitoringTask();
@@ -4848,11 +4848,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference MONITORING_TASK__EVENTFILTERCONFIGURATION = eINSTANCE.getMonitoringTask_Eventfilterconfiguration();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingTaskImpl <em>Tracking Task</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.TrackingTaskImpl <em>Tracking Task</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingTaskImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getTrackingTask()
+		 * @see ipos.project.data.datamodel.impl.TrackingTaskImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getTrackingTask()
 		 * @generated
 		 */
 		EClass TRACKING_TASK = eINSTANCE.getTrackingTask();
@@ -4866,11 +4866,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference TRACKING_TASK__EVENTFILTERCONFIGURATION = eINSTANCE.getTrackingTask_Eventfilterconfiguration();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl <em>World Model</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.WorldModelImpl <em>World Model</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getWorldModel()
+		 * @see ipos.project.data.datamodel.impl.WorldModelImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getWorldModel()
 		 * @generated
 		 */
 		EClass WORLD_MODEL = eINSTANCE.getWorldModel();
@@ -4908,21 +4908,21 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EReference WORLD_MODEL__REFERENCE_SYSTEM = eINSTANCE.getWorldModel_ReferenceSystem();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BarcodeImpl <em>Barcode</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.BarcodeImpl <em>Barcode</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.BarcodeImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBarcode()
+		 * @see ipos.project.data.datamodel.impl.BarcodeImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBarcode()
 		 * @generated
 		 */
 		EClass BARCODE = eINSTANCE.getBarcode();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherProxImpl <em>Other Prox</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.OtherProxImpl <em>Other Prox</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherProxImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getOtherProx()
+		 * @see ipos.project.data.datamodel.impl.OtherProxImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getOtherProx()
 		 * @generated
 		 */
 		EClass OTHER_PROX = eINSTANCE.getOtherProx();
@@ -4936,11 +4936,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute OTHER_PROX__DATA = eINSTANCE.getOtherProx_Data();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BluetoothImpl <em>Bluetooth</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.BluetoothImpl <em>Bluetooth</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.BluetoothImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBluetooth()
+		 * @see ipos.project.data.datamodel.impl.BluetoothImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBluetooth()
 		 * @generated
 		 */
 		EClass BLUETOOTH = eINSTANCE.getBluetooth();
@@ -4954,31 +4954,31 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute BLUETOOTH__RSS = eINSTANCE.getBluetooth_Rss();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.UWBImpl <em>UWB</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.UWBImpl <em>UWB</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.UWBImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getUWB()
+		 * @see ipos.project.data.datamodel.impl.UWBImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getUWB()
 		 * @generated
 		 */
 		EClass UWB = eINSTANCE.getUWB();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SensorConfigurationRequestImpl <em>Sensor Configuration Request</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.SensorConfigurationRequestImpl <em>Sensor Configuration Request</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.SensorConfigurationRequestImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getSensorConfigurationRequest()
+		 * @see ipos.project.data.datamodel.impl.SensorConfigurationRequestImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getSensorConfigurationRequest()
 		 * @generated
 		 */
 		EClass SENSOR_CONFIGURATION_REQUEST = eINSTANCE.getSensorConfigurationRequest();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherBeaconImpl <em>Other Beacon</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.OtherBeaconImpl <em>Other Beacon</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherBeaconImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getOtherBeacon()
+		 * @see ipos.project.data.datamodel.impl.OtherBeaconImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getOtherBeacon()
 		 * @generated
 		 */
 		EClass OTHER_BEACON = eINSTANCE.getOtherBeacon();
@@ -4992,11 +4992,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute OTHER_BEACON__DATA = eINSTANCE.getOtherBeacon_Data();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl <em>POI</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.POIImpl <em>POI</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getPOI()
+		 * @see ipos.project.data.datamodel.impl.POIImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getPOI()
 		 * @generated
 		 */
 		EClass POI = eINSTANCE.getPOI();
@@ -5026,11 +5026,11 @@ public interface IPos_DatamodelPackage extends EPackage {
 		EAttribute POI__DATA = eINSTANCE.getPOI_Data();
 
 		/**
-		 * The meta object literal for the '{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl <em>Event Filter Condition</em>}' class.
+		 * The meta object literal for the '{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl <em>Event Filter Condition</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterCondition()
+		 * @see ipos.project.data.datamodel.impl.EventFilterConditionImpl
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getEventFilterCondition()
 		 * @generated
 		 */
 		EClass EVENT_FILTER_CONDITION = eINSTANCE.getEventFilterCondition();
@@ -5121,7 +5121,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see java.util.List
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getStringList()
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getStringList()
 		 * @generated
 		 */
 		EDataType STRING_LIST = eINSTANCE.getStringList();
@@ -5130,7 +5130,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 		 * The meta object literal for the '<em>String Array</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getStringArray()
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getStringArray()
 		 * @generated
 		 */
 		EDataType STRING_ARRAY = eINSTANCE.getStringArray();
@@ -5139,7 +5139,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 		 * The meta object literal for the '<em>Float Array3d</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray3d()
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray3d()
 		 * @generated
 		 */
 		EDataType FLOAT_ARRAY3D = eINSTANCE.getFloatArray3d();
@@ -5148,7 +5148,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 		 * The meta object literal for the '<em>Boolean List</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getBooleanList()
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getBooleanList()
 		 * @generated
 		 */
 		EDataType BOOLEAN_LIST = eINSTANCE.getBooleanList();
@@ -5157,7 +5157,7 @@ public interface IPos_DatamodelPackage extends EPackage {
 		 * The meta object literal for the '<em>Float Array</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see ipos.project.DataModellntegration.iPos_Datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray()
+		 * @see ipos.project.data.datamodel.impl.IPos_DatamodelPackageImpl#getFloatArray()
 		 * @generated
 		 */
 		EDataType FLOAT_ARRAY = eINSTANCE.getFloatArray();
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/LocalizableObject.java b/src/main/java/ipos/project/data/datamodel/LocalizableObject.java
similarity index 57%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/LocalizableObject.java
rename to src/main/java/ipos/project/data/datamodel/LocalizableObject.java
index 31dea565f42449c9c578c48594939d7b1b1121cf..f3ba8e46acdf1b5a5fc0f6012753657544baf212 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/LocalizableObject.java
+++ b/src/main/java/ipos/project/data/datamodel/LocalizableObject.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,13 +11,13 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getLastPosUpdate <em>Last Pos Update</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getSensorType <em>Sensor Type</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getAgent <em>Agent</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getCurrentPlacing <em>Current Placing</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.LocalizableObject#getLastPosUpdate <em>Last Pos Update</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.LocalizableObject#getSensorType <em>Sensor Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.LocalizableObject#getAgent <em>Agent</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.LocalizableObject#getCurrentPlacing <em>Current Placing</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getLocalizableObject()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getLocalizableObject()
  * @model
  * @generated
  */
@@ -28,14 +28,14 @@ public interface LocalizableObject extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Current Placing</em>' reference.
 	 * @see #setCurrentPlacing(Placing)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getLocalizableObject_CurrentPlacing()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getLocalizableObject_CurrentPlacing()
 	 * @model
 	 * @generated
 	 */
 	Placing getCurrentPlacing();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getCurrentPlacing <em>Current Placing</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.LocalizableObject#getCurrentPlacing <em>Current Placing</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Current Placing</em>' reference.
@@ -50,14 +50,14 @@ public interface LocalizableObject extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Last Pos Update</em>' attribute.
 	 * @see #setLastPosUpdate(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getLocalizableObject_LastPosUpdate()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getLocalizableObject_LastPosUpdate()
 	 * @model
 	 * @generated
 	 */
 	String getLastPosUpdate();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getLastPosUpdate <em>Last Pos Update</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.LocalizableObject#getLastPosUpdate <em>Last Pos Update</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Last Pos Update</em>' attribute.
@@ -72,14 +72,14 @@ public interface LocalizableObject extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sensor Type</em>' attribute.
 	 * @see #setSensorType(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getLocalizableObject_SensorType()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getLocalizableObject_SensorType()
 	 * @model
 	 * @generated
 	 */
 	String getSensorType();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getSensorType <em>Sensor Type</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.LocalizableObject#getSensorType <em>Sensor Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sensor Type</em>' attribute.
@@ -94,14 +94,14 @@ public interface LocalizableObject extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Agent</em>' reference.
 	 * @see #setAgent(Agent)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getLocalizableObject_Agent()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getLocalizableObject_Agent()
 	 * @model
 	 * @generated
 	 */
 	Agent getAgent();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject#getAgent <em>Agent</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.LocalizableObject#getAgent <em>Agent</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Agent</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MapType.java b/src/main/java/ipos/project/data/datamodel/MapType.java
similarity index 63%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MapType.java
rename to src/main/java/ipos/project/data/datamodel/MapType.java
index 5f66933b4d05b12cb1b848de5f283b48009365c1..44ed14a3e8ca460355b9eac46d7b8fcbb5d3a796 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MapType.java
+++ b/src/main/java/ipos/project/data/datamodel/MapType.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMapType()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMapType()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MonitoringRequest.java b/src/main/java/ipos/project/data/datamodel/MonitoringRequest.java
similarity index 57%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MonitoringRequest.java
rename to src/main/java/ipos/project/data/datamodel/MonitoringRequest.java
index 933271bd5e605099b0b32248d7c5bc0b698617ff..7c6ffad29cf995f15c9b572f738b9406eb197806 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MonitoringRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/MonitoringRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
@@ -14,19 +14,19 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFrameId <em>Frame Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getDelta <em>Delta</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getUpdateFrequency <em>Update Frequency</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getType <em>Type</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getId <em>Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFusionStrategy <em>Fusion Strategy</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#isExitNotification <em>Exit Notification</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getProperties <em>Properties</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getFrameId <em>Frame Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getDelta <em>Delta</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getUpdateFrequency <em>Update Frequency</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getFusionStrategy <em>Fusion Strategy</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#isExitNotification <em>Exit Notification</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getProperties <em>Properties</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest()
  * @model
  * @generated
  */
@@ -38,14 +38,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Frame Id</em>' attribute.
 	 * @see #setFrameId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_FrameId()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_FrameId()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getFrameId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFrameId <em>Frame Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getFrameId <em>Frame Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Frame Id</em>' attribute.
@@ -60,14 +60,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Delta</em>' attribute.
 	 * @see #setDelta(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_Delta()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_Delta()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getDelta();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getDelta <em>Delta</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getDelta <em>Delta</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Delta</em>' attribute.
@@ -82,14 +82,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Update Frequency</em>' attribute.
 	 * @see #setUpdateFrequency(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_UpdateFrequency()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_UpdateFrequency()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getUpdateFrequency();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getUpdateFrequency <em>Update Frequency</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getUpdateFrequency <em>Update Frequency</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Update Frequency</em>' attribute.
@@ -104,14 +104,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(List)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_Type()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_Type()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.StringList"
 	 * @generated
 	 */
 	List<String> getType();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getType <em>Type</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' attribute.
@@ -126,14 +126,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(List)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_Id()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_Id()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.StringList"
 	 * @generated
 	 */
 	List<String> getId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
@@ -148,14 +148,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Fusion Strategy</em>' attribute.
 	 * @see #setFusionStrategy(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_FusionStrategy()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_FusionStrategy()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getFusionStrategy();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getFusionStrategy <em>Fusion Strategy</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getFusionStrategy <em>Fusion Strategy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Fusion Strategy</em>' attribute.
@@ -170,14 +170,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Exit Notification</em>' attribute.
 	 * @see #setExitNotification(boolean)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_ExitNotification()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_ExitNotification()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
 	boolean isExitNotification();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#isExitNotification <em>Exit Notification</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#isExitNotification <em>Exit Notification</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Exit Notification</em>' attribute.
@@ -192,14 +192,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' attribute.
 	 * @see #setProperties(List)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_Properties()
-	 * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList"
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_Properties()
+	 * @model dataType="ipos.project.data.iPos_Datamodel.StringList"
 	 * @generated
 	 */
 	List<String> getProperties();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getProperties <em>Properties</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getProperties <em>Properties</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Properties</em>' attribute.
@@ -214,14 +214,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Monitoring Task Id</em>' attribute.
 	 * @see #setMonitoringTaskId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_MonitoringTaskId()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_MonitoringTaskId()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getMonitoringTaskId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getMonitoringTaskId <em>Monitoring Task Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Monitoring Task Id</em>' attribute.
@@ -236,14 +236,14 @@ public interface MonitoringRequest extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Requestor Protocol</em>' attribute.
 	 * @see #setRequestorProtocol(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringRequest_RequestorProtocol()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringRequest_RequestorProtocol()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getRequestorProtocol();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringRequest#getRequestorProtocol <em>Requestor Protocol</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Requestor Protocol</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MonitoringTask.java b/src/main/java/ipos/project/data/datamodel/MonitoringTask.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MonitoringTask.java
rename to src/main/java/ipos/project/data/datamodel/MonitoringTask.java
index f1339c449bd9db828f1a0dd5f2de5e9d61dcbe72..5f487dae2459ef1e838d1c0b8cb9b28322fce832 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/MonitoringTask.java
+++ b/src/main/java/ipos/project/data/datamodel/MonitoringTask.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.MonitoringTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringTask()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringTask()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface MonitoringTask extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Eventfilterconfiguration</em>' reference.
 	 * @see #setEventfilterconfiguration(EventFilterConfiguration)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getMonitoringTask_Eventfilterconfiguration()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getMonitoringTask_Eventfilterconfiguration()
 	 * @model required="true"
 	 * @generated
 	 */
 	EventFilterConfiguration getEventfilterconfiguration();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.MonitoringTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Eventfilterconfiguration</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/NFC.java b/src/main/java/ipos/project/data/datamodel/NFC.java
similarity index 64%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/NFC.java
rename to src/main/java/ipos/project/data/datamodel/NFC.java
index d7d409b7779cdd93c10e5997bac155ea60bb81fa..79e5beb98b284d1223906fc59f8d7fcdeb904041 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/NFC.java
+++ b/src/main/java/ipos/project/data/datamodel/NFC.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.NFC#getTagData <em>Tag Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.NFC#getTagData <em>Tag Data</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getNFC()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getNFC()
  * @model
  * @generated
  */
@@ -29,14 +29,14 @@ public interface NFC extends Proximity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Tag Data</em>' attribute.
 	 * @see #setTagData(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getNFC_TagData()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getNFC_TagData()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, EObject> getTagData();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.NFC#getTagData <em>Tag Data</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.NFC#getTagData <em>Tag Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Tag Data</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/NetworkInterface.java b/src/main/java/ipos/project/data/datamodel/NetworkInterface.java
similarity index 64%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/NetworkInterface.java
rename to src/main/java/ipos/project/data/datamodel/NetworkInterface.java
index e029b2898a09b3d6331bf0da55ba31a4c75e529c..9d9e7fb294ff772de11d3b82fe59120ddb71dbb3 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/NetworkInterface.java
+++ b/src/main/java/ipos/project/data/datamodel/NetworkInterface.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getNetworkInterface()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getNetworkInterface()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Orientation.java b/src/main/java/ipos/project/data/datamodel/Orientation.java
similarity index 63%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Orientation.java
rename to src/main/java/ipos/project/data/datamodel/Orientation.java
index 51ef82a9fefcab8e3670113ad3041480d13ca7f3..b4127bde00702c97de821db06b760293b8b467c4 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Orientation.java
+++ b/src/main/java/ipos/project/data/datamodel/Orientation.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getOrientation()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getOrientation()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OtherBeacon.java b/src/main/java/ipos/project/data/datamodel/OtherBeacon.java
similarity index 63%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OtherBeacon.java
rename to src/main/java/ipos/project/data/datamodel/OtherBeacon.java
index 74d0a12f7b2dee85c162262a541fdc380417d0ce..b3878f96d72f79d443b19aab35a22ef85fc33870 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OtherBeacon.java
+++ b/src/main/java/ipos/project/data/datamodel/OtherBeacon.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon#getData <em>Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.OtherBeacon#getData <em>Data</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getOtherBeacon()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getOtherBeacon()
  * @model
  * @generated
  */
@@ -29,14 +29,14 @@ public interface OtherBeacon extends Beacon {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data</em>' attribute.
 	 * @see #setData(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getOtherBeacon_Data()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getOtherBeacon_Data()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, EObject> getData();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon#getData <em>Data</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.OtherBeacon#getData <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Data</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OtherProx.java b/src/main/java/ipos/project/data/datamodel/OtherProx.java
similarity index 63%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OtherProx.java
rename to src/main/java/ipos/project/data/datamodel/OtherProx.java
index b9c2f3d197768647087d6571e4de6abec2314c51..9b093b757bd0b9b2c101a80f346e0f248cde261c 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/OtherProx.java
+++ b/src/main/java/ipos/project/data/datamodel/OtherProx.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherProx#getData <em>Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.OtherProx#getData <em>Data</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getOtherProx()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getOtherProx()
  * @model
  * @generated
  */
@@ -29,14 +29,14 @@ public interface OtherProx extends Proximity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data</em>' attribute.
 	 * @see #setData(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getOtherProx_Data()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getOtherProx_Data()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, EObject> getData();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherProx#getData <em>Data</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.OtherProx#getData <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Data</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/POI.java b/src/main/java/ipos/project/data/datamodel/POI.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/POI.java
rename to src/main/java/ipos/project/data/datamodel/POI.java
index f04848973526be84a96ed7718f6a28021ae0bc01..d15380af5d96f0b87c69e05d13065ac4630ce047 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/POI.java
+++ b/src/main/java/ipos/project/data/datamodel/POI.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import java.util.Map;
 
@@ -15,12 +15,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getPosition <em>Position</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getDescription <em>Description</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getData <em>Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.POI#getPosition <em>Position</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.POI#getDescription <em>Description</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.POI#getData <em>Data</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPOI()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPOI()
  * @model
  * @generated
  */
@@ -31,14 +31,14 @@ public interface POI extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position</em>' reference.
 	 * @see #setPosition(Position)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPOI_Position()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPOI_Position()
 	 * @model required="true"
 	 * @generated
 	 */
 	Position getPosition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getPosition <em>Position</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.POI#getPosition <em>Position</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position</em>' reference.
@@ -53,14 +53,14 @@ public interface POI extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPOI_Description()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPOI_Description()
 	 * @model
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.POI#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -75,14 +75,14 @@ public interface POI extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data</em>' attribute.
 	 * @see #setData(Map)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPOI_Data()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPOI_Data()
 	 * @model transient="true"
 	 * @generated
 	 */
 	Map<String, String> getData();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI#getData <em>Data</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.POI#getData <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Data</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Placing.java b/src/main/java/ipos/project/data/datamodel/Placing.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Placing.java
rename to src/main/java/ipos/project/data/datamodel/Placing.java
index 18eedf86ad18897d63c188974dde5513cd6edbd5..78348ebce3aa29cf1035ef1dc8e0a1132dcc436f 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Placing.java
+++ b/src/main/java/ipos/project/data/datamodel/Placing.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing#getPosition <em>Position</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing#getOrientation <em>Orientation</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Placing#getPosition <em>Position</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Placing#getOrientation <em>Orientation</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPlacing()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPlacing()
  * @model
  * @generated
  */
@@ -28,14 +28,14 @@ public interface Placing extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position</em>' reference.
 	 * @see #setPosition(Position)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPlacing_Position()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPlacing_Position()
 	 * @model required="true"
 	 * @generated
 	 */
 	Position getPosition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing#getPosition <em>Position</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Placing#getPosition <em>Position</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position</em>' reference.
@@ -50,14 +50,14 @@ public interface Placing extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Orientation</em>' reference.
 	 * @see #setOrientation(Orientation)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPlacing_Orientation()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPlacing_Orientation()
 	 * @model required="true"
 	 * @generated
 	 */
 	Orientation getOrientation();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing#getOrientation <em>Orientation</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Placing#getOrientation <em>Orientation</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Orientation</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point.java b/src/main/java/ipos/project/data/datamodel/Point.java
similarity index 63%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point.java
rename to src/main/java/ipos/project/data/datamodel/Point.java
index 7a6a812d6cae4ec7183566805674dbcf4ba79f3c..9b156b357014c325546fd9b5020c7144ed45c4b9 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point.java
+++ b/src/main/java/ipos/project/data/datamodel/Point.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point2D.java b/src/main/java/ipos/project/data/datamodel/Point2D.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point2D.java
rename to src/main/java/ipos/project/data/datamodel/Point2D.java
index 69ce32896cdcb4b1d9b0c75d120a916071ea2fd9..6023137f7f1012dbd976bfe452ec68b30364f5e4 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point2D.java
+++ b/src/main/java/ipos/project/data/datamodel/Point2D.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,11 +11,11 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Point2D#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Point2D#getY <em>Y</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint2D()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint2D()
  * @model
  * @generated
  */
@@ -26,14 +26,14 @@ public interface Point2D extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>X</em>' attribute.
 	 * @see #setX(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint2D_X()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint2D_X()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getX();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getX <em>X</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Point2D#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>X</em>' attribute.
@@ -48,14 +48,14 @@ public interface Point2D extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Y</em>' attribute.
 	 * @see #setY(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint2D_Y()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint2D_Y()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getY();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D#getY <em>Y</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Point2D#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Y</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point3D.java b/src/main/java/ipos/project/data/datamodel/Point3D.java
similarity index 59%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point3D.java
rename to src/main/java/ipos/project/data/datamodel/Point3D.java
index 5958948b2329010e693e0b0fcacabba599851da8..59bcd9e4500915b29de60c4035c65560878df4b5 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Point3D.java
+++ b/src/main/java/ipos/project/data/datamodel/Point3D.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,12 +11,12 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getY <em>Y</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getZ <em>Z</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Point3D#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Point3D#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Point3D#getZ <em>Z</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint3D()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint3D()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface Point3D extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>X</em>' attribute.
 	 * @see #setX(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint3D_X()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint3D_X()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getX();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getX <em>X</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Point3D#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>X</em>' attribute.
@@ -49,14 +49,14 @@ public interface Point3D extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Y</em>' attribute.
 	 * @see #setY(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint3D_Y()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint3D_Y()
 	 * @model
 	 * @generated
 	 */
 	float getY();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getY <em>Y</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Point3D#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Y</em>' attribute.
@@ -71,14 +71,14 @@ public interface Point3D extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Z</em>' attribute.
 	 * @see #setZ(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPoint3D_Z()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPoint3D_Z()
 	 * @model
 	 * @generated
 	 */
 	float getZ();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D#getZ <em>Z</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Point3D#getZ <em>Z</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Z</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Position.java b/src/main/java/ipos/project/data/datamodel/Position.java
similarity index 60%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Position.java
rename to src/main/java/ipos/project/data/datamodel/Position.java
index b784864d369c6904614178da1b4969bca389654d..abfda79a9081b3071d31c92508ec51403d3e5b0c 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Position.java
+++ b/src/main/java/ipos/project/data/datamodel/Position.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getAccuracy <em>Accuracy</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getPoint <em>Point</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getReferenceSystem <em>Reference System</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Position#getAccuracy <em>Accuracy</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Position#getPoint <em>Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Position#getReferenceSystem <em>Reference System</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPosition()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPosition()
  * @model
  * @generated
  */
@@ -29,14 +29,14 @@ public interface Position extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Accuracy</em>' reference.
 	 * @see #setAccuracy(Accuracy)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPosition_Accuracy()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPosition_Accuracy()
 	 * @model
 	 * @generated
 	 */
 	Accuracy getAccuracy();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getAccuracy <em>Accuracy</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Position#getAccuracy <em>Accuracy</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Accuracy</em>' reference.
@@ -51,14 +51,14 @@ public interface Position extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Point</em>' reference.
 	 * @see #setPoint(Point)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPosition_Point()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPosition_Point()
 	 * @model required="true"
 	 * @generated
 	 */
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getPoint <em>Point</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Position#getPoint <em>Point</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Point</em>' reference.
@@ -73,14 +73,14 @@ public interface Position extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Reference System</em>' reference.
 	 * @see #setReferenceSystem(ReferenceSystem)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPosition_ReferenceSystem()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPosition_ReferenceSystem()
 	 * @model required="true"
 	 * @generated
 	 */
 	ReferenceSystem getReferenceSystem();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position#getReferenceSystem <em>Reference System</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Position#getReferenceSystem <em>Reference System</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Reference System</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/PositionEvent.java b/src/main/java/ipos/project/data/datamodel/PositionEvent.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/PositionEvent.java
rename to src/main/java/ipos/project/data/datamodel/PositionEvent.java
index 2bc5b47a8223cb85b1739cf960ffe516a97eaa0e..d3bf506830c168255e62bb92ee3c7ee7bc41207a 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/PositionEvent.java
+++ b/src/main/java/ipos/project/data/datamodel/PositionEvent.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getPlacing <em>Placing</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getTimeStamp <em>Time Stamp</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.PositionEvent#getPlacing <em>Placing</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.PositionEvent#getTimeStamp <em>Time Stamp</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionEvent()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionEvent()
  * @model
  * @generated
  */
@@ -28,14 +28,14 @@ public interface PositionEvent extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Placing</em>' reference.
 	 * @see #setPlacing(Placing)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionEvent_Placing()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionEvent_Placing()
 	 * @model required="true"
 	 * @generated
 	 */
 	Placing getPlacing();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getPlacing <em>Placing</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.PositionEvent#getPlacing <em>Placing</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Placing</em>' reference.
@@ -50,14 +50,14 @@ public interface PositionEvent extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Time Stamp</em>' attribute.
 	 * @see #setTimeStamp(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionEvent_TimeStamp()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionEvent_TimeStamp()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" transient="true"
 	 * @generated
 	 */
 	String getTimeStamp();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getTimeStamp <em>Time Stamp</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.PositionEvent#getTimeStamp <em>Time Stamp</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Time Stamp</em>' attribute.
@@ -72,14 +72,14 @@ public interface PositionEvent extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sensor Id</em>' attribute.
 	 * @see #setSensorId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionEvent_SensorId()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionEvent_SensorId()
 	 * @model
 	 * @generated
 	 */
 	String getSensorId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent#getSensorId <em>Sensor Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.PositionEvent#getSensorId <em>Sensor Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sensor Id</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/PositionSensor.java b/src/main/java/ipos/project/data/datamodel/PositionSensor.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/PositionSensor.java
rename to src/main/java/ipos/project/data/datamodel/PositionSensor.java
index 4f3a5bfc3d9bdadd7a504e41833a15193947ff6b..50d9f7f6ede57a2bf205b0170374c69a19882d84 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/PositionSensor.java
+++ b/src/main/java/ipos/project/data/datamodel/PositionSensor.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,12 +11,12 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor#getAgent <em>Agent</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor#getLObject <em>LObject</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.PositionSensor#getAgent <em>Agent</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.PositionSensor#getLObject <em>LObject</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.PositionSensor#getType <em>Type</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionSensor()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionSensor()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface PositionSensor extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Agent</em>' reference.
 	 * @see #setAgent(Agent)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionSensor_Agent()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionSensor_Agent()
 	 * @model
 	 * @generated
 	 */
 	Agent getAgent();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor#getAgent <em>Agent</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.PositionSensor#getAgent <em>Agent</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Agent</em>' reference.
@@ -49,14 +49,14 @@ public interface PositionSensor extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>LObject</em>' reference.
 	 * @see #setLObject(LocalizableObject)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionSensor_LObject()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionSensor_LObject()
 	 * @model
 	 * @generated
 	 */
 	LocalizableObject getLObject();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor#getLObject <em>LObject</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.PositionSensor#getLObject <em>LObject</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>LObject</em>' reference.
@@ -71,14 +71,14 @@ public interface PositionSensor extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getPositionSensor_Type()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getPositionSensor_Type()
 	 * @model
 	 * @generated
 	 */
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor#getType <em>Type</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.PositionSensor#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Proximity.java b/src/main/java/ipos/project/data/datamodel/Proximity.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Proximity.java
rename to src/main/java/ipos/project/data/datamodel/Proximity.java
index 1df80c851275daabb139689363d44d21dcef2339..662095b83c92db3c19b34f822d8aec4efe2ee93b 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Proximity.java
+++ b/src/main/java/ipos/project/data/datamodel/Proximity.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,12 +11,12 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getTagId <em>Tag Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getType <em>Type</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getScannerId <em>Scanner Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Proximity#getTagId <em>Tag Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Proximity#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Proximity#getScannerId <em>Scanner Id</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getProximity()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getProximity()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface Proximity extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Tag Id</em>' attribute.
 	 * @see #setTagId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getProximity_TagId()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getProximity_TagId()
 	 * @model
 	 * @generated
 	 */
 	String getTagId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getTagId <em>Tag Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Proximity#getTagId <em>Tag Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Tag Id</em>' attribute.
@@ -49,14 +49,14 @@ public interface Proximity extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getProximity_Type()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getProximity_Type()
 	 * @model
 	 * @generated
 	 */
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getType <em>Type</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Proximity#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' attribute.
@@ -71,14 +71,14 @@ public interface Proximity extends Rawdata {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Scanner Id</em>' attribute.
 	 * @see #setScannerId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getProximity_ScannerId()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getProximity_ScannerId()
 	 * @model
 	 * @generated
 	 */
 	String getScannerId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity#getScannerId <em>Scanner Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Proximity#getScannerId <em>Scanner Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Scanner Id</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Quaternion.java b/src/main/java/ipos/project/data/datamodel/Quaternion.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Quaternion.java
rename to src/main/java/ipos/project/data/datamodel/Quaternion.java
index 2cfa04b0ffb93470d44283f4baba2bbf1cc1fc0a..67e90026c7293e40561b9c0688018e94c37cf1fa 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Quaternion.java
+++ b/src/main/java/ipos/project/data/datamodel/Quaternion.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,13 +11,13 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getY <em>Y</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getZ <em>Z</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getW <em>W</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Quaternion#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Quaternion#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Quaternion#getZ <em>Z</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Quaternion#getW <em>W</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getQuaternion()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getQuaternion()
  * @model
  * @generated
  */
@@ -28,14 +28,14 @@ public interface Quaternion extends Orientation {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>X</em>' attribute.
 	 * @see #setX(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getQuaternion_X()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getQuaternion_X()
 	 * @model
 	 * @generated
 	 */
 	float getX();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getX <em>X</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Quaternion#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>X</em>' attribute.
@@ -50,14 +50,14 @@ public interface Quaternion extends Orientation {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Y</em>' attribute.
 	 * @see #setY(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getQuaternion_Y()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getQuaternion_Y()
 	 * @model
 	 * @generated
 	 */
 	float getY();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getY <em>Y</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Quaternion#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Y</em>' attribute.
@@ -72,14 +72,14 @@ public interface Quaternion extends Orientation {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Z</em>' attribute.
 	 * @see #setZ(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getQuaternion_Z()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getQuaternion_Z()
 	 * @model
 	 * @generated
 	 */
 	float getZ();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getZ <em>Z</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Quaternion#getZ <em>Z</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Z</em>' attribute.
@@ -94,14 +94,14 @@ public interface Quaternion extends Orientation {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>W</em>' attribute.
 	 * @see #setW(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getQuaternion_W()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getQuaternion_W()
 	 * @model
 	 * @generated
 	 */
 	float getW();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion#getW <em>W</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Quaternion#getW <em>W</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>W</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RFID.java b/src/main/java/ipos/project/data/datamodel/RFID.java
similarity index 61%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RFID.java
rename to src/main/java/ipos/project/data/datamodel/RFID.java
index bc22347fa01889e218bd88a8afc178f92e0f8c2d..9cc59e56dfd63e1a149b11bac2700e1ba393e188 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RFID.java
+++ b/src/main/java/ipos/project/data/datamodel/RFID.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,10 +11,10 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.RFID#getLocation <em>Location</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.RFID#getLocation <em>Location</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRFID()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRFID()
  * @model
  * @generated
  */
@@ -25,14 +25,14 @@ public interface RFID extends Proximity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Location</em>' attribute.
 	 * @see #setLocation(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRFID_Location()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRFID_Location()
 	 * @model
 	 * @generated
 	 */
 	String getLocation();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.RFID#getLocation <em>Location</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.RFID#getLocation <em>Location</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Location</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Rawdata.java b/src/main/java/ipos/project/data/datamodel/Rawdata.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Rawdata.java
rename to src/main/java/ipos/project/data/datamodel/Rawdata.java
index 7d56da6457a051b047c910ec2227916687098f4b..69b4f6c58d93942fb16c08c48040f0c685eaa23e 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Rawdata.java
+++ b/src/main/java/ipos/project/data/datamodel/Rawdata.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Rawdata#getSensorId <em>Sensor Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Rawdata#getSensorId <em>Sensor Id</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRawdata()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRawdata()
  * @model abstract="true"
  * @generated
  */
@@ -27,14 +27,14 @@ public interface Rawdata extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sensor Id</em>' attribute.
 	 * @see #setSensorId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRawdata_SensorId()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRawdata_SensorId()
 	 * @model
 	 * @generated
 	 */
 	String getSensorId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Rawdata#getSensorId <em>Sensor Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Rawdata#getSensorId <em>Sensor Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sensor Id</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RawdataEvent.java b/src/main/java/ipos/project/data/datamodel/RawdataEvent.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RawdataEvent.java
rename to src/main/java/ipos/project/data/datamodel/RawdataEvent.java
index fc288704b7602e883f6311192c8d7ac984de37a8..5fbd3bd177f23cb871eff3144d632c14c3c425dc 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RawdataEvent.java
+++ b/src/main/java/ipos/project/data/datamodel/RawdataEvent.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -15,21 +15,21 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent#getRawdata <em>Rawdata</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.RawdataEvent#getRawdata <em>Rawdata</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRawdataEvent()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRawdataEvent()
  * @model
  * @generated
  */
 public interface RawdataEvent extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Rawdata</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.Rawdata}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.Rawdata}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Rawdata</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRawdataEvent_Rawdata()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRawdataEvent_Rawdata()
 	 * @model required="true"
 	 * @generated
 	 */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ReferencePosition.java b/src/main/java/ipos/project/data/datamodel/ReferencePosition.java
similarity index 59%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ReferencePosition.java
rename to src/main/java/ipos/project/data/datamodel/ReferencePosition.java
index 042dc989a82c26f0b06baf2b67b5a01e2a94d0ef..1d27ead6aba1a36272a4fcdd83bfcdc27c41d20b 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ReferencePosition.java
+++ b/src/main/java/ipos/project/data/datamodel/ReferencePosition.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,11 +13,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferencePosition#getPosition <em>Position</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferencePosition#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.ReferencePosition#getPosition <em>Position</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.ReferencePosition#getId <em>Id</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferencePosition()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferencePosition()
  * @model
  * @generated
  */
@@ -28,14 +28,14 @@ public interface ReferencePosition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Position</em>' reference.
 	 * @see #setPosition(Position)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferencePosition_Position()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferencePosition_Position()
 	 * @model required="true"
 	 * @generated
 	 */
 	Position getPosition();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferencePosition#getPosition <em>Position</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.ReferencePosition#getPosition <em>Position</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Position</em>' reference.
@@ -50,14 +50,14 @@ public interface ReferencePosition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferencePosition_Id()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferencePosition_Id()
 	 * @model
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferencePosition#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.ReferencePosition#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ReferenceSystem.java b/src/main/java/ipos/project/data/datamodel/ReferenceSystem.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ReferenceSystem.java
rename to src/main/java/ipos/project/data/datamodel/ReferenceSystem.java
index 449528a95ca8e9f1952afe73e210e0f6ae3f4fc0..7211acd4bee8c115555a58817ba4ba0728f2def5 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ReferenceSystem.java
+++ b/src/main/java/ipos/project/data/datamodel/ReferenceSystem.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getOrigin <em>Origin</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getName <em>Name</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.ReferenceSystem#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.ReferenceSystem#getName <em>Name</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.ReferenceSystem#getId <em>Id</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferenceSystem()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferenceSystem()
  * @model
  * @generated
  */
@@ -29,14 +29,14 @@ public interface ReferenceSystem extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Origin</em>' reference.
 	 * @see #setOrigin(Placing)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferenceSystem_Origin()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferenceSystem_Origin()
 	 * @model
 	 * @generated
 	 */
 	Placing getOrigin();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getOrigin <em>Origin</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.ReferenceSystem#getOrigin <em>Origin</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Origin</em>' reference.
@@ -51,14 +51,14 @@ public interface ReferenceSystem extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferenceSystem_Name()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferenceSystem_Name()
 	 * @model
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.ReferenceSystem#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -73,14 +73,14 @@ public interface ReferenceSystem extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getReferenceSystem_Id()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getReferenceSystem_Id()
 	 * @model
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.ReferenceSystem#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RelativePosition.java b/src/main/java/ipos/project/data/datamodel/RelativePosition.java
similarity index 59%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RelativePosition.java
rename to src/main/java/ipos/project/data/datamodel/RelativePosition.java
index 1603702d0dbcf5472d7f3c0bb396222b2f910453..748fc9587b9c0a2f5f1bdfd02b26d18c349ee0cc 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/RelativePosition.java
+++ b/src/main/java/ipos/project/data/datamodel/RelativePosition.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,11 +11,11 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.RelativePosition#getReference <em>Reference</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.RelativePosition#getPoint <em>Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.RelativePosition#getReference <em>Reference</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.RelativePosition#getPoint <em>Point</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRelativePosition()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRelativePosition()
  * @model
  * @generated
  */
@@ -26,14 +26,14 @@ public interface RelativePosition extends Position {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Reference</em>' reference.
 	 * @see #setReference(ReferenceSystem)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRelativePosition_Reference()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRelativePosition_Reference()
 	 * @model required="true"
 	 * @generated
 	 */
 	ReferenceSystem getReference();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.RelativePosition#getReference <em>Reference</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.RelativePosition#getReference <em>Reference</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Reference</em>' reference.
@@ -48,14 +48,14 @@ public interface RelativePosition extends Position {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Point</em>' reference.
 	 * @see #setPoint(Point)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getRelativePosition_Point()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getRelativePosition_Point()
 	 * @model required="true"
 	 * @generated
 	 */
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.RelativePosition#getPoint <em>Point</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.RelativePosition#getPoint <em>Point</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Point</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/SensorConfigurationRequest.java b/src/main/java/ipos/project/data/datamodel/SensorConfigurationRequest.java
similarity index 65%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/SensorConfigurationRequest.java
rename to src/main/java/ipos/project/data/datamodel/SensorConfigurationRequest.java
index cf5138e30ca0ff886f4927f44f4e810eda31f197..3e8358890658f7f7ee2ec3198dcf437b12325fa4 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/SensorConfigurationRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/SensorConfigurationRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getSensorConfigurationRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getSensorConfigurationRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Space.java b/src/main/java/ipos/project/data/datamodel/Space.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Space.java
rename to src/main/java/ipos/project/data/datamodel/Space.java
index e4cfc98aa5987ec0a408614f518af5aed2d3d289..9fbd75614b652ac77ba6a886e118848699282827 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Space.java
+++ b/src/main/java/ipos/project/data/datamodel/Space.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,12 +13,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getY <em>Y</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getZ <em>Z</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Space#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Space#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Space#getZ <em>Z</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getSpace()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getSpace()
  * @model
  * @generated
  */
@@ -29,14 +29,14 @@ public interface Space extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>X</em>' attribute.
 	 * @see #setX(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getSpace_X()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getSpace_X()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getX();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getX <em>X</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Space#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>X</em>' attribute.
@@ -51,14 +51,14 @@ public interface Space extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Y</em>' attribute.
 	 * @see #setY(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getSpace_Y()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getSpace_Y()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getY();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getY <em>Y</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Space#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Y</em>' attribute.
@@ -73,14 +73,14 @@ public interface Space extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Z</em>' attribute.
 	 * @see #setZ(float)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getSpace_Z()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getSpace_Z()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Float"
 	 * @generated
 	 */
 	float getZ();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space#getZ <em>Z</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Space#getZ <em>Z</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Z</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/TrackingRequest.java b/src/main/java/ipos/project/data/datamodel/TrackingRequest.java
similarity index 64%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/TrackingRequest.java
rename to src/main/java/ipos/project/data/datamodel/TrackingRequest.java
index ccad25d217c8b5581aec8e23d6980485c11cf36d..546f2eb4286c5672dcade62357fa71e129e5e58d 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/TrackingRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/TrackingRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getTrackingRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getTrackingRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/TrackingTask.java b/src/main/java/ipos/project/data/datamodel/TrackingTask.java
similarity index 62%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/TrackingTask.java
rename to src/main/java/ipos/project/data/datamodel/TrackingTask.java
index 2366175ac8e6d16b8889f4e08ec1c4e7399dee56..b85aa7a47d252bf69cc5254eb4448b7b5528add5 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/TrackingTask.java
+++ b/src/main/java/ipos/project/data/datamodel/TrackingTask.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.TrackingTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getTrackingTask()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getTrackingTask()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface TrackingTask extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Eventfilterconfiguration</em>' reference.
 	 * @see #setEventfilterconfiguration(EventFilterConfiguration)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getTrackingTask_Eventfilterconfiguration()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getTrackingTask_Eventfilterconfiguration()
 	 * @model required="true"
 	 * @generated
 	 */
 	EventFilterConfiguration getEventfilterconfiguration();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.TrackingTask#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Eventfilterconfiguration</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/UWB.java b/src/main/java/ipos/project/data/datamodel/UWB.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/UWB.java
rename to src/main/java/ipos/project/data/datamodel/UWB.java
index ce56b537bd3be293eadaf62f996e55f55bb05347..f924fbe33dbabebb8ed3bb54bbf12736ba621ce9 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/UWB.java
+++ b/src/main/java/ipos/project/data/datamodel/UWB.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -8,7 +8,7 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getUWB()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getUWB()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WGS84Point.java b/src/main/java/ipos/project/data/datamodel/WGS84Point.java
similarity index 60%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WGS84Point.java
rename to src/main/java/ipos/project/data/datamodel/WGS84Point.java
index a229f7b6d394e059fe87247a9c06213a70730aff..012614265d79913777879dfc28659a98a50e59f6 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WGS84Point.java
+++ b/src/main/java/ipos/project/data/datamodel/WGS84Point.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 /**
  * <!-- begin-user-doc -->
@@ -11,12 +11,12 @@ package ipos.project.DataModellntegration.iPos_Datamodel;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLongitude <em>Longitude</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLatitude <em>Latitude</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getAltitude <em>Altitude</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WGS84Point#getLongitude <em>Longitude</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WGS84Point#getLatitude <em>Latitude</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WGS84Point#getAltitude <em>Altitude</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWGS84Point()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWGS84Point()
  * @model
  * @generated
  */
@@ -27,14 +27,14 @@ public interface WGS84Point extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Longitude</em>' attribute.
 	 * @see #setLongitude(double)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWGS84Point_Longitude()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWGS84Point_Longitude()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Double"
 	 * @generated
 	 */
 	double getLongitude();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLongitude <em>Longitude</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.WGS84Point#getLongitude <em>Longitude</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Longitude</em>' attribute.
@@ -49,14 +49,14 @@ public interface WGS84Point extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Latitude</em>' attribute.
 	 * @see #setLatitude(double)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWGS84Point_Latitude()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWGS84Point_Latitude()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Double"
 	 * @generated
 	 */
 	double getLatitude();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getLatitude <em>Latitude</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.WGS84Point#getLatitude <em>Latitude</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Latitude</em>' attribute.
@@ -71,14 +71,14 @@ public interface WGS84Point extends Point {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Altitude</em>' attribute.
 	 * @see #setAltitude(double)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWGS84Point_Altitude()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWGS84Point_Altitude()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Double"
 	 * @generated
 	 */
 	double getAltitude();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point#getAltitude <em>Altitude</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.WGS84Point#getAltitude <em>Altitude</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Altitude</em>' attribute.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModel.java b/src/main/java/ipos/project/data/datamodel/WorldModel.java
similarity index 50%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModel.java
rename to src/main/java/ipos/project/data/datamodel/WorldModel.java
index 4fbe296f7c72b5416aaa81c26ad427f123de3167..83d87b79bf548a2265c05ae218322a18e07e4601 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModel.java
+++ b/src/main/java/ipos/project/data/datamodel/WorldModel.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -15,24 +15,24 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getAgent <em>Agent</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getZoneMap <em>Zone Map</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getPois <em>Pois</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel#getReferenceSystem <em>Reference System</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WorldModel#getAgent <em>Agent</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WorldModel#getZoneMap <em>Zone Map</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WorldModel#getPois <em>Pois</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.WorldModel#getReferenceSystem <em>Reference System</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModel()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModel()
  * @model
  * @generated
  */
 public interface WorldModel extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Agent</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.Agent}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.Agent}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Agent</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModel_Agent()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModel_Agent()
 	 * @model
 	 * @generated
 	 */
@@ -40,11 +40,11 @@ public interface WorldModel extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Zone Map</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.ZoneMap}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Zone Map</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModel_ZoneMap()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModel_ZoneMap()
 	 * @model
 	 * @generated
 	 */
@@ -52,11 +52,11 @@ public interface WorldModel extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Pois</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.POI}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.POI}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Pois</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModel_Pois()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModel_Pois()
 	 * @model
 	 * @generated
 	 */
@@ -64,11 +64,11 @@ public interface WorldModel extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Reference System</b></em>' reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.ReferenceSystem}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Reference System</em>' reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModel_ReferenceSystem()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModel_ReferenceSystem()
 	 * @model
 	 * @generated
 	 */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelQueryRequest.java b/src/main/java/ipos/project/data/datamodel/WorldModelQueryRequest.java
similarity index 65%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelQueryRequest.java
rename to src/main/java/ipos/project/data/datamodel/WorldModelQueryRequest.java
index ed30cdffbd34fd2ecaa0530df02909f57d6c09a5..c6425fafa16c7526edfdcf3911b3096f33aca2b5 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelQueryRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/WorldModelQueryRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModelQueryRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModelQueryRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelUpdateRequest.java b/src/main/java/ipos/project/data/datamodel/WorldModelUpdateRequest.java
similarity index 65%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelUpdateRequest.java
rename to src/main/java/ipos/project/data/datamodel/WorldModelUpdateRequest.java
index af3105797c20ad8e8870d47209f1281e90d67dee..60255d31d290423512ac522fbf9b9df87a090da4 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/WorldModelUpdateRequest.java
+++ b/src/main/java/ipos/project/data/datamodel/WorldModelUpdateRequest.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -10,7 +10,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getWorldModelUpdateRequest()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getWorldModelUpdateRequest()
  * @model
  * @generated
  */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Zone.java b/src/main/java/ipos/project/data/datamodel/Zone.java
similarity index 59%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Zone.java
rename to src/main/java/ipos/project/data/datamodel/Zone.java
index 736edd0ec0f0b5f191004148f720ea3a61a30ad3..da36b932ad501d4cf876ed9c4b19a130790f9b5a 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/Zone.java
+++ b/src/main/java/ipos/project/data/datamodel/Zone.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -14,24 +14,24 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getSpace <em>Space</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getName <em>Name</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getId <em>Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getCentrePoint <em>Centre Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Zone#getSpace <em>Space</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Zone#getName <em>Name</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Zone#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.Zone#getCentrePoint <em>Centre Point</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZone()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZone()
  * @model
  * @generated
  */
 public interface Zone extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Space</b></em>' containment reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.Space}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.Space}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Space</em>' containment reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZone_Space()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZone_Space()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -43,14 +43,14 @@ public interface Zone extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZone_Name()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZone_Name()
 	 * @model
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Zone#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
@@ -65,14 +65,14 @@ public interface Zone extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZone_Id()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZone_Id()
 	 * @model
 	 * @generated
 	 */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Zone#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
@@ -87,14 +87,14 @@ public interface Zone extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Centre Point</em>' reference.
 	 * @see #setCentrePoint(Placing)
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZone_CentrePoint()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZone_CentrePoint()
 	 * @model required="true"
 	 * @generated
 	 */
 	Placing getCentrePoint();
 
 	/**
-	 * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone#getCentrePoint <em>Centre Point</em>}' reference.
+	 * Sets the value of the '{@link ipos.project.data.datamodel.Zone#getCentrePoint <em>Centre Point</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Centre Point</em>' reference.
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ZoneMap.java b/src/main/java/ipos/project/data/datamodel/ZoneMap.java
similarity index 58%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ZoneMap.java
rename to src/main/java/ipos/project/data/datamodel/ZoneMap.java
index e67d1b34288c8039276d0019af8183fa692a14d8..daeb0c50bd1914a9da4eb2679db58ab435feea04 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/ZoneMap.java
+++ b/src/main/java/ipos/project/data/datamodel/ZoneMap.java
@@ -1,6 +1,6 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel;
+package ipos.project.data.datamodel;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -13,21 +13,21 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap#getZone <em>Zone</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.ZoneMap#getZone <em>Zone</em>}</li>
  * </ul>
  *
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZoneMap()
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZoneMap()
  * @model
  * @generated
  */
 public interface ZoneMap extends MapType {
 	/**
 	 * Returns the value of the '<em><b>Zone</b></em>' containment reference list.
-	 * The list contents are of type {@link ipos.project.DataModellntegration.iPos_Datamodel.Zone}.
+	 * The list contents are of type {@link ipos.project.data.datamodel.Zone}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Zone</em>' containment reference list.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getZoneMap_Zone()
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#getZoneMap_Zone()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AbsolutePositionImpl.java b/src/main/java/ipos/project/data/datamodel/impl/AbsolutePositionImpl.java
similarity index 88%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AbsolutePositionImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/AbsolutePositionImpl.java
index 351398dc9b356edbe9040709ac08155dfbc1a25d..da1854bf6d5a20bdef508f8e4e93169fb43feb5b 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AbsolutePositionImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/AbsolutePositionImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.AbsolutePosition;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point;
+import ipos.project.data.datamodel.AbsolutePosition;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.WGS84Point;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AbsolutePositionImpl#getPoint <em>Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.AbsolutePositionImpl#getPoint <em>Point</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AccelerationImpl.java b/src/main/java/ipos/project/data/datamodel/impl/AccelerationImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AccelerationImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/AccelerationImpl.java
index c0caf8b7cb51d72f79e4ba29891bdf580bbcc366..1b4332cc20c6961b2f44715b046645d953454837 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AccelerationImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/AccelerationImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Acceleration;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Acceleration;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AccuracyImpl.java b/src/main/java/ipos/project/data/datamodel/impl/AccuracyImpl.java
similarity index 75%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AccuracyImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/AccuracyImpl.java
index b537f25b9b997341d8b9b588020b3a1bc4d5ebee..2d33ae0d33e814ea78fea51f35dd0fe8f378b5d8 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AccuracyImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/AccuracyImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Accuracy;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Accuracy;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentImpl.java b/src/main/java/ipos/project/data/datamodel/impl/AgentImpl.java
similarity index 89%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/AgentImpl.java
index 9b493aa221926773e260381c66e3dd1344e5b782..486f88a11590fa802f8cfdeff9bb9b97a1a5ad35 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/AgentImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Agent;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject;
+import ipos.project.data.datamodel.Agent;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.LocalizableObject;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentImpl#getLObject <em>LObject</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.AgentImpl#getAgentType <em>Agent Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.AgentImpl#getLObject <em>LObject</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.AgentImpl#getAgentType <em>Agent Type</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentRegistrationRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/AgentRegistrationRequestImpl.java
similarity index 77%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentRegistrationRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/AgentRegistrationRequestImpl.java
index 6cdd6b82f25de7ca5c31963dcc7d921409e7b3da..fb5dfeb0aef0ff6ed3c8cc52804e7ff7b385d51b 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AgentRegistrationRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/AgentRegistrationRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.AgentRegistrationRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AngularRateImpl.java b/src/main/java/ipos/project/data/datamodel/impl/AngularRateImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AngularRateImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/AngularRateImpl.java
index 7b59bd4c1d13f183026c03310a3922d3dea206d4..2778c183ee5e7dae2111432fbd418dda2fb9e245 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/AngularRateImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/AngularRateImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.AngularRate;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.AngularRate;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BarcodeImpl.java b/src/main/java/ipos/project/data/datamodel/impl/BarcodeImpl.java
similarity index 73%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BarcodeImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/BarcodeImpl.java
index 28fac82137673766e33cc139471d5c8bd9942c54..77ab1988eae53ceeb5785200c84a7c0d1b8ecbd7 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BarcodeImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/BarcodeImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Barcode;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Barcode;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BeaconImpl.java b/src/main/java/ipos/project/data/datamodel/impl/BeaconImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BeaconImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/BeaconImpl.java
index eebdb2446bb178aefb6a1508acfe1434245cb22c..593aaa212bb9ef6a73e99b5aab41b017f9bd4e3c 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BeaconImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/BeaconImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Beacon;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Beacon;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import java.util.Map;
 
@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BeaconImpl#getDistances <em>Distances</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BeaconImpl#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.BeaconImpl#getDistances <em>Distances</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.BeaconImpl#getType <em>Type</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BluetoothImpl.java b/src/main/java/ipos/project/data/datamodel/impl/BluetoothImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BluetoothImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/BluetoothImpl.java
index 5e060bca1a9a05d5d5f4252d813294656384d40f..994923300519f5c4335d35a25b6278cd6b0ca669 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/BluetoothImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/BluetoothImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Bluetooth;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import java.util.Map;
 
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.BluetoothImpl#getRss <em>Rss</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.BluetoothImpl#getRss <em>Rss</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageQueryRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/DataStorageQueryRequestImpl.java
similarity index 77%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageQueryRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/DataStorageQueryRequestImpl.java
index 5ae52a5efe39d208fc982f227939081380e47045..f858968af54f74fbd950a6c3d320f4a1d2a4dd2f 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageQueryRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/DataStorageQueryRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.DataStorageQueryRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.DataStorageQueryRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/DataStorageRequestImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/DataStorageRequestImpl.java
index 44f57587b40cc8d70e6682f8f0420f1522a29050..435d2f504dc61dc3ac48fb7e76cb5bdaa4bcbc56 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/DataStorageRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/DataStorageRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.DataStorageRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EntityImpl.java b/src/main/java/ipos/project/data/datamodel/impl/EntityImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EntityImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/EntityImpl.java
index 37975e3d209ea054c7dd6153182ae893eaaf55ca..4f99a0fd550494e46c2b102c7d59ff784f701eed 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EntityImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/EntityImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Entity;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Entity;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EntityImpl#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EntityImpl#getId <em>Id</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java b/src/main/java/ipos/project/data/datamodel/impl/EventFilterConditionImpl.java
similarity index 92%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/EventFilterConditionImpl.java
index 69a103f555e34241ec5e1a126c9285708c83ee92..0f2d8958cd9a55babea4d2fe8c83d51c4b3a5deb 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/EventFilterConditionImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelFactory;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.EventFilterCondition;
+import ipos.project.data.datamodel.IPos_DatamodelFactory;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,16 +24,16 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getTimeCondition <em>Time Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getCategoryCondition <em>Category Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getIdCondition <em>Id Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getAccuracyCondition <em>Accuracy Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getPositionCondition <em>Position Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getTimeMinInterval <em>Time Min Interval</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getPositionDelta <em>Position Delta</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getSensorIdCondition <em>Sensor Id Condition</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getFilterStructure <em>Filter Structure</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getPositionConditionCell <em>Position Condition Cell</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getTimeCondition <em>Time Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getCategoryCondition <em>Category Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getIdCondition <em>Id Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getAccuracyCondition <em>Accuracy Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getPositionCondition <em>Position Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getTimeMinInterval <em>Time Min Interval</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getPositionDelta <em>Position Delta</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getSensorIdCondition <em>Sensor Id Condition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getFilterStructure <em>Filter Structure</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConditionImpl#getPositionConditionCell <em>Position Condition Cell</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConfigurationImpl.java b/src/main/java/ipos/project/data/datamodel/impl/EventFilterConfigurationImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConfigurationImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/EventFilterConfigurationImpl.java
index dff71e1af62b26c8a9a39ac1c68b592eda5cfd68..8d39c190150ca14648657d1e6fe2df76facd51cd 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConfigurationImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/EventFilterConfigurationImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition;
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.EventFilterCondition;
+import ipos.project.data.datamodel.EventFilterConfiguration;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import java.util.Collection;
 import java.util.Map;
@@ -29,10 +29,10 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl#getFilterCriteria <em>Filter Criteria</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConfigurationImpl#getEventfiltercondition <em>Eventfiltercondition</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConfigurationImpl#getPositionAmbiguityStrategy <em>Position Ambiguity Strategy</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConfigurationImpl#getPositionAmbiguityParameters <em>Position Ambiguity Parameters</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConfigurationImpl#getFilterCriteria <em>Filter Criteria</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.EventFilterConfigurationImpl#getEventfiltercondition <em>Eventfiltercondition</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/GaussianImpl.java b/src/main/java/ipos/project/data/datamodel/impl/GaussianImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/GaussianImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/GaussianImpl.java
index e068054305f85e5231cd22c1914d3ab59b9cec7b..7318f8614e4ec0e333234af7488d8a9862717f08 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/GaussianImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/GaussianImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Gaussian;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Gaussian;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.GaussianImpl#getConfidenceInterval <em>Confidence Interval</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.GaussianImpl#getConfidenceInterval <em>Confidence Interval</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IMUImpl.java b/src/main/java/ipos/project/data/datamodel/impl/IMUImpl.java
similarity index 89%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IMUImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/IMUImpl.java
index 296edc007eea1008dabc41eae055bc6b4f791994..a971f9b14648a07ac7577f5baccce5f4c0fa182e 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IMUImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/IMUImpl.java
@@ -1,11 +1,11 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Acceleration;
-import ipos.project.DataModellntegration.iPos_Datamodel.AngularRate;
-import ipos.project.DataModellntegration.iPos_Datamodel.IMU;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Acceleration;
+import ipos.project.data.datamodel.AngularRate;
+import ipos.project.data.datamodel.IMU;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.IMUImpl#getAngularrate <em>Angularrate</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.IMUImpl#getAcceleration <em>Acceleration</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.IMUImpl#getAngularrate <em>Angularrate</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.IMUImpl#getAcceleration <em>Acceleration</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelFactoryImpl.java b/src/main/java/ipos/project/data/datamodel/impl/IPos_DatamodelFactoryImpl.java
similarity index 99%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelFactoryImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/IPos_DatamodelFactoryImpl.java
index 440bf8ff0df0b0a3d61260666226ddcb8f1fd7db..e9afed709f56e931764e4ab08a349955d8c723b6 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelFactoryImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/IPos_DatamodelFactoryImpl.java
@@ -1,8 +1,8 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.*;
+import ipos.project.data.datamodel.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java b/src/main/java/ipos/project/data/datamodel/impl/IPos_DatamodelPackageImpl.java
similarity index 94%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/IPos_DatamodelPackageImpl.java
index 3b18849702a4c05d15f8e42c56033876be9d2084..ed76389d17fecd44e22cab53f0991568885efe09 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/IPos_DatamodelPackageImpl.java
@@ -1,51 +1,51 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
-
-import ipos.project.DataModellntegration.iPos_Datamodel.Acceleration;
-import ipos.project.DataModellntegration.iPos_Datamodel.Accuracy;
-import ipos.project.DataModellntegration.iPos_Datamodel.Agent;
-import ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.AngularRate;
-import ipos.project.DataModellntegration.iPos_Datamodel.Barcode;
-import ipos.project.DataModellntegration.iPos_Datamodel.Beacon;
-import ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth;
-import ipos.project.DataModellntegration.iPos_Datamodel.DataStorageQueryRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.Entity;
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition;
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration;
-import ipos.project.DataModellntegration.iPos_Datamodel.Gaussian;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelFactory;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject;
-import ipos.project.DataModellntegration.iPos_Datamodel.MapType;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask;
-import ipos.project.DataModellntegration.iPos_Datamodel.Orientation;
-import ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon;
-import ipos.project.DataModellntegration.iPos_Datamodel.OtherProx;
-import ipos.project.DataModellntegration.iPos_Datamodel.Placing;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point2D;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point3D;
-import ipos.project.DataModellntegration.iPos_Datamodel.Position;
-import ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent;
-import ipos.project.DataModellntegration.iPos_Datamodel.Proximity;
-import ipos.project.DataModellntegration.iPos_Datamodel.Quaternion;
-import ipos.project.DataModellntegration.iPos_Datamodel.Rawdata;
-import ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent;
-import ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem;
-import ipos.project.DataModellntegration.iPos_Datamodel.SensorConfigurationRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.Space;
-import ipos.project.DataModellntegration.iPos_Datamodel.TrackingRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask;
-import ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModel;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModelQueryRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModelUpdateRequest;
-import ipos.project.DataModellntegration.iPos_Datamodel.Zone;
-import ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap;
+package ipos.project.data.datamodel.impl;
+
+import ipos.project.data.datamodel.Acceleration;
+import ipos.project.data.datamodel.Accuracy;
+import ipos.project.data.datamodel.Agent;
+import ipos.project.data.datamodel.AgentRegistrationRequest;
+import ipos.project.data.datamodel.AngularRate;
+import ipos.project.data.datamodel.Barcode;
+import ipos.project.data.datamodel.Beacon;
+import ipos.project.data.datamodel.Bluetooth;
+import ipos.project.data.datamodel.DataStorageQueryRequest;
+import ipos.project.data.datamodel.DataStorageRequest;
+import ipos.project.data.datamodel.Entity;
+import ipos.project.data.datamodel.EventFilterCondition;
+import ipos.project.data.datamodel.EventFilterConfiguration;
+import ipos.project.data.datamodel.Gaussian;
+import ipos.project.data.datamodel.IPos_DatamodelFactory;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.LocalizableObject;
+import ipos.project.data.datamodel.MapType;
+import ipos.project.data.datamodel.MonitoringRequest;
+import ipos.project.data.datamodel.MonitoringTask;
+import ipos.project.data.datamodel.Orientation;
+import ipos.project.data.datamodel.OtherBeacon;
+import ipos.project.data.datamodel.OtherProx;
+import ipos.project.data.datamodel.Placing;
+import ipos.project.data.datamodel.Point;
+import ipos.project.data.datamodel.Point2D;
+import ipos.project.data.datamodel.Point3D;
+import ipos.project.data.datamodel.Position;
+import ipos.project.data.datamodel.PositionEvent;
+import ipos.project.data.datamodel.Proximity;
+import ipos.project.data.datamodel.Quaternion;
+import ipos.project.data.datamodel.Rawdata;
+import ipos.project.data.datamodel.RawdataEvent;
+import ipos.project.data.datamodel.ReferenceSystem;
+import ipos.project.data.datamodel.SensorConfigurationRequest;
+import ipos.project.data.datamodel.Space;
+import ipos.project.data.datamodel.TrackingRequest;
+import ipos.project.data.datamodel.TrackingTask;
+import ipos.project.data.datamodel.WGS84Point;
+import ipos.project.data.datamodel.WorldModel;
+import ipos.project.data.datamodel.WorldModelQueryRequest;
+import ipos.project.data.datamodel.WorldModelUpdateRequest;
+import ipos.project.data.datamodel.Zone;
+import ipos.project.data.datamodel.ZoneMap;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -443,7 +443,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#eNS_URI
+	 * @see ipos.project.data.datamodel.IPos_DatamodelPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -2157,13 +2157,13 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
 		initEAttribute(getProximity_ScannerId(), ecorePackage.getEString(), "scannerId", null, 0, 1, Proximity.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(rfidEClass, ipos.project.DataModellntegration.iPos_Datamodel.RFID.class, "RFID", !IS_ABSTRACT,
+		initEClass(rfidEClass, ipos.project.data.datamodel.RFID.class, "RFID", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRFID_Location(), ecorePackage.getEString(), "location", null, 0, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.RFID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.RFID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(nfcEClass, ipos.project.DataModellntegration.iPos_Datamodel.NFC.class, "NFC", !IS_ABSTRACT,
+		initEClass(nfcEClass, ipos.project.data.datamodel.NFC.class, "NFC", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
 		EGenericType g2 = createEGenericType(ecorePackage.getEString());
@@ -2171,16 +2171,16 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
 		g2 = createEGenericType(ecorePackage.getEObject());
 		g1.getETypeArguments().add(g2);
 		initEAttribute(getNFC_TagData(), g1, "tagData", null, 0, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.NFC.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.NFC.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(imuEClass, ipos.project.DataModellntegration.iPos_Datamodel.IMU.class, "IMU", !IS_ABSTRACT,
+		initEClass(imuEClass, ipos.project.data.datamodel.IMU.class, "IMU", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getIMU_Angularrate(), this.getAngularRate(), null, "angularrate", null, 1, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.IMU.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.IMU.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIMU_Acceleration(), this.getAcceleration(), null, "acceleration", null, 1, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.IMU.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.IMU.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(angularRateEClass, AngularRate.class, "AngularRate", !IS_ABSTRACT, !IS_INTERFACE,
@@ -2338,7 +2338,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
 		initEAttribute(getBluetooth_Rss(), g1, "rss", null, 0, 1, Bluetooth.class, IS_TRANSIENT, !IS_VOLATILE,
 				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(uwbEClass, ipos.project.DataModellntegration.iPos_Datamodel.UWB.class, "UWB", !IS_ABSTRACT,
+		initEClass(uwbEClass, ipos.project.data.datamodel.UWB.class, "UWB", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(sensorConfigurationRequestEClass, SensorConfigurationRequest.class, "SensorConfigurationRequest",
@@ -2354,13 +2354,13 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
 		initEAttribute(getOtherBeacon_Data(), g1, "data", null, 0, 1, OtherBeacon.class, IS_TRANSIENT, !IS_VOLATILE,
 				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(poiEClass, ipos.project.DataModellntegration.iPos_Datamodel.POI.class, "POI", !IS_ABSTRACT,
+		initEClass(poiEClass, ipos.project.data.datamodel.POI.class, "POI", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPOI_Position(), this.getPosition(), null, "position", null, 1, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.POI.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.POI.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getPOI_Description(), ecorePackage.getEString(), "description", null, 0, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.POI.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.POI.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEString());
@@ -2368,7 +2368,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
 		g2 = createEGenericType(ecorePackage.getEString());
 		g1.getETypeArguments().add(g2);
 		initEAttribute(getPOI_Data(), g1, "data", null, 0, 1,
-				ipos.project.DataModellntegration.iPos_Datamodel.POI.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				ipos.project.data.datamodel.POI.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(eventFilterConditionEClass, EventFilterCondition.class, "EventFilterCondition", !IS_ABSTRACT,
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/LocalizableObjectImpl.java b/src/main/java/ipos/project/data/datamodel/impl/LocalizableObjectImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/LocalizableObjectImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/LocalizableObjectImpl.java
index cdf51759e6ace000b466d177b3053e2c5edc2b27..8b97ea43952111c668854146023cc366d108ca43 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/LocalizableObjectImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/LocalizableObjectImpl.java
@@ -1,11 +1,11 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Agent;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject;
-import ipos.project.DataModellntegration.iPos_Datamodel.Placing;
+import ipos.project.data.datamodel.Agent;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.LocalizableObject;
+import ipos.project.data.datamodel.Placing;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl#getLastPosUpdate <em>Last Pos Update</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl#getSensorType <em>Sensor Type</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl#getAgent <em>Agent</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.LocalizableObjectImpl#getCurrentPlacing <em>Current Placing</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.LocalizableObjectImpl#getLastPosUpdate <em>Last Pos Update</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.LocalizableObjectImpl#getSensorType <em>Sensor Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.LocalizableObjectImpl#getAgent <em>Agent</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.LocalizableObjectImpl#getCurrentPlacing <em>Current Placing</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MapTypeImpl.java b/src/main/java/ipos/project/data/datamodel/impl/MapTypeImpl.java
similarity index 75%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MapTypeImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/MapTypeImpl.java
index 39ba56cae261556eab4d1732ea756b32c790a624..2db9604667812d78235fc74b5a5f138d3ee4296c 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MapTypeImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/MapTypeImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.MapType;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.MapType;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MonitoringRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/MonitoringRequestImpl.java
similarity index 92%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MonitoringRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/MonitoringRequestImpl.java
index 0808ee2687f8dc8b7b585ef7b9584500c21e90fc..4ba40deea25ef51012f7572b77ce2955c0dab375 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MonitoringRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/MonitoringRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.MonitoringRequest;
 
 import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
@@ -20,16 +20,16 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getFrameId <em>Frame Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getDelta <em>Delta</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getUpdateFrequency <em>Update Frequency</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getType <em>Type</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getId <em>Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getFusionStrategy <em>Fusion Strategy</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#isExitNotification <em>Exit Notification</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getProperties <em>Properties</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getMonitoringTaskId <em>Monitoring Task Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringRequestImpl#getRequestorProtocol <em>Requestor Protocol</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getFrameId <em>Frame Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getDelta <em>Delta</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getUpdateFrequency <em>Update Frequency</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getFusionStrategy <em>Fusion Strategy</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#isExitNotification <em>Exit Notification</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getProperties <em>Properties</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getMonitoringTaskId <em>Monitoring Task Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringRequestImpl#getRequestorProtocol <em>Requestor Protocol</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MonitoringTaskImpl.java b/src/main/java/ipos/project/data/datamodel/impl/MonitoringTaskImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MonitoringTaskImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/MonitoringTaskImpl.java
index abfc60c4c8e6bc49ec9337a2225e407eaa948102..23f5d2a14e69553987b373e36129168157705b3a 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/MonitoringTaskImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/MonitoringTaskImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask;
+import ipos.project.data.datamodel.EventFilterConfiguration;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.MonitoringTask;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.MonitoringTaskImpl#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.MonitoringTaskImpl#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NFCImpl.java b/src/main/java/ipos/project/data/datamodel/impl/NFCImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NFCImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/NFCImpl.java
index c876a1dcedd2669a92d2abf90164d39106ddede6..047c0f97ab145dfc0c5d0942d9e42c346e298117 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NFCImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/NFCImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.NFC;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.NFC;
 
 import java.util.Map;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.NFCImpl#getTagData <em>Tag Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.NFCImpl#getTagData <em>Tag Data</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NetworkInterfaceImpl.java b/src/main/java/ipos/project/data/datamodel/impl/NetworkInterfaceImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NetworkInterfaceImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/NetworkInterfaceImpl.java
index 92ea5272be3f41fb9765082a329dd98771dc80c4..ece455aa5026a966227a4074d10fde7476ace0fe 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/NetworkInterfaceImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/NetworkInterfaceImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.NetworkInterface;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.NetworkInterface;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OrientationImpl.java b/src/main/java/ipos/project/data/datamodel/impl/OrientationImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OrientationImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/OrientationImpl.java
index 36d0e088f8ddf3c37d52390a4ce4aa96914b6ba6..392309f2207a2b48d24694dfd12b7135c3dee408 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OrientationImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/OrientationImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Orientation;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Orientation;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OtherBeaconImpl.java b/src/main/java/ipos/project/data/datamodel/impl/OtherBeaconImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OtherBeaconImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/OtherBeaconImpl.java
index 9f5be7fe7e8ff69887a6d8c2fb4bda039f67ee25..5a39b74f9fa5029fb4e794e4d674e632c058eec3 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OtherBeaconImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/OtherBeaconImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.OtherBeacon;
 
 import java.util.Map;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherBeaconImpl#getData <em>Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.OtherBeaconImpl#getData <em>Data</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OtherProxImpl.java b/src/main/java/ipos/project/data/datamodel/impl/OtherProxImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OtherProxImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/OtherProxImpl.java
index e676358e0cdfb8d1be36a25551511093b1ef80bd..f90919e05f79662b471066282fa0d260bece8f26 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/OtherProxImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/OtherProxImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.OtherProx;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.OtherProx;
 
 import java.util.Map;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.OtherProxImpl#getData <em>Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.OtherProxImpl#getData <em>Data</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/POIImpl.java b/src/main/java/ipos/project/data/datamodel/impl/POIImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/POIImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/POIImpl.java
index 047844d73e0688f0fa586aa364cf57f8b43fb4e5..f901c94122d152bf26d19dfa59f32c2cbbb0240b 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/POIImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/POIImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.POI;
-import ipos.project.DataModellntegration.iPos_Datamodel.Position;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.POI;
+import ipos.project.data.datamodel.Position;
 
 import java.util.Map;
 
@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl#getPosition <em>Position</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.POIImpl#getData <em>Data</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.POIImpl#getPosition <em>Position</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.POIImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.POIImpl#getData <em>Data</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PlacingImpl.java b/src/main/java/ipos/project/data/datamodel/impl/PlacingImpl.java
similarity index 89%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PlacingImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/PlacingImpl.java
index 0e7abf285a4c8a34b9950867ec8ca4e37f43ab25..e9f3f11f74d79ef90bd5cc844acbd77fa5927833 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PlacingImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/PlacingImpl.java
@@ -1,11 +1,11 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Orientation;
-import ipos.project.DataModellntegration.iPos_Datamodel.Placing;
-import ipos.project.DataModellntegration.iPos_Datamodel.Position;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Orientation;
+import ipos.project.data.datamodel.Placing;
+import ipos.project.data.datamodel.Position;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PlacingImpl#getPosition <em>Position</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PlacingImpl#getOrientation <em>Orientation</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PlacingImpl#getPosition <em>Position</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PlacingImpl#getOrientation <em>Orientation</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/Point2DImpl.java b/src/main/java/ipos/project/data/datamodel/impl/Point2DImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/Point2DImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/Point2DImpl.java
index 0516ea7f7a4725c8f99bc7c70912a10175706e9e..a5b5c06cce71e6b3b32c9aac578fcb0e2e8083e2 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/Point2DImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/Point2DImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point2D;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Point2D;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point2DImpl#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point2DImpl#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.Point2DImpl#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.Point2DImpl#getY <em>Y</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/Point3DImpl.java b/src/main/java/ipos/project/data/datamodel/impl/Point3DImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/Point3DImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/Point3DImpl.java
index 6f0fa560c23fcd74c837e794b056e77cd25a6c5c..8b2153ec4cf2e4d7f7d22ff8214ec9ea1c3d5a3f 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/Point3DImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/Point3DImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point3D;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Point3D;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl#getY <em>Y</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.Point3DImpl#getZ <em>Z</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.Point3DImpl#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.Point3DImpl#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.Point3DImpl#getZ <em>Z</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PointImpl.java b/src/main/java/ipos/project/data/datamodel/impl/PointImpl.java
similarity index 75%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PointImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/PointImpl.java
index e314e8a750015f9498cff08d7aca2296e8e5dad4..8fb86b51c8c04332cd0a5a601d58d01192554009 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PointImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/PointImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Point;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionEventImpl.java b/src/main/java/ipos/project/data/datamodel/impl/PositionEventImpl.java
similarity index 92%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionEventImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/PositionEventImpl.java
index e4bd30b8884dbe3b97d17ad10fb3a6e980e7f6c5..cc66c930d87325413ac1fab22f533f482add8855 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionEventImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/PositionEventImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Placing;
-import ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Placing;
+import ipos.project.data.datamodel.PositionEvent;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionEventImpl#getPlacing <em>Placing</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionEventImpl#getTimeStamp <em>Time Stamp</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionEventImpl#getPlacing <em>Placing</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionEventImpl#getTimeStamp <em>Time Stamp</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionImpl.java b/src/main/java/ipos/project/data/datamodel/impl/PositionImpl.java
similarity index 89%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/PositionImpl.java
index 618a7e173f083f7f19bf7ea93329eca92a6f704e..438eb95a5ec6488bb3a2c3715d8c91081b8050ed 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/PositionImpl.java
@@ -1,13 +1,13 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Accuracy;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point;
-import ipos.project.DataModellntegration.iPos_Datamodel.Position;
+import ipos.project.data.datamodel.Accuracy;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Point;
+import ipos.project.data.datamodel.Position;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem;
+import ipos.project.data.datamodel.ReferenceSystem;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl#getAccuracy <em>Accuracy</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl#getPoint <em>Point</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionImpl#getReferenceSystem <em>Reference System</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionImpl#getAccuracy <em>Accuracy</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionImpl#getPoint <em>Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionImpl#getReferenceSystem <em>Reference System</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionSensorImpl.java b/src/main/java/ipos/project/data/datamodel/impl/PositionSensorImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionSensorImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/PositionSensorImpl.java
index 49c0bcfd908952cc5c44ea457415bdc3905919b5..49a9fd63d88bbdb5926ec872eca1cd09c13a3be3 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/PositionSensorImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/PositionSensorImpl.java
@@ -1,11 +1,11 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Agent;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject;
-import ipos.project.DataModellntegration.iPos_Datamodel.PositionSensor;
+import ipos.project.data.datamodel.Agent;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.LocalizableObject;
+import ipos.project.data.datamodel.PositionSensor;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionSensorImpl#getAgent <em>Agent</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionSensorImpl#getLObject <em>LObject</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.PositionSensorImpl#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionSensorImpl#getAgent <em>Agent</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionSensorImpl#getLObject <em>LObject</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.PositionSensorImpl#getType <em>Type</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ProximityImpl.java b/src/main/java/ipos/project/data/datamodel/impl/ProximityImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ProximityImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/ProximityImpl.java
index 3dccb64502adb01908962eabea8cfe8253430b59..411a5d79bd2c148ceebd53a91f9e462beebe4bed 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ProximityImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/ProximityImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Proximity;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Proximity;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl#getTagId <em>Tag Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl#getType <em>Type</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ProximityImpl#getScannerId <em>Scanner Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ProximityImpl#getTagId <em>Tag Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ProximityImpl#getType <em>Type</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ProximityImpl#getScannerId <em>Scanner Id</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/QuaternionImpl.java b/src/main/java/ipos/project/data/datamodel/impl/QuaternionImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/QuaternionImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/QuaternionImpl.java
index 9aa9dabcdf13169c7cafad3d9d83da0e3e2cedaf..aaf811232120d3368e836c78dc4fb88c6ec718aa 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/QuaternionImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/QuaternionImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Quaternion;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Quaternion;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,10 +19,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl#getY <em>Y</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl#getZ <em>Z</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.QuaternionImpl#getW <em>W</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.QuaternionImpl#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.QuaternionImpl#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.QuaternionImpl#getZ <em>Z</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.QuaternionImpl#getW <em>W</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RFIDImpl.java b/src/main/java/ipos/project/data/datamodel/impl/RFIDImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RFIDImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/RFIDImpl.java
index 01387fa17591fce5bbc33ad910710261456ae074..fc277b041a5d8e00f87a879eaf8e6314fe409241 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RFIDImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/RFIDImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.RFID;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.RFID;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RFIDImpl#getLocation <em>Location</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.RFIDImpl#getLocation <em>Location</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RawdataEventImpl.java b/src/main/java/ipos/project/data/datamodel/impl/RawdataEventImpl.java
similarity index 87%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RawdataEventImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/RawdataEventImpl.java
index 5648bc0da0a289ec7eef16a07178e1dd5e2b53d5..185f8d67817f2dbee1075e535890d3aeb7ba81f8 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RawdataEventImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/RawdataEventImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Rawdata;
-import ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Rawdata;
+import ipos.project.data.datamodel.RawdataEvent;
 
 import java.util.Collection;
 
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataEventImpl#getRawdata <em>Rawdata</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.RawdataEventImpl#getRawdata <em>Rawdata</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RawdataImpl.java b/src/main/java/ipos/project/data/datamodel/impl/RawdataImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RawdataImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/RawdataImpl.java
index 78738a1877a9353cf923eaa824cc5bd8fae57910..eb32ac9c00ed2cbcfc44b7626614481ab2a67fc3 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RawdataImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/RawdataImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Rawdata;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Rawdata;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RawdataImpl#getSensorId <em>Sensor Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.RawdataImpl#getSensorId <em>Sensor Id</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ReferencePositionImpl.java b/src/main/java/ipos/project/data/datamodel/impl/ReferencePositionImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ReferencePositionImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/ReferencePositionImpl.java
index 66867aba7a20b2bca4097a6c1442bbbfcdffbc51..9c1e551cbb2c27a7f729fa6c924402c24e5678ad 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ReferencePositionImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/ReferencePositionImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Position;
-import ipos.project.DataModellntegration.iPos_Datamodel.ReferencePosition;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Position;
+import ipos.project.data.datamodel.ReferencePosition;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferencePositionImpl#getPosition <em>Position</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferencePositionImpl#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ReferencePositionImpl#getPosition <em>Position</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ReferencePositionImpl#getId <em>Id</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ReferenceSystemImpl.java b/src/main/java/ipos/project/data/datamodel/impl/ReferenceSystemImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ReferenceSystemImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/ReferenceSystemImpl.java
index e465976fa256af5ce83872a7a065e85598474308..121c07b3f4100d385a124df574a9dd8f8b2e0a39 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ReferenceSystemImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/ReferenceSystemImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Placing;
-import ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Placing;
+import ipos.project.data.datamodel.ReferenceSystem;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl#getOrigin <em>Origin</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl#getName <em>Name</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ReferenceSystemImpl#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ReferenceSystemImpl#getOrigin <em>Origin</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ReferenceSystemImpl#getName <em>Name</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ReferenceSystemImpl#getId <em>Id</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RelativePositionImpl.java b/src/main/java/ipos/project/data/datamodel/impl/RelativePositionImpl.java
similarity index 89%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RelativePositionImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/RelativePositionImpl.java
index 30262a5e66dd4d95940044f86073e4e4a71b2d34..3edc2a721281fbf15154a09c4bae1631dfe18757 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/RelativePositionImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/RelativePositionImpl.java
@@ -1,11 +1,11 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Point;
-import ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem;
-import ipos.project.DataModellntegration.iPos_Datamodel.RelativePosition;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Point;
+import ipos.project.data.datamodel.ReferenceSystem;
+import ipos.project.data.datamodel.RelativePosition;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RelativePositionImpl#getReference <em>Reference</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.RelativePositionImpl#getPoint <em>Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.RelativePositionImpl#getReference <em>Reference</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.RelativePositionImpl#getPoint <em>Point</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/SensorConfigurationRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/SensorConfigurationRequestImpl.java
similarity index 77%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/SensorConfigurationRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/SensorConfigurationRequestImpl.java
index 275929b028ad5ed5d994d2b61aaed70a823fc395..ceafa3956790d672f21031e907f39950ab02723a 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/SensorConfigurationRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/SensorConfigurationRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.SensorConfigurationRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.SensorConfigurationRequest;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/SpaceImpl.java b/src/main/java/ipos/project/data/datamodel/impl/SpaceImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/SpaceImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/SpaceImpl.java
index 028252acf2eef0055d652fbf9c593cdc275ebe7f..d2146d7fb020328a3c40c2eec0dac4bee82f108d 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/SpaceImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/SpaceImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Space;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Space;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl#getX <em>X</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl#getY <em>Y</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.SpaceImpl#getZ <em>Z</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.SpaceImpl#getX <em>X</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.SpaceImpl#getY <em>Y</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.SpaceImpl#getZ <em>Z</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/TrackingRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/TrackingRequestImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/TrackingRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/TrackingRequestImpl.java
index e1c27083e26ff381de01bd2c1effdf4955f316b9..ee531b1b9eeaa758aeb78d65bc9318fc0a13295a 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/TrackingRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/TrackingRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.TrackingRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.TrackingRequest;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/TrackingTaskImpl.java b/src/main/java/ipos/project/data/datamodel/impl/TrackingTaskImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/TrackingTaskImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/TrackingTaskImpl.java
index 8c0c2a73662e2101f9182218eff5023856fe0494..65b1e87d3400400105cf798cd05af4fc43285a21 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/TrackingTaskImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/TrackingTaskImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask;
+import ipos.project.data.datamodel.EventFilterConfiguration;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.TrackingTask;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.TrackingTaskImpl#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.TrackingTaskImpl#getEventfilterconfiguration <em>Eventfilterconfiguration</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/UWBImpl.java b/src/main/java/ipos/project/data/datamodel/impl/UWBImpl.java
similarity index 73%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/UWBImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/UWBImpl.java
index ee56f5f38439d5216105b4febdaf5a51fd389b64..575718230f2b1a41c83c2400af8301c26c8239dc 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/UWBImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/UWBImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.UWB;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.UWB;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WGS84PointImpl.java b/src/main/java/ipos/project/data/datamodel/impl/WGS84PointImpl.java
similarity index 91%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WGS84PointImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/WGS84PointImpl.java
index e140f5c22d1277f0c52036062ae2300ce4e36291..eecb9574fc84368ba1486da905500477a523b175 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WGS84PointImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/WGS84PointImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.WGS84Point;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl#getLongitude <em>Longitude</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl#getLatitude <em>Latitude</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WGS84PointImpl#getAltitude <em>Altitude</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WGS84PointImpl#getLongitude <em>Longitude</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WGS84PointImpl#getLatitude <em>Latitude</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WGS84PointImpl#getAltitude <em>Altitude</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelImpl.java b/src/main/java/ipos/project/data/datamodel/impl/WorldModelImpl.java
similarity index 85%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/WorldModelImpl.java
index 94fa6e2a417fc5c56491b514e71c66e285787f66..b742811156d6dde4fd821843e61dd3651b8e01b4 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/WorldModelImpl.java
@@ -1,13 +1,13 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.Agent;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.POI;
-import ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModel;
-import ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap;
+import ipos.project.data.datamodel.Agent;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.POI;
+import ipos.project.data.datamodel.ReferenceSystem;
+import ipos.project.data.datamodel.WorldModel;
+import ipos.project.data.datamodel.ZoneMap;
 
 import java.util.Collection;
 
@@ -27,10 +27,10 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl#getAgent <em>Agent</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl#getZoneMap <em>Zone Map</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl#getPois <em>Pois</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.WorldModelImpl#getReferenceSystem <em>Reference System</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WorldModelImpl#getAgent <em>Agent</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WorldModelImpl#getZoneMap <em>Zone Map</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WorldModelImpl#getPois <em>Pois</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.WorldModelImpl#getReferenceSystem <em>Reference System</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelQueryRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/WorldModelQueryRequestImpl.java
similarity index 76%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelQueryRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/WorldModelQueryRequestImpl.java
index 74618cb0f51a1d62460355dcec5eefbfb409facc..b3a509c743fa51d1de9906515ab6e377e65a8f17 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelQueryRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/WorldModelQueryRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModelQueryRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.WorldModelQueryRequest;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelUpdateRequestImpl.java b/src/main/java/ipos/project/data/datamodel/impl/WorldModelUpdateRequestImpl.java
similarity index 77%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelUpdateRequestImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/WorldModelUpdateRequestImpl.java
index 510b2ef29e08986971947582fa0bbbc9ebfc0095..b00609c497d35d98fe43b18a0c7b31ab804f8492 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/WorldModelUpdateRequestImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/WorldModelUpdateRequestImpl.java
@@ -1,9 +1,9 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.WorldModelUpdateRequest;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.WorldModelUpdateRequest;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ZoneImpl.java b/src/main/java/ipos/project/data/datamodel/impl/ZoneImpl.java
similarity index 90%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ZoneImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/ZoneImpl.java
index 7724b777aac133834b9cb79ad3d0786d71b0279b..60baf683dba7f9bbeee2f575929f7715088747d0 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ZoneImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/ZoneImpl.java
@@ -1,11 +1,11 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Placing;
-import ipos.project.DataModellntegration.iPos_Datamodel.Space;
-import ipos.project.DataModellntegration.iPos_Datamodel.Zone;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Placing;
+import ipos.project.data.datamodel.Space;
+import ipos.project.data.datamodel.Zone;
 
 import java.util.Collection;
 
@@ -30,10 +30,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl#getSpace <em>Space</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl#getName <em>Name</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl#getId <em>Id</em>}</li>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneImpl#getCentrePoint <em>Centre Point</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ZoneImpl#getSpace <em>Space</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ZoneImpl#getName <em>Name</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ZoneImpl#getId <em>Id</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ZoneImpl#getCentrePoint <em>Centre Point</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ZoneMapImpl.java b/src/main/java/ipos/project/data/datamodel/impl/ZoneMapImpl.java
similarity index 88%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ZoneMapImpl.java
rename to src/main/java/ipos/project/data/datamodel/impl/ZoneMapImpl.java
index 98fc65302c8009fe67ce21ac6ea0dceca42af568..67229021840bfe59d208ee01047feeffaedaa0ce 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/ZoneMapImpl.java
+++ b/src/main/java/ipos/project/data/datamodel/impl/ZoneMapImpl.java
@@ -1,10 +1,10 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.impl;
+package ipos.project.data.datamodel.impl;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
-import ipos.project.DataModellntegration.iPos_Datamodel.Zone;
-import ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap;
+import ipos.project.data.datamodel.IPos_DatamodelPackage;
+import ipos.project.data.datamodel.Zone;
+import ipos.project.data.datamodel.ZoneMap;
 
 import java.util.Collection;
 
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.ZoneMapImpl#getZone <em>Zone</em>}</li>
+ *   <li>{@link ipos.project.data.datamodel.impl.ZoneMapImpl#getZone <em>Zone</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/util/IPos_DatamodelAdapterFactory.java b/src/main/java/ipos/project/data/datamodel/util/IPos_DatamodelAdapterFactory.java
similarity index 78%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/util/IPos_DatamodelAdapterFactory.java
rename to src/main/java/ipos/project/data/datamodel/util/IPos_DatamodelAdapterFactory.java
index 29cb9099d4fe9e0cc1b711feb897c50a4c76cfbf..1bc55c73c8334ca62336bd3d5a22677dc5885600 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/util/IPos_DatamodelAdapterFactory.java
+++ b/src/main/java/ipos/project/data/datamodel/util/IPos_DatamodelAdapterFactory.java
@@ -1,8 +1,8 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.util;
+package ipos.project.data.datamodel.util;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.*;
+import ipos.project.data.datamodel.*;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage
  * @generated
  */
 public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
@@ -321,13 +321,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Agent <em>Agent</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Agent <em>Agent</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Agent
+	 * @see ipos.project.data.datamodel.Agent
 	 * @generated
 	 */
 	public Adapter createAgentAdapter() {
@@ -335,13 +335,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Entity <em>Entity</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Entity <em>Entity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Entity
+	 * @see ipos.project.data.datamodel.Entity
 	 * @generated
 	 */
 	public Adapter createEntityAdapter() {
@@ -349,13 +349,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject <em>Localizable Object</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.LocalizableObject <em>Localizable Object</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.LocalizableObject
+	 * @see ipos.project.data.datamodel.LocalizableObject
 	 * @generated
 	 */
 	public Adapter createLocalizableObjectAdapter() {
@@ -363,13 +363,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Placing <em>Placing</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Placing <em>Placing</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Placing
+	 * @see ipos.project.data.datamodel.Placing
 	 * @generated
 	 */
 	public Adapter createPlacingAdapter() {
@@ -377,13 +377,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Position <em>Position</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Position <em>Position</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Position
+	 * @see ipos.project.data.datamodel.Position
 	 * @generated
 	 */
 	public Adapter createPositionAdapter() {
@@ -391,13 +391,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Orientation <em>Orientation</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Orientation <em>Orientation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Orientation
+	 * @see ipos.project.data.datamodel.Orientation
 	 * @generated
 	 */
 	public Adapter createOrientationAdapter() {
@@ -405,13 +405,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point <em>WGS84 Point</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.WGS84Point <em>WGS84 Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WGS84Point
+	 * @see ipos.project.data.datamodel.WGS84Point
 	 * @generated
 	 */
 	public Adapter createWGS84PointAdapter() {
@@ -419,13 +419,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Accuracy <em>Accuracy</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Accuracy <em>Accuracy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Accuracy
+	 * @see ipos.project.data.datamodel.Accuracy
 	 * @generated
 	 */
 	public Adapter createAccuracyAdapter() {
@@ -433,13 +433,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point2D <em>Point2 D</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Point2D <em>Point2 D</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point2D
+	 * @see ipos.project.data.datamodel.Point2D
 	 * @generated
 	 */
 	public Adapter createPoint2DAdapter() {
@@ -447,13 +447,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point3D <em>Point3 D</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Point3D <em>Point3 D</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point3D
+	 * @see ipos.project.data.datamodel.Point3D
 	 * @generated
 	 */
 	public Adapter createPoint3DAdapter() {
@@ -461,13 +461,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem <em>Reference System</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.ReferenceSystem <em>Reference System</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ReferenceSystem
+	 * @see ipos.project.data.datamodel.ReferenceSystem
 	 * @generated
 	 */
 	public Adapter createReferenceSystemAdapter() {
@@ -475,13 +475,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Zone <em>Zone</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Zone <em>Zone</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Zone
+	 * @see ipos.project.data.datamodel.Zone
 	 * @generated
 	 */
 	public Adapter createZoneAdapter() {
@@ -489,13 +489,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap <em>Zone Map</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.ZoneMap <em>Zone Map</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.ZoneMap
+	 * @see ipos.project.data.datamodel.ZoneMap
 	 * @generated
 	 */
 	public Adapter createZoneMapAdapter() {
@@ -503,13 +503,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Space <em>Space</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Space <em>Space</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Space
+	 * @see ipos.project.data.datamodel.Space
 	 * @generated
 	 */
 	public Adapter createSpaceAdapter() {
@@ -517,13 +517,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.MapType <em>Map Type</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.MapType <em>Map Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MapType
+	 * @see ipos.project.data.datamodel.MapType
 	 * @generated
 	 */
 	public Adapter createMapTypeAdapter() {
@@ -531,13 +531,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Quaternion <em>Quaternion</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Quaternion <em>Quaternion</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Quaternion
+	 * @see ipos.project.data.datamodel.Quaternion
 	 * @generated
 	 */
 	public Adapter createQuaternionAdapter() {
@@ -545,13 +545,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Gaussian <em>Gaussian</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Gaussian <em>Gaussian</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Gaussian
+	 * @see ipos.project.data.datamodel.Gaussian
 	 * @generated
 	 */
 	public Adapter createGaussianAdapter() {
@@ -559,13 +559,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Point <em>Point</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Point <em>Point</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Point
+	 * @see ipos.project.data.datamodel.Point
 	 * @generated
 	 */
 	public Adapter createPointAdapter() {
@@ -573,13 +573,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Rawdata <em>Rawdata</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Rawdata <em>Rawdata</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Rawdata
+	 * @see ipos.project.data.datamodel.Rawdata
 	 * @generated
 	 */
 	public Adapter createRawdataAdapter() {
@@ -587,13 +587,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Proximity <em>Proximity</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Proximity <em>Proximity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Proximity
+	 * @see ipos.project.data.datamodel.Proximity
 	 * @generated
 	 */
 	public Adapter createProximityAdapter() {
@@ -601,13 +601,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.RFID <em>RFID</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.RFID <em>RFID</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.RFID
+	 * @see ipos.project.data.datamodel.RFID
 	 * @generated
 	 */
 	public Adapter createRFIDAdapter() {
@@ -615,13 +615,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.NFC <em>NFC</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.NFC <em>NFC</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.NFC
+	 * @see ipos.project.data.datamodel.NFC
 	 * @generated
 	 */
 	public Adapter createNFCAdapter() {
@@ -629,13 +629,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.IMU <em>IMU</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.IMU <em>IMU</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.IMU
+	 * @see ipos.project.data.datamodel.IMU
 	 * @generated
 	 */
 	public Adapter createIMUAdapter() {
@@ -643,13 +643,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.AngularRate <em>Angular Rate</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.AngularRate <em>Angular Rate</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.AngularRate
+	 * @see ipos.project.data.datamodel.AngularRate
 	 * @generated
 	 */
 	public Adapter createAngularRateAdapter() {
@@ -657,13 +657,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Acceleration <em>Acceleration</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Acceleration <em>Acceleration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Acceleration
+	 * @see ipos.project.data.datamodel.Acceleration
 	 * @generated
 	 */
 	public Adapter createAccelerationAdapter() {
@@ -671,13 +671,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Beacon <em>Beacon</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Beacon <em>Beacon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Beacon
+	 * @see ipos.project.data.datamodel.Beacon
 	 * @generated
 	 */
 	public Adapter createBeaconAdapter() {
@@ -685,13 +685,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent <em>Position Event</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.PositionEvent <em>Position Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.PositionEvent
+	 * @see ipos.project.data.datamodel.PositionEvent
 	 * @generated
 	 */
 	public Adapter createPositionEventAdapter() {
@@ -699,13 +699,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent <em>Rawdata Event</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.RawdataEvent <em>Rawdata Event</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.RawdataEvent
+	 * @see ipos.project.data.datamodel.RawdataEvent
 	 * @generated
 	 */
 	public Adapter createRawdataEventAdapter() {
@@ -713,13 +713,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingRequest <em>Tracking Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.TrackingRequest <em>Tracking Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.TrackingRequest
+	 * @see ipos.project.data.datamodel.TrackingRequest
 	 * @generated
 	 */
 	public Adapter createTrackingRequestAdapter() {
@@ -727,13 +727,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest <em>Monitoring Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.MonitoringRequest <em>Monitoring Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringRequest
+	 * @see ipos.project.data.datamodel.MonitoringRequest
 	 * @generated
 	 */
 	public Adapter createMonitoringRequestAdapter() {
@@ -741,13 +741,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModelUpdateRequest <em>World Model Update Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.WorldModelUpdateRequest <em>World Model Update Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModelUpdateRequest
+	 * @see ipos.project.data.datamodel.WorldModelUpdateRequest
 	 * @generated
 	 */
 	public Adapter createWorldModelUpdateRequestAdapter() {
@@ -755,13 +755,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest <em>Data Storage Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.DataStorageRequest <em>Data Storage Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.DataStorageRequest
+	 * @see ipos.project.data.datamodel.DataStorageRequest
 	 * @generated
 	 */
 	public Adapter createDataStorageRequestAdapter() {
@@ -769,13 +769,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration <em>Event Filter Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.EventFilterConfiguration <em>Event Filter Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterConfiguration
+	 * @see ipos.project.data.datamodel.EventFilterConfiguration
 	 * @generated
 	 */
 	public Adapter createEventFilterConfigurationAdapter() {
@@ -783,13 +783,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModelQueryRequest <em>World Model Query Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.WorldModelQueryRequest <em>World Model Query Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModelQueryRequest
+	 * @see ipos.project.data.datamodel.WorldModelQueryRequest
 	 * @generated
 	 */
 	public Adapter createWorldModelQueryRequestAdapter() {
@@ -797,13 +797,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.DataStorageQueryRequest <em>Data Storage Query Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.DataStorageQueryRequest <em>Data Storage Query Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.DataStorageQueryRequest
+	 * @see ipos.project.data.datamodel.DataStorageQueryRequest
 	 * @generated
 	 */
 	public Adapter createDataStorageQueryRequestAdapter() {
@@ -811,13 +811,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest <em>Agent Registration Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.AgentRegistrationRequest <em>Agent Registration Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.AgentRegistrationRequest
+	 * @see ipos.project.data.datamodel.AgentRegistrationRequest
 	 * @generated
 	 */
 	public Adapter createAgentRegistrationRequestAdapter() {
@@ -825,13 +825,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask <em>Monitoring Task</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.MonitoringTask <em>Monitoring Task</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.MonitoringTask
+	 * @see ipos.project.data.datamodel.MonitoringTask
 	 * @generated
 	 */
 	public Adapter createMonitoringTaskAdapter() {
@@ -839,13 +839,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask <em>Tracking Task</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.TrackingTask <em>Tracking Task</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.TrackingTask
+	 * @see ipos.project.data.datamodel.TrackingTask
 	 * @generated
 	 */
 	public Adapter createTrackingTaskAdapter() {
@@ -853,13 +853,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.WorldModel <em>World Model</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.WorldModel <em>World Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.WorldModel
+	 * @see ipos.project.data.datamodel.WorldModel
 	 * @generated
 	 */
 	public Adapter createWorldModelAdapter() {
@@ -867,13 +867,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Barcode <em>Barcode</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Barcode <em>Barcode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Barcode
+	 * @see ipos.project.data.datamodel.Barcode
 	 * @generated
 	 */
 	public Adapter createBarcodeAdapter() {
@@ -881,13 +881,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherProx <em>Other Prox</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.OtherProx <em>Other Prox</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.OtherProx
+	 * @see ipos.project.data.datamodel.OtherProx
 	 * @generated
 	 */
 	public Adapter createOtherProxAdapter() {
@@ -895,13 +895,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth <em>Bluetooth</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.Bluetooth <em>Bluetooth</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.Bluetooth
+	 * @see ipos.project.data.datamodel.Bluetooth
 	 * @generated
 	 */
 	public Adapter createBluetoothAdapter() {
@@ -909,13 +909,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.UWB <em>UWB</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.UWB <em>UWB</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.UWB
+	 * @see ipos.project.data.datamodel.UWB
 	 * @generated
 	 */
 	public Adapter createUWBAdapter() {
@@ -923,13 +923,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.SensorConfigurationRequest <em>Sensor Configuration Request</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.SensorConfigurationRequest <em>Sensor Configuration Request</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.SensorConfigurationRequest
+	 * @see ipos.project.data.datamodel.SensorConfigurationRequest
 	 * @generated
 	 */
 	public Adapter createSensorConfigurationRequestAdapter() {
@@ -937,13 +937,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon <em>Other Beacon</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.OtherBeacon <em>Other Beacon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.OtherBeacon
+	 * @see ipos.project.data.datamodel.OtherBeacon
 	 * @generated
 	 */
 	public Adapter createOtherBeaconAdapter() {
@@ -951,13 +951,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.POI <em>POI</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.POI <em>POI</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.POI
+	 * @see ipos.project.data.datamodel.POI
 	 * @generated
 	 */
 	public Adapter createPOIAdapter() {
@@ -965,13 +965,13 @@ public class IPos_DatamodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition <em>Event Filter Condition</em>}'.
+	 * Creates a new adapter for an object of class '{@link ipos.project.data.datamodel.EventFilterCondition <em>Event Filter Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition
+	 * @see ipos.project.data.datamodel.EventFilterCondition
 	 * @generated
 	 */
 	public Adapter createEventFilterConditionAdapter() {
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/util/IPos_DatamodelSwitch.java b/src/main/java/ipos/project/data/datamodel/util/IPos_DatamodelSwitch.java
similarity index 99%
rename from src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/util/IPos_DatamodelSwitch.java
rename to src/main/java/ipos/project/data/datamodel/util/IPos_DatamodelSwitch.java
index 7d6e52ced860b199a486a5f340eccfe226349ba5..7884ddd1961d907eb0858a0a6f9852c65b7c47ed 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/util/IPos_DatamodelSwitch.java
+++ b/src/main/java/ipos/project/data/datamodel/util/IPos_DatamodelSwitch.java
@@ -1,8 +1,8 @@
 /**
  */
-package ipos.project.DataModellntegration.iPos_Datamodel.util;
+package ipos.project.data.datamodel.util;
 
-import ipos.project.DataModellntegration.iPos_Datamodel.*;
+import ipos.project.data.datamodel.*;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage
+ * @see ipos.project.data.datamodel.IPos_DatamodelPackage
  * @generated
  */
 public class IPos_DatamodelSwitch<T> extends Switch<T> {
diff --git a/src/main/java/ipos/project/mapper/DataModelMapper.java b/src/main/java/ipos/project/mapper/DataModelMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..2102e7b03af11ce3083d16a173e517f2357983d9
--- /dev/null
+++ b/src/main/java/ipos/project/mapper/DataModelMapper.java
@@ -0,0 +1,45 @@
+package ipos.project.mapper;
+
+import ipos.models.SimpleScene;
+import ipos.project.data.datamodel.IPos_DatamodelFactory;
+import ipos.project.data.datamodel.MonitoringRequest;
+
+public class DataModelMapper {
+
+    private static final IPos_DatamodelFactory modelFactory = IPos_DatamodelFactory.eINSTANCE;
+
+    public static MonitoringRequest toEntity(SimpleScene.IposMonitoringRequest monReqProto){
+        MonitoringRequest monReqInt = modelFactory.createMonitoringRequest();
+        monReqInt.setFrameId(monReqProto.getFrameId());
+        monReqInt.setDelta(monReqProto.getDelta());
+        monReqInt.setUpdateFrequency(monReqProto.getUpdateFrequency());
+        monReqInt.setType(monReqProto.getTypeList());
+        monReqInt.setId(monReqProto.getIdList());
+        monReqInt.setFusionStrategy(monReqProto.getFusionStrategy());
+        monReqInt.setExitNotification(monReqProto.getExitNotification());
+        monReqInt.setProperties(monReqProto.getPropertiesList());
+        monReqInt.setMonitoringTaskId(monReqProto.getMonitoringTaskId());
+        monReqInt.setRequestorProtocol(monReqProto.getRequestorProtocol());
+        return monReqInt;
+
+    }
+
+    public static SimpleScene.IposMonitoringRequest toDto(MonitoringRequest monReq) {
+        // to Data Transfer Object
+        return SimpleScene.IposMonitoringRequest.newBuilder()
+            .setFrameId(monReq.getFrameId())
+            .setDelta(monReq.getDelta())
+            .setUpdateFrequency(monReq.getUpdateFrequency())
+            .addAllType(monReq.getType())
+            .addAllId(monReq.getId())
+            .setFusionStrategy(monReq.getFusionStrategy())
+            .setExitNotification(monReq.isExitNotification())
+            .addAllProperties(monReq.getProperties())
+            .setMonitoringTaskId(monReq.getMonitoringTaskId())
+            .setRequestorProtocol(monReq.getRequestorProtocol())
+            .build();
+    }
+
+
+
+}
diff --git a/src/main/java/ipos/project/mapper/ProtoJsonMap.java b/src/main/java/ipos/project/mapper/ProtoMapper.java
similarity index 94%
rename from src/main/java/ipos/project/mapper/ProtoJsonMap.java
rename to src/main/java/ipos/project/mapper/ProtoMapper.java
index 00c924f85c6b0b7626e16a32f8dabd0e9e69cc7b..0cb6f4ef3bf9ed3e46f0ad2a3544954c435e6d74 100644
--- a/src/main/java/ipos/project/mapper/ProtoJsonMap.java
+++ b/src/main/java/ipos/project/mapper/ProtoMapper.java
@@ -1,6 +1,5 @@
 package ipos.project.mapper;
 
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import com.google.protobuf.AbstractMessage.Builder;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -13,9 +12,9 @@ import org.slf4j.LoggerFactory;
 /**
  * https://stackoverflow.com/a/57216530/5126658
  */
-public class ProtoJsonMap {
+public class ProtoMapper {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ProtoJsonMap.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProtoMapper.class);
 
     public static String toJson(MessageOrBuilder messageOrBuilder) {
         try {