diff --git a/core/src/main/java/info/kwarc/sally/comm/select/ObjectFactory.java b/OfficeBase/src/main/java/info/kwarc/sally/comm/select/ObjectFactory.java
similarity index 100%
rename from core/src/main/java/info/kwarc/sally/comm/select/ObjectFactory.java
rename to OfficeBase/src/main/java/info/kwarc/sally/comm/select/ObjectFactory.java
diff --git a/core/src/main/java/info/kwarc/sally/comm/select/Onsallyframe.java b/OfficeBase/src/main/java/info/kwarc/sally/comm/select/Onsallyframe.java
similarity index 100%
rename from core/src/main/java/info/kwarc/sally/comm/select/Onsallyframe.java
rename to OfficeBase/src/main/java/info/kwarc/sally/comm/select/Onsallyframe.java
diff --git a/core/src/main/java/info/kwarc/sally/comm/select/package-info.java b/OfficeBase/src/main/java/info/kwarc/sally/comm/select/package-info.java
similarity index 100%
rename from core/src/main/java/info/kwarc/sally/comm/select/package-info.java
rename to OfficeBase/src/main/java/info/kwarc/sally/comm/select/package-info.java
diff --git a/core/src/main/java/info/kwarc/sally/comm/spreadsheet/ObjectFactory.java b/OfficeBase/src/main/java/info/kwarc/sally/comm/spreadsheet/ObjectFactory.java
similarity index 100%
rename from core/src/main/java/info/kwarc/sally/comm/spreadsheet/ObjectFactory.java
rename to OfficeBase/src/main/java/info/kwarc/sally/comm/spreadsheet/ObjectFactory.java
diff --git a/core/src/main/java/info/kwarc/sally/comm/spreadsheet/Range.java b/OfficeBase/src/main/java/info/kwarc/sally/comm/spreadsheet/Range.java
similarity index 100%
rename from core/src/main/java/info/kwarc/sally/comm/spreadsheet/Range.java
rename to OfficeBase/src/main/java/info/kwarc/sally/comm/spreadsheet/Range.java
diff --git a/core/src/main/java/info/kwarc/sally/comm/spreadsheet/package-info.java b/OfficeBase/src/main/java/info/kwarc/sally/comm/spreadsheet/package-info.java
similarity index 100%
rename from core/src/main/java/info/kwarc/sally/comm/spreadsheet/package-info.java
rename to OfficeBase/src/main/java/info/kwarc/sally/comm/spreadsheet/package-info.java
diff --git a/OfficeBase/src/main/resources/mathhubworker.xsd b/OfficeBase/src/main/resources/mathhubworker.xsd
deleted file mode 100644
index 2f6b4d57192a4e1a89fff732351e92775240c91c..0000000000000000000000000000000000000000
--- a/OfficeBase/src/main/resources/mathhubworker.xsd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://kwarc.info/sally/comm/mathhubworker" elementFormDefault="qualified">
-
-</xs:schema>
\ No newline at end of file
diff --git a/core/src/main/resources/select.xsd b/OfficeBase/src/main/resources/select.xsd
similarity index 100%
rename from core/src/main/resources/select.xsd
rename to OfficeBase/src/main/resources/select.xsd
diff --git a/core/src/main/resources/spreadsheet.xsd b/OfficeBase/src/main/resources/spreadsheet.xsd
similarity index 100%
rename from core/src/main/resources/spreadsheet.xsd
rename to OfficeBase/src/main/resources/spreadsheet.xsd
diff --git a/docmanager/src/main/java/info/kwarc/sally4/docmanager/IDocWorkflow.java b/docmanager/src/main/java/info/kwarc/sally4/docmanager/IDocWorkflow.java
deleted file mode 100644
index a726369838da1f57422e459046667b1bf9e2011d..0000000000000000000000000000000000000000
--- a/docmanager/src/main/java/info/kwarc/sally4/docmanager/IDocWorkflow.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package info.kwarc.sally4.docmanager;
-
-
-public interface IDocWorkflow {
-	String [] getInterfaceRequirements();
-	String [] getHandlingNamespaces();
-	
-	IDocWorkflowInstance createDocumentInstance(SallyDoc route);
-}
diff --git a/docmanager/src/main/java/info/kwarc/sally4/docmanager/IDocWorkflowInstance.java b/docmanager/src/main/java/info/kwarc/sally4/docmanager/IDocWorkflowInstance.java
deleted file mode 100644
index 9891c09b94c35cc8b7551b5266d7557951ab8c56..0000000000000000000000000000000000000000
--- a/docmanager/src/main/java/info/kwarc/sally4/docmanager/IDocWorkflowInstance.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.kwarc.sally4.docmanager;
-
-import org.apache.camel.Exchange;
-
-public interface IDocWorkflowInstance {
-	boolean handleMessage(SallyDoc route, String namespace, String type, Exchange exchange);
-	SallyDoc getRoute();
-}
diff --git a/docmanager/src/main/java/info/kwarc/sally4/docmanager/SallyDoc.java b/docmanager/src/main/java/info/kwarc/sally4/docmanager/SallyDoc.java
index 54f39e0c1ec5342b03b2903b68cfc22f20796404..b63e63202b5d349ac540e914efd05e1a0e2caa88 100644
--- a/docmanager/src/main/java/info/kwarc/sally4/docmanager/SallyDoc.java
+++ b/docmanager/src/main/java/info/kwarc/sally4/docmanager/SallyDoc.java
@@ -4,7 +4,6 @@ import info.kwarc.sally4.components.ProducerConsumerSplitterComponent;
 import info.kwarc.sally4.processors.TypedCallback;
 import info.kwarc.sally4.processors.XMLMessageWithTypeInfo;
 
-
 public interface SallyDoc {
 	public String getDocStateQueue();
 	public String getDocQueue();
diff --git a/docmanager/src/main/java/info/kwarc/sally4/docmanager/mocks/MockAbstractWorkflow.java b/docmanager/src/main/java/info/kwarc/sally4/docmanager/mocks/MockAbstractWorkflow.java
deleted file mode 100644
index 7b6dc4f25ef18614a9f06f915d9cc3cf1e94196d..0000000000000000000000000000000000000000
--- a/docmanager/src/main/java/info/kwarc/sally4/docmanager/mocks/MockAbstractWorkflow.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.kwarc.sally4.docmanager.mocks;
-
-import info.kwarc.sally4.docmanager.SallyDoc;
-import info.kwarc.sally4.docmanager.IDocWorkflow;
-import info.kwarc.sally4.docmanager.IDocWorkflowInstance;
-
-
-public class MockAbstractWorkflow implements IDocWorkflow {
-	String [] ifaces;
-	String [] namespaces;
-	
-	public MockAbstractWorkflow(String [] ifaces, String [] namespaces) {
-		this.ifaces = ifaces;
-		this.namespaces = namespaces;
-	}
-	
-	@Override
-	public String[] getInterfaceRequirements() {
-		return ifaces;
-	}
-
-	@Override
-	public String[] getHandlingNamespaces() {
-		return namespaces;
-	}
-
-	@Override
-	public IDocWorkflowInstance createDocumentInstance(SallyDoc route) {
-		return null;
-	}
-
-}
diff --git a/docmanager/src/main/java/info/kwarc/sally4/docmanager/mocks/MockDocumentManager.java b/docmanager/src/main/java/info/kwarc/sally4/docmanager/mocks/MockDocumentManager.java
deleted file mode 100644
index b88de62182b3b4f9b401381195dd02b71595cdbb..0000000000000000000000000000000000000000
--- a/docmanager/src/main/java/info/kwarc/sally4/docmanager/mocks/MockDocumentManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.kwarc.sally4.docmanager.mocks;
-
-import info.kwarc.sally.comm.core.Registerdocument;
-import info.kwarc.sally.comm.core.Registerdocumentresponse;
-import info.kwarc.sally4.docmanager.DocumentManager;
-import info.kwarc.sally4.docmanager.IDocWorkflowInstance;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MockDocumentManager implements DocumentManager {
-
-	@Override
-	public Registerdocumentresponse  registerDocument(Registerdocument doc) {
-		return null;
-	}
-
-	public MockDocumentManager() {
-		instances = new ArrayList<IDocWorkflowInstance>();
-	}
-	
-	List<IDocWorkflowInstance> instances;
-	
-	public void addWorkflowInstances(IDocWorkflowInstance wi) {
-		instances.add(wi);
-	}
-
-}