diff --git a/.gitignore b/.gitignore
index fc3d4289c20b1aaecac5a8dfaebeb18733931bb8..73df13f5b32565e756e1ae92354445b648dea55a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ bin/
 *.log
 felix-cache
 .metadata
+pom.xml.versionsBackup
+.classpath
+.project
+.settings
\ No newline at end of file
diff --git a/.project b/.project
deleted file mode 100644
index fc9ea7644eaaca5d746cdc1a2ce1d62c47a95006..0000000000000000000000000000000000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sally4-features</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2389f85fe6381425d29f0a9866fb65..0000000000000000000000000000000000000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..26b4c49f8b48484d193c59518f98a7b55723c4c8
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>info.kwarc.sally4</groupId>
+    <artifactId>sally4</artifactId>
+    <version>0.0.6</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+   <artifactId>sally4-features</artifactId>
+   <packaging>pom</packaging>
+   <name>Sally4 Feature Collection</name>
+
+   <build>
+     <plugins>
+       <plugin>
+         <artifactId>maven-resources-plugin</artifactId>
+         <version>2.4.3</version>
+         <executions>
+           <execution>
+             <id>copy-resources</id>
+             <phase>validate</phase>
+             <goals>
+               <goal>copy-resources</goal>
+             </goals>
+             <configuration>
+               <outputDirectory>${basedir}/target</outputDirectory>
+               <resources>
+                 <resource>
+                   <directory>src/main/resources</directory>
+                   <filtering>true</filtering>
+                 </resource>
+               </resources>
+             </configuration>
+           </execution>
+         </executions>
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>build-helper-maven-plugin</artifactId>
+         <executions>
+           <execution>
+             <id>attach-artifacts</id>
+             <phase>package</phase>
+             <goals>
+               <goal>attach-artifact</goal>
+             </goals>
+             <configuration>
+               <artifacts>
+                 <artifact>
+                   <file>target/sally.features.xml</file>
+                   <type>xml</type>
+                   <classifier>features</classifier>
+                 </artifact>
+               </artifacts>
+             </configuration>
+           </execution>
+         </executions>
+       </plugin>
+     </plugins>
+   </build>
+</project>
\ No newline at end of file
diff --git a/sally.features.xml b/sally.features.xml
deleted file mode 100644
index 0af9c62b02a80ba73b7d3e80dbcac8c29ccdbdbb..0000000000000000000000000000000000000000
--- a/sally.features.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="sally">
-
- <feature name="scala" version="2.10.2_1">
-    <bundle start-level="50" start="false">mvn:org.scala-lang.virtualized/scala-reflect</bundle>
-    <bundle start-level="50" start="false">mvn:org.scala-lang.virtualized/scala-library</bundle>
-    <bundle start-level="50" start="false">mvn:org.scala-lang.virtualized/scala-compiler</bundle>
-  </feature>
-
-  <feature name="sally-docmanager" version="0.0.3">
-    <feature>scala</feature>
-    <feature>ipojo</feature>
-
-    <feature>camel-test</feature>
-    <feature>camel-jaxb</feature>
-    <feature>activemq-camel</feature>
-    <feature>camel-freemarker</feature>
-    <feature>camel-servlet</feature>
-    <feature>camel-sql</feature>
-    <feature>camel-jackson</feature>
-
-    <bundle>mvn:info.kwarc.sally4.comm/comm-core</bundle>
-    <bundle>mvn:info.kwarc.sally4/sally4-utils</bundle>
-    <bundle>mvn:info.kwarc.sally4/sally4-docmanager</bundle>
-    <bundle>mvn:info.kwarc.sally4/sally4-servlet</bundle>
-    <bundle>mvn:info.kwarc.sally4/sally4-activemq</bundle>
-  </feature>
-
-  <feature name="sally-mmt" version="1.0.1-alpha">
-    <bundle>mvn:info.kwarc.mmt/mmt-api</bundle>
-    <bundle>mvn:info.kwarc.mmt/planetary-mmt</bundle>
-    <bundle>mvn:info.kwarc.mmt/mmt-stex</bundle>
-    <bundle>mvn:info.kwarc.mmt/mmt-webEdit</bundle>
-    <bundle>mvn:info.kwarc.mmt/tiscaf</bundle>
-  </feature>
-
-  <feature name="sally-mhw" version="0.0.3">
-    <feature>sally-docmanager</feature>
-    <feature>sally-mmt</feature>
-    <feature>camel-solr</feature>
-    <bundle>mvn:info.kwarc.sally4.comm/comm-planetary</bundle>
-    <bundle>mvn:info.kwarc.sally4.comm/comm-search</bundle>
-    <bundle>mvn:info.kwarc.sally4/mhw-base</bundle>
-    <bundle>mvn:info.kwarc.sally4/mhw-lmh</bundle>
-    <bundle>mvn:info.kwarc.sally4/mhw-mmt</bundle>
-    <bundle>mvn:info.kwarc.sally4/planetary-base</bundle>
-    <bundle>mvn:info.kwarc.sally4/mhw-stexservices</bundle>
-  </feature>
-
-</features>
\ No newline at end of file
diff --git a/src/main/resources/sally.features.xml b/src/main/resources/sally.features.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5798290edcd4ba3e292d18a211a5b10037260e18
--- /dev/null
+++ b/src/main/resources/sally.features.xml
@@ -0,0 +1,82 @@
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="sally">
+
+  <feature name="scala" version="2.10.3">
+    <bundle start-level="50" start="false">mvn:org.scala-lang/scala-reflect/2.10.3</bundle>
+    <bundle start-level="50" start="false">mvn:org.scala-lang/scala-library/2.10.3</bundle>
+    <bundle start-level="50" start="false">mvn:org.scala-lang/scala-compiler/2.10.3</bundle>
+  </feature>
+
+  <feature name="sally-extdeps" version="0.0.6">
+    <!-- <feature>ipojo</feature> -->
+
+    <feature>camel-test</feature>
+    <feature>camel-jaxb</feature>
+    <feature>activemq-camel</feature>
+    <feature>camel-freemarker</feature>
+    <feature>camel-servlet</feature>
+    <feature>camel-sql</feature>
+    <feature>camel-jackson</feature>
+
+    <bundle>mvn:org.apache.felix/org.apache.felix.ipojo.handler.extender/1.4.0</bundle>
+    <bundle>mvn:org.apache.felix/org.apache.felix.ipojo/1.11.2</bundle>
+    <bundle>mvn:org.apache.felix/org.apache.felix.ipojo.webconsole/1.7.0</bundle>
+
+  </feature>
+
+  <feature name="sally-docmanager" version="0.0.6">
+    <feature>sally-extdeps</feature>
+
+    <bundle>mvn:info.kwarc.sally4.comm/comm-core/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/sally4-docmanager/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/sally4-utils/0.0.6</bundle>
+  </feature>
+
+  <feature name="sally-deepamehta" version="0.0.6">
+    <feature>sally-office</feature>
+    <bundle>mvn:info.kwarc.sally4.comm/comm-deepa/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/deepamehta-base/0.0.6</bundle>
+  </feature>
+
+  <feature name="sally-office" version="0.0.6">
+    <feature>sally-docmanager</feature>
+
+    <bundle>mvn:info.kwarc.sally4.comm/comm-annotation/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4.comm/comm-text/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/office-base/0.0.6</bundle>
+  </feature>
+
+  <feature name="sally-mmt" version="0.0.6">
+    <feature>scala</feature>
+    <bundle>mvn:info.kwarc.mmt/mmt-informal</bundle>
+    <bundle>mvn:info.kwarc.mmt/planetary-mmt</bundle>
+    <bundle>mvn:info.kwarc.mmt/mmt-stex</bundle>
+    <bundle>mvn:info.kwarc.mmt/mmt-webedit</bundle>
+    <bundle>mvn:info.kwarc.mmt/mmt-tiscaf</bundle>
+  </feature>
+
+  <feature name="sally-mmt-dev" version="0.0.6">
+    <feature>scala</feature>
+    <bundle>mvn:info.kwarc.mmt/mmt-informal/1.0.1</bundle>
+    <bundle>mvn:info.kwarc.mmt/planetary-mmt/1.0.1</bundle>
+    <bundle>mvn:info.kwarc.mmt/mmt-stex/1.0.1</bundle>
+    <bundle>mvn:info.kwarc.mmt/mmt-webedit/1.0.1</bundle>
+    <bundle>mvn:info.kwarc.mmt/mmt-tiscaf/1.0.1</bundle>
+  </feature>
+
+
+  <feature name="sally-mhw" version="0.0.6">
+    <feature>sally-docmanager</feature>
+    <feature>sally-mmt</feature>
+    <feature>camel-solr</feature>
+    <bundle>mvn:info.kwarc.sally4.comm/comm-text/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4.comm/comm-planetary/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4.comm/comm-search/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/mhw-base/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/text-base/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/mhw-lmh/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/mhw-mmt/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/planetary-base/0.0.6</bundle>
+    <bundle>mvn:info.kwarc.sally4/mhw-stexservices/0.0.6</bundle>
+  </feature>
+
+</features>
\ No newline at end of file