diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml
index 8f1f71b..c3fe427 100644
--- a/office-alexander-logistics-app/pom.xml
+++ b/office-alexander-logistics-app/pom.xml
@@ -263,19 +263,6 @@
compile
-
-
- org.imixs.workflow
- imixs-archive-documents
- compile
-
-
-
-
- org.imixs.workflow
- imixs-archive-importer
- compile
-
@@ -286,6 +273,16 @@
org.imixs.workflow
imixs-data-views
+
+ org.imixs.workflow
+ imixs-data-documents
+ compile
+
+
+ org.imixs.workflow
+ imixs-data-importer
+ compile
+
diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java
index 198069f..c338a3f 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLEAkteImportService.java
@@ -61,8 +61,6 @@ import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPSClient;
-import org.imixs.archive.importer.DocumentImportEvent;
-import org.imixs.archive.importer.DocumentImportService;
import org.imixs.workflow.FileData;
import org.imixs.workflow.ItemCollection;
import org.imixs.workflow.engine.DocumentService;
@@ -73,6 +71,8 @@ import org.imixs.workflow.exceptions.ModelException;
import org.imixs.workflow.exceptions.PluginException;
import org.imixs.workflow.exceptions.ProcessingErrorException;
import org.imixs.workflow.exceptions.QueryException;
+import org.imixs.workflow.importer.DocumentImportEvent;
+import org.imixs.workflow.importer.DocumentImportService;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java
index 3b02d3a..d6c6f53 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java
@@ -61,8 +61,6 @@ import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPSClient;
-import org.imixs.archive.importer.DocumentImportEvent;
-import org.imixs.archive.importer.DocumentImportService;
import org.imixs.workflow.FileData;
import org.imixs.workflow.ItemCollection;
import org.imixs.workflow.engine.DocumentService;
@@ -73,6 +71,8 @@ import org.imixs.workflow.exceptions.ModelException;
import org.imixs.workflow.exceptions.PluginException;
import org.imixs.workflow.exceptions.ProcessingErrorException;
import org.imixs.workflow.exceptions.QueryException;
+import org.imixs.workflow.importer.DocumentImportEvent;
+import org.imixs.workflow.importer.DocumentImportService;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java
index 070f175..7db555d 100644
--- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java
+++ b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPAuhtenticators.java
@@ -9,10 +9,10 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.eclipse.angus.mail.imap.IMAPFolder;
-import org.imixs.archive.importer.DocumentImportService;
-import org.imixs.archive.importer.mail.IMAPBasicAuthenticator;
-import org.imixs.archive.importer.mail.IMAPOutlookAuthenticator;
import org.imixs.workflow.ItemCollection;
+import org.imixs.workflow.importer.DocumentImportService;
+import org.imixs.workflow.importer.mail.IMAPBasicAuthenticator;
+import org.imixs.workflow.importer.mail.IMAPOutlookAuthenticator;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java
index 01fd2fe..7c94d10 100644
--- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java
+++ b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuth.java
@@ -20,7 +20,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicHeader;
import org.eclipse.angus.mail.imap.IMAPFolder;
-import org.imixs.archive.importer.mail.IMAPImportHelper;
+import org.imixs.workflow.importer.mail.IMAPImportHelper;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java
index 8b20918..22a34dd 100644
--- a/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java
+++ b/office-alexander-logistics-app/src/test/java/com/alexanderlogistics/TestIMAPOutlookOAuthDebug.java
@@ -30,7 +30,7 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicHeader;
-import org.imixs.archive.importer.mail.IMAPImportHelper;
+import org.imixs.workflow.importer.mail.IMAPImportHelper;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/pom.xml b/pom.xml
index 655eeea..a8ac839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,20 +263,7 @@
${org.imixs.archive.version}
provided
-
-
- org.imixs.workflow
- imixs-archive-documents
- ${org.imixs.archive.version}
- provided
-
-
-
- org.imixs.workflow
- imixs-archive-importer
- ${org.imixs.archive.version}
- compile
-
+
@@ -300,6 +287,19 @@
${org.imixs.data.version}
compile
+
+ org.imixs.workflow
+ imixs-data-documents
+ ${org.imixs.data.version}
+ provided
+
+
+ org.imixs.workflow
+ imixs-data-importer
+ ${org.imixs.data.version}
+ compile
+
+