diff --git a/data-access/servlet/src/main/java/merge/amqp/JsonDecoder.java b/data-access/servlet/src/main/java/common/engine/amqp/JsonDecoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/merge/amqp/JsonDecoder.java
rename to data-access/servlet/src/main/java/common/engine/amqp/JsonDecoder.java
diff --git a/data-access/servlet/src/main/java/merge/amqp/JsonEncoder.java b/data-access/servlet/src/main/java/common/engine/amqp/JsonEncoder.java
similarity index 100%
rename from data-access/servlet/src/main/java/merge/amqp/JsonEncoder.java
rename to data-access/servlet/src/main/java/common/engine/amqp/JsonEncoder.java
diff --git a/data-access/servlet/src/main/java/merge/amqp/JsonEncoderMerge.java b/data-access/servlet/src/main/java/common/engine/amqp/JsonEncoderMerge.java
similarity index 100%
rename from data-access/servlet/src/main/java/merge/amqp/JsonEncoderMerge.java
rename to data-access/servlet/src/main/java/common/engine/amqp/JsonEncoderMerge.java
diff --git a/data-access/servlet/src/main/java/merge/amqp/RpcOverAmqp.java b/data-access/servlet/src/main/java/common/engine/amqp/RpcOverAmqp.java
similarity index 100%
rename from data-access/servlet/src/main/java/merge/amqp/RpcOverAmqp.java
rename to data-access/servlet/src/main/java/common/engine/amqp/RpcOverAmqp.java
diff --git a/data-access/servlet/src/main/java/common/cli/ExecCmd.java b/data-access/servlet/src/main/java/common/engine/cli/ExecCmd.java
similarity index 100%
rename from data-access/servlet/src/main/java/common/cli/ExecCmd.java
rename to data-access/servlet/src/main/java/common/engine/cli/ExecCmd.java