STANBOL-915: first version of the new Bundlelists and launchers

git-svn-id: https://svn.apache.org/repos/asf/stanbol/branches/new_bundlelists@1444025 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlelists/cmsadapter/pom.xml b/bundlelists/components/cmsadapter/pom.xml
similarity index 100%
rename from bundlelists/cmsadapter/pom.xml
rename to bundlelists/components/cmsadapter/pom.xml
diff --git a/bundlelists/cmsadapter/src/main/bundles/list.xml b/bundlelists/components/cmsadapter/src/main/bundles/list.xml
similarity index 92%
rename from bundlelists/cmsadapter/src/main/bundles/list.xml
rename to bundlelists/components/cmsadapter/src/main/bundles/list.xml
index 468e56b..371e697 100644
--- a/bundlelists/cmsadapter/src/main/bundles/list.xml
+++ b/bundlelists/components/cmsadapter/src/main/bundles/list.xml
@@ -17,6 +17,13 @@
 -->
 
 <bundles>
+  <startLevel level="25">
+    <bundle> <!-- the CMIS impl. uses the jersey-client -->
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>1.15</version>
+    </bundle>
+	</startLevel>
 	<startLevel level="33">
 		<!-- JCR Bundles -->
 		<bundle>
diff --git a/bundlelists/components/contenthub/pom.xml b/bundlelists/components/contenthub/pom.xml
new file mode 100755
index 0000000..f7ea039
--- /dev/null
+++ b/bundlelists/components/contenthub/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

+  license agreements. See the NOTICE file distributed with this work for additional 

+  information regarding copyright ownership. The ASF licenses this file to 

+  You under the Apache License, Version 2.0 (the "License"); you may not use 

+  this file except in compliance with the License. You may obtain a copy of 

+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

+  by applicable law or agreed to in writing, software distributed under the 

+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

+  OF ANY KIND, either express or implied. See the License for the specific 

+  language governing permissions and limitations under the License. -->

+<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>org.apache.stanbol</groupId>

+    <artifactId>apache-stanbol-bundlelists</artifactId>

+    <version>0.10.0-SNAPSHOT</version>

+    <relativePath>../..</relativePath>

+  </parent>

+  

+  <groupId>org.apache.stanbol</groupId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>

+  <version>0.11.0-SNAPSHOT</version>

+  <packaging>partialbundlelist</packaging>

+  

+  <name>Apache Stanbol Bundlelist for Contenthub</name>

+

+  <scm>

+    <connection>

+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/contenuhb

+    </connection>

+    <developerConnection>

+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/contenthub

+    </developerConnection>

+    <url>http://stanbol.apache.org/</url>

+  </scm>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.sling</groupId>

+        <artifactId>maven-launchpad-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>attach-bundle-list</id>

+            <goals>

+              <goal>attach-bundle-list</goal>

+            </goals>

+            <configuration>

+              <includeDefaultBundles>false</includeDefaultBundles>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+  <dependencies> <!-- NOTE: See also the list.xml for additional dependencies -->

+    <dependency> <!-- the Contenthub core -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.core</artifactId>

+      <version>0.11.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Support for related keyword search (requires Entityhub) -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.search.related</artifactId>

+      <version>0.11.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- The Contenthub RESTful API and Web UI -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.web</artifactId>

+      <version>0.11.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+  

+  </dependencies>

+</project>

+

diff --git a/bundlelists/components/contenthub/src/main/bundles/list.xml b/bundlelists/components/contenthub/src/main/bundles/list.xml
new file mode 100644
index 0000000..5121d72
--- /dev/null
+++ b/bundlelists/components/contenthub/src/main/bundles/list.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  You under the Apache License, Version 2.0 (the "License"); you may not use 
+  this file except in compliance with the License. You may obtain a copy of 
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+  by applicable law or agreed to in writing, software distributed under the 
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  OF ANY KIND, either express or implied. See the License for the specific 
+  language governing permissions and limitations under the License. -->
+
+<bundles>
+  <startLevel level="33">
+    <!-- no additional modules -->
+  </startLevel>
+</bundles>
diff --git a/bundlelists/components/enhancer/pom.xml b/bundlelists/components/enhancer/pom.xml
new file mode 100755
index 0000000..6e9606f
--- /dev/null
+++ b/bundlelists/components/enhancer/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

+  license agreements. See the NOTICE file distributed with this work for additional 

+  information regarding copyright ownership. The ASF licenses this file to 

+  You under the Apache License, Version 2.0 (the "License"); you may not use 

+  this file except in compliance with the License. You may obtain a copy of 

+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

+  by applicable law or agreed to in writing, software distributed under the 

+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

+  OF ANY KIND, either express or implied. See the License for the specific 

+  language governing permissions and limitations under the License. -->

+<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>org.apache.stanbol</groupId>

+    <artifactId>apache-stanbol-bundlelists</artifactId>

+    <version>0.10.0-SNAPSHOT</version>

+    <relativePath>../..</relativePath>

+  </parent>

+

+  <groupId>org.apache.stanbol</groupId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>

+  <version>0.11.0-SNAPSHOT</version>

+  <packaging>partialbundlelist</packaging>

+

+  <name>Apache Stanbol Bundlelist for Enhancer</name>

+

+  <scm>

+    <connection>

+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/enhancer

+    </connection>

+    <developerConnection>

+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/enhancer

+    </developerConnection>

+    <url>http://stanbol.apache.org/</url>

+  </scm>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.sling</groupId>

+        <artifactId>maven-launchpad-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>attach-bundle-list</id>

+            <goals>

+              <goal>attach-bundle-list</goal>

+            </goals>

+            <configuration>

+              <includeDefaultBundles>false</includeDefaultBundles>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+  

+  <dependencies> <!-- NOTE: See also the list.xml for additional dependencies -->

+    <dependency> <!-- the core modules -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>

+      <version>0.11.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- The JAX-RS and Web UI -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.benchmark</artifactId>

+      <version>0.11.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- The JAX-RS and Web UI -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.web</artifactId>

+      <version>0.11.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Enhancement Engines without major dependencies -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.nodep</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- HTML extractor Engine -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.htmlextract</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Apache Tika based Text and Metadata extraction-->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.tika</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- OpenNLP based Natural Language Processing -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.opennlp</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Basic language support for Chinese (based on Solr/Lucene) -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.solr.chinese</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Sentiment detection support -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.sentiment</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Support for Celi NLP, DBpedia Spotlight, OpenCalais, Zemanta -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.integratedservices</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+  </dependencies>

+</project>

+

diff --git a/bundlelists/components/enhancer/src/main/bundles/list.xml b/bundlelists/components/enhancer/src/main/bundles/list.xml
new file mode 100644
index 0000000..5497cb5
--- /dev/null
+++ b/bundlelists/components/enhancer/src/main/bundles/list.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+
+  <!-- Benchmarks for the Stanbol Enhancer -->
+  <startLevel level="31">
+  </startLevel>
+</bundles>
diff --git a/bundlelists/components/entityhub/pom.xml b/bundlelists/components/entityhub/pom.xml
new file mode 100755
index 0000000..be751f6
--- /dev/null
+++ b/bundlelists/components/entityhub/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  You under the Apache License, Version 2.0 (the "License"); you may not use 
+  this file except in compliance with the License. You may obtain a copy of 
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+  by applicable law or agreed to in writing, software distributed under the 
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  OF ANY KIND, either express or implied. See the License for the specific 
+  language governing permissions and limitations under the License. -->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+  
+  <name>Apache Stanbol Bundlelist for Entityhub Component</name>
+  <description>
+    This Bundlelist provides the default configuration for the Stanbol Entityhub
+    Component. It includes the core modules, the JAX-RS and Web UI as well as the
+    Clerezza and Solr based implementations.
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/entityhub
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/entityhub
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies> <!-- NOTE: See also the list.xml for additional dependencies -->
+    <dependency> <!-- the core modules -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The JAX-RS and Web UI -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- RDF based implementations using Apache Clerezza -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.clerezza</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Solr based storage support (SolrYard) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Stanbol Entityhub dependend EnhancementEngines (for the Stanbol Enhancer) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.entityhub</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
+</project>
+
diff --git a/bundlelists/components/entityhub/src/main/bundles/list.xml b/bundlelists/components/entityhub/src/main/bundles/list.xml
new file mode 100644
index 0000000..d94ca56
--- /dev/null
+++ b/bundlelists/components/entityhub/src/main/bundles/list.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- Currently no additional dependencies. See pom.xml file for dependend bundlelists -->
+  
+  <!-- Stanbol Entityhub infrastructure and required libraries-->
+  <startLevel level="30">
+
+  </startLevel>
+  
+  <!-- Web Fragment -->
+  <startLevel level="31">
+  </startLevel>
+  <!-- Default configuration for the Entityhub -->
+  <startLevel level="32">
+
+  </startLevel>
+</bundles>  
\ No newline at end of file
diff --git a/bundlelists/components/ontologymanager/pom.xml b/bundlelists/components/ontologymanager/pom.xml
new file mode 100755
index 0000000..9db3874
--- /dev/null
+++ b/bundlelists/components/ontologymanager/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

+  license agreements. See the NOTICE file distributed with this work for additional 

+  information regarding copyright ownership. The ASF licenses this file to 

+  You under the Apache License, Version 2.0 (the "License"); you may not use 

+  this file except in compliance with the License. You may obtain a copy of 

+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

+  by applicable law or agreed to in writing, software distributed under the 

+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

+  OF ANY KIND, either express or implied. See the License for the specific 

+  language governing permissions and limitations under the License. -->

+<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>org.apache.stanbol</groupId>

+    <artifactId>apache-stanbol-bundlelists</artifactId>

+    <version>0.10.0-SNAPSHOT</version>

+    <relativePath>../..</relativePath>

+  </parent>

+  

+  <groupId>org.apache.stanbol</groupId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>

+  <version>0.10.0-SNAPSHOT</version>

+  <packaging>partialbundlelist</packaging>

+  

+  <name>Apache Stanbol Bundlelist for Ontology Manager</name>

+

+  <scm>

+    <connection>

+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/enhancer

+    </connection>

+    <developerConnection>

+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/enhancer

+    </developerConnection>

+    <url>http://stanbol.apache.org/</url>

+  </scm>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.sling</groupId>

+        <artifactId>maven-launchpad-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>attach-bundle-list</id>

+            <goals>

+              <goal>attach-bundle-list</goal>

+            </goals>

+            <configuration>

+              <includeDefaultBundles>false</includeDefaultBundles>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+

+  <dependencies> <!-- NOTE: See also the list.xml for additional dependencies -->

+    <dependency> <!-- commons-owl api -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.owl</artifactId>

+      <version>0.12.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- used by the Registry -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.datafileprovider</artifactId>

+      <version>0.12.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- We need an Clerezza Storage provider for persisting Ontologies -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.core.clerezza.jenatdb</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+  </dependencies>

+</project>

+

diff --git a/bundlelists/ontologymanager/src/main/bundles/list.xml b/bundlelists/components/ontologymanager/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/ontologymanager/src/main/bundles/list.xml
rename to bundlelists/components/ontologymanager/src/main/bundles/list.xml
diff --git a/bundlelists/components/reasoners/pom.xml b/bundlelists/components/reasoners/pom.xml
new file mode 100755
index 0000000..1172ff8
--- /dev/null
+++ b/bundlelists/components/reasoners/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

+  license agreements. See the NOTICE file distributed with this work for additional 

+  information regarding copyright ownership. The ASF licenses this file to 

+  You under the Apache License, Version 2.0 (the "License"); you may not use 

+  this file except in compliance with the License. You may obtain a copy of 

+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

+  by applicable law or agreed to in writing, software distributed under the 

+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

+  OF ANY KIND, either express or implied. See the License for the specific 

+  language governing permissions and limitations under the License. -->

+<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>org.apache.stanbol</groupId>

+    <artifactId>stanbol-parent</artifactId>

+    <version>4-SNAPSHOT</version>

+    <relativePath>../../../parent</relativePath>

+  </parent>

+

+  <groupId>org.apache.stanbol</groupId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId>

+  <version>0.10.0-SNAPSHOT</version>

+  <packaging>partialbundlelist</packaging>

+  

+  <name>Apache Stanbol Bundlelist for Reasoners</name>

+  <scm>

+    <connection>

+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/reasoners

+    </connection>

+    <developerConnection>

+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/reasoners

+    </developerConnection>

+    <url>http://stanbol.apache.org/</url>

+  </scm>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.sling</groupId>

+        <artifactId>maven-launchpad-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>attach-bundle-list</id>

+            <goals>

+              <goal>attach-bundle-list</goal>

+            </goals>

+            <configuration>

+              <includeDefaultBundles>false</includeDefaultBundles>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+

+  <dependencies> <!-- NOTE: See also the list.xml for additional dependencies -->

+    <dependency> <!-- the commons OWL API modules -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.owl</artifactId>

+      <version>0.12.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Support for async. reasoning jobs-->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.jobs</artifactId>

+      <version>0.12.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Apache Jena Reasoning support-->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <!-- 

+     TODO The reasoner.web module depends on the Rules component! This should not

+     be the case!

+     -->

+    <dependency> 

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+  </dependencies>

+</project>

+

diff --git a/bundlelists/reasoners/src/main/bundles/list.xml b/bundlelists/components/reasoners/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/reasoners/src/main/bundles/list.xml
rename to bundlelists/components/reasoners/src/main/bundles/list.xml
diff --git a/bundlelists/security/pom.xml b/bundlelists/components/rules/pom.xml
old mode 100644
new mode 100755
similarity index 60%
copy from bundlelists/security/pom.xml
copy to bundlelists/components/rules/pom.xml
index cc7e7d5..b13e1d4
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/components/rules/pom.xml
@@ -1,65 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
-  </parent>
-
-  <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
-  <packaging>partialbundlelist</packaging>
-
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
-
-  <scm>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
-    </connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
-    </developerConnection>
-    <url>http://stanbol.apache.org/</url>
-  </scm>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>maven-launchpad-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-bundle-list</id>
-            <goals>
-              <goal>attach-bundle-list</goal>
-            </goals>
-            <configuration>
-              <includeDefaultBundles>false</includeDefaultBundles>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+      http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>org.apache.stanbol</groupId>

+    <artifactId>apache-stanbol-bundlelists</artifactId>

+    <version>0.10.0-SNAPSHOT</version>

+    <relativePath>../..</relativePath>

+  </parent>

+

+  <groupId>org.apache.stanbol</groupId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>

+  <version>0.10.0-SNAPSHOT</version>

+  <packaging>partialbundlelist</packaging>

+  

+  <name>Apache Stanbol Bundlelist for Rules</name>

+

+  <scm>

+    <connection>

+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/rules

+    </connection>

+    <developerConnection>

+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/rules

+    </developerConnection>

+    <url>http://stanbol.apache.org/</url>

+  </scm>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.sling</groupId>

+        <artifactId>maven-launchpad-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>attach-bundle-list</id>

+            <goals>

+              <goal>attach-bundle-list</goal>

+            </goals>

+            <configuration>

+              <includeDefaultBundles>false</includeDefaultBundles>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+

+  <dependencies> <!-- NOTE: See also the list.xml for additional dependencies -->

+    <dependency> <!-- The commons.owl API module -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.owl</artifactId>

+      <version>0.12.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Jena Rules & Clerezza Jena & IO (via Clerezza io bundlelist) -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.io</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+    <dependency> <!-- Clerezza SPARQL for SPARQL CONSTRUCT rules -->

+      <groupId>org.apache.stanbol</groupId>

+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.sparql</artifactId>

+      <version>0.10.0-SNAPSHOT</version>

+      <type>partialbundlelist</type>

+    </dependency>

+

+  </dependencies>

+

+</project>

diff --git a/bundlelists/rules/src/main/bundles/list.xml b/bundlelists/components/rules/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/rules/src/main/bundles/list.xml
rename to bundlelists/components/rules/src/main/bundles/list.xml
diff --git a/bundlelists/zzshell/pom.xml b/bundlelists/components/zzshell/pom.xml
similarity index 100%
rename from bundlelists/zzshell/pom.xml
rename to bundlelists/components/zzshell/pom.xml
diff --git a/bundlelists/zzshell/src/main/bundles/list.xml b/bundlelists/components/zzshell/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/zzshell/src/main/bundles/list.xml
rename to bundlelists/components/zzshell/src/main/bundles/list.xml
diff --git a/bundlelists/contenthub/pom.xml b/bundlelists/contenthub/pom.xml
deleted file mode 100755
index 71cffe5..0000000
--- a/bundlelists/contenthub/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

-  license agreements. See the NOTICE file distributed with this work for additional 

-  information regarding copyright ownership. The ASF licenses this file to 

-  You under the Apache License, Version 2.0 (the "License"); you may not use 

-  this file except in compliance with the License. You may obtain a copy of 

-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

-  by applicable law or agreed to in writing, software distributed under the 

-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

-  OF ANY KIND, either express or implied. See the License for the specific 

-  language governing permissions and limitations under the License. -->

-<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>org.apache.stanbol</groupId>

-    <artifactId>apache-stanbol-contenthub</artifactId>

-    <version>0.11.0-SNAPSHOT</version>

-    <relativePath>../../../contenthub</relativePath>

-  </parent>

-    

-  <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>

-  <packaging>partialbundlelist</packaging>

-  

-  <name>Apache Stanbol Bundlelist for Contenthub</name>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

-

diff --git a/bundlelists/contenthub/src/main/bundles/list.xml b/bundlelists/contenthub/src/main/bundles/list.xml
deleted file mode 100644
index 2d77969..0000000
--- a/bundlelists/contenthub/src/main/bundles/list.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  You under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
-
-<bundles>
-  <startLevel level="33">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.servicesapi</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.store.solr</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.search.solr
-      </artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.search.related
-      </artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.search.featured
-      </artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.web</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <!-- Moving CNN Crawler to demos/  
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.crawler.cnn</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-     -->
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.contenthub.ldpath</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-</bundles>
diff --git a/bundlelists/defaultdata/pom.xml b/bundlelists/data/data-default/pom.xml
similarity index 94%
rename from bundlelists/defaultdata/pom.xml
rename to bundlelists/data/data-default/pom.xml
index abfeb1b..d377a4d 100755
--- a/bundlelists/defaultdata/pom.xml
+++ b/bundlelists/data/data-default/pom.xml
@@ -22,7 +22,7 @@
   </parent>

 

   <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.data.default</artifactId>

   <version>1.1.0-SNAPSHOT</version>

   <packaging>partialbundlelist</packaging>

 

diff --git a/bundlelists/defaultdata/src/main/bundles/list.xml b/bundlelists/data/data-default/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/defaultdata/src/main/bundles/list.xml
rename to bundlelists/data/data-default/src/main/bundles/list.xml
diff --git a/bundlelists/opennlp/pom.xml b/bundlelists/data/data-opennlp/pom.xml
similarity index 95%
rename from bundlelists/opennlp/pom.xml
rename to bundlelists/data/data-opennlp/pom.xml
index 128855e..0224fba 100755
--- a/bundlelists/opennlp/pom.xml
+++ b/bundlelists/data/data-opennlp/pom.xml
@@ -22,7 +22,7 @@
   </parent>

 

   <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.opennlp</artifactId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.data.opennlp</artifactId>

   <version>1.1.0-SNAPSHOT</version>

   <packaging>partialbundlelist</packaging>

 

diff --git a/bundlelists/opennlp/src/main/bundles/list.xml b/bundlelists/data/data-opennlp/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/opennlp/src/main/bundles/list.xml
rename to bundlelists/data/data-opennlp/src/main/bundles/list.xml
diff --git a/bundlelists/sentimentdata/pom.xml b/bundlelists/data/data-sentiment/pom.xml
similarity index 95%
rename from bundlelists/sentimentdata/pom.xml
rename to bundlelists/data/data-sentiment/pom.xml
index 08d86b2..2cf1293 100755
--- a/bundlelists/sentimentdata/pom.xml
+++ b/bundlelists/data/data-sentiment/pom.xml
@@ -22,7 +22,7 @@
   </parent>

   

   <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.sentimentdata</artifactId>

+  <artifactId>org.apache.stanbol.launchers.bundlelists.data.sentiment</artifactId>

   <version>1.1.0-SNAPSHOT</version>

   <packaging>partialbundlelist</packaging>

 

diff --git a/bundlelists/sentimentdata/src/main/bundles/list.xml b/bundlelists/data/data-sentiment/src/main/bundles/list.xml
similarity index 100%
rename from bundlelists/sentimentdata/src/main/bundles/list.xml
rename to bundlelists/data/data-sentiment/src/main/bundles/list.xml
diff --git a/bundlelists/enhancer/pom.xml b/bundlelists/enhancer/pom.xml
deleted file mode 100755
index c0bf3fe..0000000
--- a/bundlelists/enhancer/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

-  license agreements. See the NOTICE file distributed with this work for additional 

-  information regarding copyright ownership. The ASF licenses this file to 

-  You under the Apache License, Version 2.0 (the "License"); you may not use 

-  this file except in compliance with the License. You may obtain a copy of 

-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

-  by applicable law or agreed to in writing, software distributed under the 

-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

-  OF ANY KIND, either express or implied. See the License for the specific 

-  language governing permissions and limitations under the License. -->

-<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>org.apache.stanbol</groupId>

-    <artifactId>apache-stanbol-enhancer</artifactId>

-    <version>0.11.0-SNAPSHOT</version>

-    <relativePath>../../../enhancer</relativePath>

-  </parent>

-

-  <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>

-  <packaging>partialbundlelist</packaging>

-

-  <name>Apache Stanbol Bundlelist for Enhancer</name>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

-

diff --git a/bundlelists/enhancer/src/main/bundles/list.xml b/bundlelists/enhancer/src/main/bundles/list.xml
deleted file mode 100644
index 7c8503d..0000000
--- a/bundlelists/enhancer/src/main/bundles/list.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<bundles>
-  <!-- ********************************************************************* 
-    start level 10 TO 19 reserved for required libraries (internal and external) 
-    ********************************************************************* -->
-
-  <!-- Apache Tika -->
-  <!-- Note: that Tika only inits the Parser correctly if the start level of
-       tika-core is lower than tika-bundle
-   -->  
-  <startLevel level="26">
-    <bundle> <!-- Apache Tika core (required by the LangId and TikaEngine) -->
-        <groupId>org.apache.tika</groupId>
-        <artifactId>tika-core</artifactId>
-        <version>1.2</version>
-    </bundle>
-  </startLevel>
-  <startLevel level="27">
-    <bundle> <!-- Apache Tika bundle (required by the TikaEngine) -->
-        <groupId>org.apache.tika</groupId>
-        <artifactId>tika-bundle</artifactId>
-        <version>1.2</version>
-    </bundle>
-  </startLevel>
-  <!-- Stanbol Enhancer infrastructure and required libraries -->
-  <startLevel level="30">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.core</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle> <!-- NLP processing (STANBOL-733) -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle> <!-- JSON serialization support for AnalyzedText (STANBOL-878) -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.nlp.json</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  <!-- LDPath -->
-  <startLevel level="30">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.ldpath</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  <!-- EnhancementJobManager implementations -->
-  <startLevel level="30">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.eventjobmanager</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  <!-- Enhancement Chain implementations -->
-  <startLevel level="30">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.chain.allactive</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.chain.graph</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.chain.weighted</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.chain.list</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  <!-- Web Fragment -->
-  <startLevel level="31">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.jersey</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-
-  <!-- Benchmarks for the Stanbol Enhancer -->
-  <startLevel level="31">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.benchmark</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-
-  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
-  <startLevel level="35">
-
-    <!-- language identification -->
-
-    <bundle> 
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.langdetect</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-
-	 <bundle> 
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.langid</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-
-    <bundle><!-- RESTful Language Identification engine -->
-      <groupId>org.apache.stanbol</groupId> <!-- see STANBOL-895 -->
-      <artifactId>org.apache.stanbol.enhancer.engines.restful.nlp</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-
-    <!-- Content conversion (2 engines)-->
-
-    <!-- Metaxa deactivated - STANBOL-510
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.metaxa</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    -->
-    
-    <bundle><!-- Apache Tika Engine -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.tika</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    
-    <!-- NLP processing engines (all STANBOL-733 and sub-tasks) -->
-    
-    <bundle><!-- sentence detection with OpenNLP -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.sentence</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- OpenNLP based tokenizing of Texts -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.token</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- POS tagging with OpenNLP -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.pos</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- Chunking tagging with OpenNLP -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.chunker</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle> <!-- Open NLP based NER -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- RESTful NLP Analysis engine -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.restful.nlp</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <!-- NLP metadata to RDF (using NIF 1.0) - NOT YET READY FOR DEFAULT CONFIG
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.nlp2rdf</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>  -->
-    <!-- Sentiment Enhancement Engines -->
-    <bundle><!-- Sentiment Word Classifiers -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.sentiment.wordclassifier</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <!-- NOT YET READY FOR DEFAULT CONFIG
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.sentiment.summarization</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle> -->
-    
-    <!-- Entity Extraction/Linking -->
-    <bundle><!-- NER linking (depends on the Entityhub) -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engine.entitytagging</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- Keyword Extraction from Text DEPRECATED! (depends on the Entityhub) -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engine.keywordextraction</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <!-- Stanbol EntityLinking -->
-    <bundle><!-- Engine -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.engine</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- OpenNLP LabelTokenizing support -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.opennlp</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- Lucene LabelTokenizing support -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle><!-- EntityLinking for the Stanbol Entityhub -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.entityhublinking</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-
-    <!-- Refactor Enhancement Engine -->
-
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.refactor</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-	
-	<!-- XMP Extractor engine -->
-	<bundle>
-		<groupId>org.apache.stanbol</groupId>
-		<artifactId>org.apache.stanbol.enhancer.engines.xmpextractor</artifactId>
-		<version>0.10.0-SNAPSHOT</version>
-	</bundle>
-
-    <!-- External Service Integration -->
-
-    <bundle> <!-- http://www.opencalais.com/ -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.opencalais</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle> <!-- http://www.zemanta.com/ -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    <bundle> <!-- http://www.geonames.org/ -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.geonames</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    
-    <bundle> <!-- http://linguagrid.org/ -->
-      <groupId>org.apache.stanbol</groupId>
-	  <artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-    
-     <!-- DBpedia Spotlight Engines (STANBOL-706) -->
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.dbpspotlight</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  
-  <!-- Default Configuration for the Stanbol Enhancer -->
-  
-  <startLevel level="36">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.defaults</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-</bundles>
diff --git a/bundlelists/entityhub/pom.xml b/bundlelists/entityhub/pom.xml
deleted file mode 100755
index a37a8dd..0000000
--- a/bundlelists/entityhub/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  You under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
-<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>org.apache.stanbol</groupId>
-    <artifactId>apache-stanbol-entityhub</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
-    <relativePath>../../../entityhub</relativePath>
-  </parent>
-
-  <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
-  <packaging>partialbundlelist</packaging>
-  
-  <name>Apache Stanbol Bundlelist for Entityhub</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>maven-launchpad-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-
diff --git a/bundlelists/language-extras/paoding/README.md b/bundlelists/language-extras/paoding/README.md
deleted file mode 100644
index 9c1619b..0000000
--- a/bundlelists/language-extras/paoding/README.md
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-Basic Chinese language support based on Paoding Analyzer
-==============
-
-This BundleList includes modules that allow to use the Paoding Analyzer to 
-
-* use Solr indexes that use the Paoding Analyzer in Field configurations
-* tokenize Chinese text with the Stanbol Enhancer
-* link Entities with Chinese labels with the EntityLinkingEngine
-
-It is highly recommended to use the Paoding bundle list in combination with the smartcn one as Paoding does not provide sentence detection.
-Because of that a typical EnhancementChain for Chinese should also include the 'smartcn-sentence' engine
-
-    :::text
-    langdetect
-    smartcn-sentence
-    paoding-token
-    {your-entitylinking}
-
-where '{your-entitylinking}' will typically be an [EntityhubLinkingEngine](http://stanbol.apache.org/docs/trunk/components/enhancer/engines/entityhublinking) engine configured for your vocabulary containing the Entities with Chinese labels.
-
-Please also note the comments in the [lists.xml](src/main/bundles/list.xml)
-
-Solr Configuration
----
-
-When you plan to use the Paoding Analyzer to process Chinese texts it is important to also properly configure the Solr schema.xml used by the Entityhub SolrYard. The DZone article [Indexing Chinese in Solr](http://java.dzone.com/articles/indexing-chinese-solr) by [Jason Hull](http://java.dzone.com/users/hullj) provides really great background information on that.
-
-When following those instructions keep in mind that the {working-dir} of the Stanbol Entityhub IndexingTool is that directory where you call '<code>java -jar …</code>' therefore if you configure the 'PAODING_DIC_HOME' the value will be relative to the {working-dir}.
-
-For the use of Paoding within Apache Stanbol the directory will be automatically initialized and be located in the persistent storage location of the <code>org.apache.stanbol:org.apache.stanbol.commons.solr.extras.paoding:0.10.0-SNAPSHOT</code> bundle.
-
-### Solr Field Configuration
-
-To use the Paoding Analyzer for Chinese literals a FieldType and a DynamicField configuration need to be added to the Solr schema.xml.
-
-
-1. the fieldType specification for Chinese
-
-    :::xml
-    <fieldType name="text_zh" class="solr.TextField">
-        <analyzer class="net.paoding.analysis.analyzer.PaodingAnalyzer"/>
-    </fieldType>
-
-2. A dynamic field using this field type that matches against Chinese language literals
-
-    :::xml
-    <!--
-     Dynamic field for Chinese languages.
-     -->
-    <dynamicField name="@zh*" type="text_zh" indexed="true" stored="true" multiValued="true" omitNorms="false"/>
-
-
-
-The [smartcn.solrindex.zip](https://svn.apache.org/repos/asf/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/smartcn.solrindex.zip) is identical with the default configuration but uses the above fieldType and dynamicField specification.
-
-### Usage with the EntityhubIndexing Tool
-
-1. Extract the [paoding.solrindex.zip](https://svn.apache.org/repos/asf/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/paoding.solrindex.zip) to the "indexing/config" directory.
-
-2. Copy the Paoding Bundle (<code>org.apache.stanbol:org.apache.stanbol.commons.solr.extras.paoding</code>) in the lib directory of the Solr Core configuration "indexing/config/paoding/lib". Solr includes all jar files within this directory in the Classpath. Because of that it will find the padding analyzer implementation during indexing.
-
-3. Rename the "indexing/config/paoding" directory to the {site-name} (the value of the "name" property of the "indexing/config/indexing.properties" file).
-
-    As an alternative to (2) you can also explicitly configure the name of the solr config as value to the "solrConf:smartcn" of SolrYardIndexingDestination.
-
-        :::text
-        indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,solrConf:smartcn,boosts:fieldboosts
-
-4. Copy the padding dictionary to '{paoding-dic-dir}'. You can obtain the dic from the original paoding projects [SVN repository](http://paoding.googlecode.com/svn/trunk/paoding-analysis/dic/). An [Zip archive](svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/language-extras/paoding/src/main/resources/paoding-dict.zip) with the dictionary is also included in the Paoding OSGI bundle part of Stanbol.
-
-5. Correctly parse the -DPAODING_DIC_HOME={paoding-dic-dir} when calling the Entityhub indexing tool. As alternative you can also set the 'PAODING_DIC_HOME' as system environment variable.
-
-
-### Usage with the Entityhub SolrYard
-
-If you want to create an empty SolrYard instance using the [paoding.solrindex.zip](https://svn.apache.org/repos/asf/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/paoding.solrindex.zip) configuration you will need to
-
-1. copy the paoding.solrindex.zip to the datafile directory of your Stanbol instance ({working-dir}/stanbol/datafiles)
-2. rename it to the {name} of the SolrYard you want to create. The file name needs to be {name}.solrindex.zip
-3. create the SolrYard instance and configure the "Solr Index/Core" (org.apache.stanbol.entityhub.yard.solr.solrUri) to {name}. Make sure the "Use default SolrCore configuration" (org.apache.stanbol.entityhub.yard.solr.useDefaultConfig) is disabled.
-
-If you want to use the paoding.solrindex.zip as default you can rename the file in the datafilee folder to "default.solrindex.zip" and the enable the "Use default SolrCore configuration" (org.apache.stanbol.entityhub.yard.solr.useDefaultConfig) when you configure a SolrYard instance.
-
-See also the documentation on how to [configure a managed site](http://stanbol.apache.org/docs/trunk/components/entityhub/managedsite#configuration-of-managedsites)).
diff --git a/bundlelists/language-extras/paoding/pom.xml b/bundlelists/language-extras/paoding/pom.xml
deleted file mode 100755
index 429377d..0000000
--- a/bundlelists/language-extras/paoding/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

-  license agreements. See the NOTICE file distributed with this work for additional 

-  information regarding copyright ownership. The ASF licenses this file to 

-  You under the Apache License, Version 2.0 (the "License"); you may not use 

-  this file except in compliance with the License. You may obtain a copy of 

-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

-  by applicable law or agreed to in writing, software distributed under the 

-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

-  OF ANY KIND, either express or implied. See the License for the specific 

-  language governing permissions and limitations under the License. -->

-<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>org.apache.stanbol</groupId>

-    <artifactId>stanbol-parent</artifactId>

-    <version>4-SNAPSHOT</version>

-    <relativePath>../../../../parent</relativePath>

-  </parent>

-

-  <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.paoding</artifactId>

-  <version>0.10.0-SNAPSHOT</version>

-  <packaging>partialbundlelist</packaging>

-

-  <name>Apache Stanbol Bundlelist for Language Support: Paoding Chinese</name>

-    <description>

-      Provides modules that allow basic language support for Chinese using

-      the Solr/Lucene Paoding analyzer. This includes a (1) Bundle providing the

-      Solr Analyzer; (2) an NLP processing Engine that tokenizes Chinese Text and 

-      (3) an LabelTokenizer needed to match tokens of the analyzed text with the 

-      labels of Entities in the matched vocabularies.

-    </description>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

diff --git a/bundlelists/language-extras/paoding/src/main/bundles/list.xml b/bundlelists/language-extras/paoding/src/main/bundles/list.xml
deleted file mode 100644
index 587cbeb..0000000
--- a/bundlelists/language-extras/paoding/src/main/bundles/list.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<bundles>
-  <!-- 
-   The paoding analyzer bundle (extension to o.a.s.commons.solr.core module)
-   -->
-  <startLevel level="28"> <!-- commons.solr.core uses startlevel 27 -->
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.commons.solr.extras.paoding</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  
-  <!--
-   The Chinese sentence detection and tokenizer EnhancementEngine based on
-   smartcn
-   -->
-  <startLevel level="35"> <!-- same startlevel as other Enhancement Engines -->
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.paoding.token</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-
-  <!--
-   The Chinese LabelTokenizer required by the EntityLinkingEngine to compare
-   Tokens in the AnalyzedText with Labels of the Entities found in the
-   Controlled vocabulary.
-   -->
-  <!-- 
-   startlevel needs to be greater as those of the EntityLinkingEngine
-   (o.a.s.enhancer.engines.entitylinking.engine) module
-   -->
-  <startLevel level="36">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.paoding</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  
-</bundles>
\ No newline at end of file
diff --git a/bundlelists/language-extras/smartcn/README.md b/bundlelists/language-extras/smartcn/README.md
deleted file mode 100644
index 43329a9..0000000
--- a/bundlelists/language-extras/smartcn/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-Basic Chinese language support based on Lucene Smartcn Analyzer
-==============
-
-This BundleList includes three modules that bring basic language support for Chinese to Apache Stanbol.
-
-See comments in the [lists.xml](src/main/bundles/list.xml) for more details.
-
-Solr Field Configuration
----
-
-When you plan to use the Smartcn Analyzer to process Chinese texts it is important to also properly configure the Solr schema.xml used by the Entityhub SolrYard.
-
-For that you will need to add two things:
-
-1. A fieldType specification for Chinese
-
-    :::xml
-    <fieldType name="text_zh" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.SmartChineseSentenceTokenizerFactory"/>
-        <filter class="solr.SmartChineseWordTokenFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.SmartChineseSentenceTokenizerFactory"/>
-        <filter class="solr.SmartChineseWordTokenFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-        <filter class="solr.PositionFilterFactory" />
-      </analyzer>
-    </fieldType> 
-
-2. A dynamic field using this field type that matches against Chinese language literals
-
-    :::xml
-    <!--
-     Dynamic field for Chinese languages.
-     -->
-    <dynamicField name="@zh*" type="text_zh" indexed="true" stored="true" multiValued="true" omitNorms="false"/>
-
-The [smartcn.solrindex.zip](https://svn.apache.org/repos/asf/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/smartcn.solrindex.zip) is identical with the default configuration but uses the above fieldType and dynamicField specification.
-
-### Usage with the EntityhubIndexing Tool
-
-1. Extract the [smartcn.solrindex.zip](https://svn.apache.org/repos/asf/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/smartcn.solrindex.zip) to the "indexing/config" directory 
-2. Rename the "indexing/config/smartcn" directory to the {site-name} (the value of the "name" property of the "indexing/config/indexing.properties" file).
-
-As an alternative to (2) you can also explicitly configure the name of the solr config as value to the "solrConf:smartcn" of SolrYardIndexingDestination.
-
-    :::text
-    indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,solrConf:smartcn,boosts:fieldboosts
-
-### Usage with the Entityhub SolrYard
-
-If you want to create an empty SolrYard instance using the [smartcn.solrindex.zip](https://svn.apache.org/repos/asf/stanbol/trunk/entityhub/yard/solr/src/main/resources/solr/core/smartcn.solrindex.zip) configuration you will need to
-
-1. copy the smartcn.solrindex.zip to the datafile directory of your Stanbol instance ({working-dir}/stanbol/datafiles)
-2. rename it to the {name} of the SolrYard you want to create. The file name needs to be {name}.solrindex.zip
-3. create the SolrYard instance and configure the "Solr Index/Core" (org.apache.stanbol.entityhub.yard.solr.solrUri) to {name}. Make sure the "Use default SolrCore configuration" (org.apache.stanbol.entityhub.yard.solr.useDefaultConfig) is disabled.
-
-If you want to use the smartcn.solrindex.zip as default you can rename the file in the datafilee folder to "default.solrindex.zip" and the enable the "Use default SolrCore configuration" (org.apache.stanbol.entityhub.yard.solr.useDefaultConfig) when you configure a SolrYard instance.
-
-See also the documentation on how to [configure a managed site](http://stanbol.apache.org/docs/trunk/components/entityhub/managedsite#configuration-of-managedsites)).
diff --git a/bundlelists/language-extras/smartcn/pom.xml b/bundlelists/language-extras/smartcn/pom.xml
deleted file mode 100755
index 42000f9..0000000
--- a/bundlelists/language-extras/smartcn/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

-  license agreements. See the NOTICE file distributed with this work for additional 

-  information regarding copyright ownership. The ASF licenses this file to 

-  You under the Apache License, Version 2.0 (the "License"); you may not use 

-  this file except in compliance with the License. You may obtain a copy of 

-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

-  by applicable law or agreed to in writing, software distributed under the 

-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

-  OF ANY KIND, either express or implied. See the License for the specific 

-  language governing permissions and limitations under the License. -->

-<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>org.apache.stanbol</groupId>

-    <artifactId>stanbol-parent</artifactId>

-    <version>4-SNAPSHOT</version>

-    <relativePath>../../../../parent</relativePath>

-  </parent>

-

-  <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.smartcn</artifactId>

-  <version>0.10.0-SNAPSHOT</version>

-  <packaging>partialbundlelist</packaging>

-

-  <name>Apache Stanbol Bundlelist for Language Support: Smart Chinese</name>

-    <description>

-      Provides modules that allow basic language support for Chinese using

-      the Solr/Lucene smartcn analyzer. This includes a (1) Bundle providing the

-      Solr Analyzer; (2) an NLP processing Engine that detects Sentences and

-      Tokenizes Chinese Text and (3) an LabelTokenizer needed to match tokens of

-      the analyzed text with the labels of Entities in the matched vocabularies.

-    </description>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

diff --git a/bundlelists/language-extras/smartcn/src/main/bundles/list.xml b/bundlelists/language-extras/smartcn/src/main/bundles/list.xml
deleted file mode 100644
index 0533ca3..0000000
--- a/bundlelists/language-extras/smartcn/src/main/bundles/list.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<bundles>
-  <!-- 
-   The smartcn analyzer bundle (extension to o.a.s.commons.solr.core module)
-   -->
-  <startLevel level="28"> <!-- commons.solr.core uses startlevel 27 -->
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.commons.solr.extras.smartcn</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  
-  <!--
-   The Chinese sentence detection and tokenizer EnhancementEngine based on
-   smartcn
-   -->
-  <startLevel level="35"> <!-- same startlevel as other Enhancement Engines -->
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.smartcn.token</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-
-  <!--
-   The Chinese LabelTokenizer required by the EntityLinkingEngine to compare
-   Tokens in the AnalyzedText with Labels of the Entities found in the
-   Controlled vocabulary.
-   -->
-  <!-- 
-   startlevel needs to be greater as those of the EntityLinkingEngine
-   (o.a.s.enhancer.engines.entitylinking.engine) module
-   -->
-  <startLevel level="36">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.smartcn</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>
-  
-</bundles>
\ No newline at end of file
diff --git a/bundlelists/osgiframework/pom.xml b/bundlelists/modules/commons-datafileprovider/pom.xml
similarity index 71%
copy from bundlelists/osgiframework/pom.xml
copy to bundlelists/modules/commons-datafileprovider/pom.xml
index 7155c0a..fb33fb4 100644
--- a/bundlelists/osgiframework/pom.xml
+++ b/bundlelists/modules/commons-datafileprovider/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.datafileprovider</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for the OSGi Framework</name>
-  <description>This is a Maven project which produces the partial list containing the OSGi framework bundles</description>
+  <name>Apache Stanbol Bundlelist for the Stanbol DataFileProvider Service</name>
+  <description>provides the DataFilePRovider and DataFileTracker service</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-datafileprovider
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-datafileprovider
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-datafileprovider/src/main/bundles/list.xml b/bundlelists/modules/commons-datafileprovider/src/main/bundles/list.xml
new file mode 100644
index 0000000..74ff512
--- /dev/null
+++ b/bundlelists/modules/commons-datafileprovider/src/main/bundles/list.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *************************************************************************
+   Datafile Provider Service
+   *************************************************************************
+   -->
+  <startLevel level="27">
+    <!-- DataFileProvider and implementations -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider
+      </artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle
+      </artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-jobs/pom.xml
similarity index 64%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-jobs/pom.xml
index cc7e7d5..40de866 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-jobs/pom.xml
@@ -20,25 +20,28 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.jobs</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for commons job API</name>
+  <description>
+    This BUndlelist provides the commons Jobs API providing a RESTful service
+    allowing to use asncronouse Jobs.
+  </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-jobs
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-jobs
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +65,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency> <!-- required for the JAX-RS and Web UI -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-jobs/src/main/bundles/list.xml b/bundlelists/modules/commons-jobs/src/main/bundles/list.xml
new file mode 100644
index 0000000..b7ae8ee
--- /dev/null
+++ b/bundlelists/modules/commons-jobs/src/main/bundles/list.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- Support for Jobs -->
+  <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-ldpath/pom.xml
similarity index 64%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-ldpath/pom.xml
index cc7e7d5..6d7461f 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-ldpath/pom.xml
@@ -20,25 +20,26 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.ldpath</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for ldpath</name>
+  <description>This BUndlelist provides the ldpath core libraries as well as the
+  Clerezza based LDpath Backend implementation</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-ldpath
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-ldpath
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +63,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for the clerezza implementation -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-ldpath/src/main/bundles/list.xml b/bundlelists/modules/commons-ldpath/src/main/bundles/list.xml
new file mode 100644
index 0000000..624ed39
--- /dev/null
+++ b/bundlelists/modules/commons-ldpath/src/main/bundles/list.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- LD Path -->
+  <startLevel level="27">
+    <bundle> 
+      <groupId>at.newmedialab.ldpath</groupId>
+      <artifactId>ldpath-api</artifactId>
+      <version>0.9.5</version>
+    </bundle>
+    <bundle>
+      <groupId>at.newmedialab.ldpath</groupId>
+      <artifactId>ldpath-core-bundle</artifactId>
+      <version>0.9.5</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-nsprefix/pom.xml
similarity index 72%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-nsprefix/pom.xml
index cc7e7d5..0f21578 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-nsprefix/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.nsprefix</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for OpenNLP</name>
+  <description>This BUndlelist provides the Stanbol Commons OpenNLP service</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-nsprefix
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-nsprefix
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-nsprefix/src/main/bundles/list.xml b/bundlelists/modules/commons-nsprefix/src/main/bundles/list.xml
new file mode 100644
index 0000000..3164c30
--- /dev/null
+++ b/bundlelists/modules/commons-nsprefix/src/main/bundles/list.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- Namespace prefix service -->
+    <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.namespaceprefix.service</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- Provides the Stanbol specific Prefix Mappings: Backward compatibility -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- Provides the namespace prefixes managed by http://prefix.cc -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.namespaceprefix.provider.prefixcc</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-opennlp/pom.xml
similarity index 65%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-opennlp/pom.xml
index cc7e7d5..285aecd 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-opennlp/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.opennlp</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for OpenNLP</name>
+  <description>This BUndlelist provides the Stanbol Commons OpenNLP service</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-opennlp
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-opennlp
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for loading OpenNLP models via the datafileprovider service -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.datafileprovider</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-opennlp/src/main/bundles/list.xml b/bundlelists/modules/commons-opennlp/src/main/bundles/list.xml
new file mode 100644
index 0000000..9c719cf
--- /dev/null
+++ b/bundlelists/modules/commons-opennlp/src/main/bundles/list.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- OpenNLP as bundle + utilities -->
+  <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.opennlp</groupId>
+      <artifactId>opennlp-maxent</artifactId>
+      <version>3.0.2-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.opennlp</groupId>
+      <artifactId>opennlp-tools</artifactId>
+      <version>1.5.2-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/modules/commons-owl/pom.xml b/bundlelists/modules/commons-owl/pom.xml
new file mode 100644
index 0000000..56f26b1
--- /dev/null
+++ b/bundlelists/modules/commons-owl/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.owl</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for working with OWL Ontologies</name>
+  <description>Provides the OWL API and RESTful Services used to work with OWL ontologies</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-owl
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-owl
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency> <!-- For IO of RDF -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.io</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Provides the Jena and ARQ dependencies -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- required for the RESTful API and Web UI -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/commons-owl/src/main/bundles/list.xml b/bundlelists/modules/commons-owl/src/main/bundles/list.xml
new file mode 100644
index 0000000..a85a57e
--- /dev/null
+++ b/bundlelists/modules/commons-owl/src/main/bundles/list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *************************************************************************
+   The commons-owl module (see also the dependencies in the pom.xml file)
+   *************************************************************************
+   -->
+  <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.owl</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-security/pom.xml
similarity index 63%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-security/pom.xml
index cc7e7d5..dc56f29 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-security/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.security</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Security Support</name>
+  <description>This Bundlelist provides the Stanbol Commons Security service</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-security
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-security
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency> <!-- Stanbol security uses the clerezza plattform configuration -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.plattform</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Stanbol security uses the Felix Webconsole for the config UI-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.webconsole</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/security/src/main/bundles/list.xml b/bundlelists/modules/commons-security/src/main/bundles/list.xml
similarity index 60%
rename from bundlelists/security/src/main/bundles/list.xml
rename to bundlelists/modules/commons-security/src/main/bundles/list.xml
index a2b34d8..f21530a 100644
--- a/bundlelists/security/src/main/bundles/list.xml
+++ b/bundlelists/modules/commons-security/src/main/bundles/list.xml
@@ -16,24 +16,9 @@
   limitations under the License.
 -->
 <bundles>
-  <!-- authentication -->
+  <!-- Stanbol Security bundles -->
   <startLevel level="27">
     <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>platform.config</artifactId>
-      <version>0.3-incubating</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>permissiondescriptions</artifactId>
-      <version>0.1-incubating</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.clerezza</groupId>
-      <artifactId>platform</artifactId>
-      <version>0.1-incubating</version>
-    </bundle>
-    <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.commons.security.core</artifactId>
       <version>0.12.0-SNAPSHOT</version>
@@ -44,14 +29,15 @@
       <version>0.12.0-SNAPSHOT</version>
     </bundle>
     <bundle>
-        <groupId>org.apache.stanbol</groupId>
-        <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
     </bundle>
     <bundle>
-        <groupId>org.apache.stanbol</groupId>
-        <artifactId>org.apache.stanbol.commons.security.usermanagement</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.security.usermanagement</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
     </bundle>
   </startLevel>
-</bundles>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-solr/pom.xml
similarity index 65%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-solr/pom.xml
index cc7e7d5..0f35c30 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-solr/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.solr</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Commons Solr</name>
+  <description>This includes the commons Solr modules as well as Lucene/Solr.</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-solr
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-solr
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,20 @@
       </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for the managed solr server-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.datafileprovider</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/commons-solr/src/main/bundles/list.xml b/bundlelists/modules/commons-solr/src/main/bundles/list.xml
new file mode 100644
index 0000000..999c936
--- /dev/null
+++ b/bundlelists/modules/commons-solr/src/main/bundles/list.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+
+  <!-- ********************************************************************* 
+    start level 10 TO 19 reserved for required libraries (internal and external) 
+    ********************************************************************* -->
+  <!-- General-purpose libraries -->
+  <startLevel level="20">
+    <bundle> <!-- commons-beanutils as bundle provided by servicemix.apache.org -->
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+      <version>1.8.3_1</version>
+    </bundle>
+    <bundle> <!-- woodstox Stax impl as bundle provided by servicemix.apache.org -->
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+      <version>3.2.9_3</version>
+    </bundle>
+    <bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org -->
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.regexp</artifactId>
+      <version>1.3_3</version>
+    </bundle>
+  </startLevel>
+  
+  <!-- Apache Solr as bundle + utilities -->
+  <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
+      <version>0.11.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
+      <version>0.11.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.install</artifactId>
+      <version>0.11.0</version>
+    </bundle>
+  </startLevel>
+  <startLevel level="28">
+    <bundle> <!-- defualt config for Solr -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.defaults</artifactId>
+      <version>0.11.0</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-web-ldpath/pom.xml
similarity index 65%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-web-ldpath/pom.xml
index cc7e7d5..f122cd6 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-web-ldpath/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web.ldpath</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for ldpath</name>
+  <description>This BUndlelist provides the ldpath extension to JAX-RS and Freemaker</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web-ldpath
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web-ldpath
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Ldpath dependency and Clerezza based impl. -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.ldpath</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-web-ldpath/src/main/bundles/list.xml b/bundlelists/modules/commons-web-ldpath/src/main/bundles/list.xml
new file mode 100644
index 0000000..9294ceb
--- /dev/null
+++ b/bundlelists/modules/commons-web-ldpath/src/main/bundles/list.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- LD Path -->
+  <startLevel level="27">
+	  <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+	  <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.viewable.ldpath</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-web-solr/pom.xml
similarity index 64%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-web-solr/pom.xml
index cc7e7d5..f2bead1 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-web-solr/pom.xml
@@ -20,25 +20,28 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web.solr</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for ldpath</name>
+  <description>
+    This Bundlelist provides the integration of the Solr RESTful services in the
+    Stanbol JAX-RS and Web UI
+  </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web-solr
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web-solr
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +65,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for the clerezza implementation -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-web-solr/src/main/bundles/list.xml b/bundlelists/modules/commons-web-solr/src/main/bundles/list.xml
new file mode 100644
index 0000000..8577961
--- /dev/null
+++ b/bundlelists/modules/commons-web-solr/src/main/bundles/list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- LD Path -->
+  <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.web</artifactId>
+      <version>0.11.0</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/commons-web-sparql/pom.xml
similarity index 65%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/commons-web-sparql/pom.xml
index cc7e7d5..6d93808 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/commons-web-sparql/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web.sparql</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for the Stanbol SPARQL endpoint</name>
+  <description>This Bundlelist provides the '/sparql' endpoint</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web-sparql
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web-sparql
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- rwequires the Clerezza SPARQL implementation -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.sparql</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-web-sparql/src/main/bundles/list.xml b/bundlelists/modules/commons-web-sparql/src/main/bundles/list.xml
new file mode 100644
index 0000000..32119e7
--- /dev/null
+++ b/bundlelists/modules/commons-web-sparql/src/main/bundles/list.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- LD Path -->
+  <startLevel level="27">
+	  <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+	  <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/osgiframework/pom.xml b/bundlelists/modules/commons-web/pom.xml
similarity index 65%
copy from bundlelists/osgiframework/pom.xml
copy to bundlelists/modules/commons-web/pom.xml
index 7155c0a..e3bd5f8 100644
--- a/bundlelists/osgiframework/pom.xml
+++ b/bundlelists/modules/commons-web/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for the OSGi Framework</name>
-  <description>This is a Maven project which produces the partial list containing the OSGi framework bundles</description>
+  <name>Apache Stanbol Bundlelist adding the JAX-RS and Web bundles to the Core Runtime</name>
+  <description>Provides the Modules required for the JAX-RS and Web UI</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/commons-web
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,20 @@
       </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for serializing and parsing RDF -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.io</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/commons-web/src/main/bundles/list.xml b/bundlelists/modules/commons-web/src/main/bundles/list.xml
new file mode 100644
index 0000000..ce99a36
--- /dev/null
+++ b/bundlelists/modules/commons-web/src/main/bundles/list.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- 
+   *************************************************************************
+   HTTP service and Http related Utilities 
+   ************************************************************************* 
+   -->
+  <startLevel level="5">
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.http.whiteboard</artifactId>
+      <version>2.2.0</version>
+    </bundle>
+  </startLevel>
+  <startLevel level="6">
+    <!-- Allows to parse Http Headers as QueryParameter -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.httpqueryheaders</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+  <!--
+   *************************************************************************
+   Jersey as JAX-RS framework
+   *************************************************************************
+   -->
+  <startLevel level="24">
+    <!-- NOTE: jersey-core bug, must start before jersey-server to avoid
+     jersey spi class not found errors. Restart jersey-server manually if getting
+     those. -->
+    <bundle>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>1.15</version>
+    </bundle>
+  </startLevel>
+  <startLevel level="25">
+    <bundle>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>1.15</version>
+    </bundle>
+    <bundle>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-servlet</artifactId>
+      <version>1.15</version>
+    </bundle>
+    <!-- needed to read data from mime multipart requests -->
+    <bundle>
+      <groupId>com.sun.jersey.contribs</groupId>
+      <artifactId>jersey-multipart</artifactId>
+      <version>1.15</version>
+    </bundle>
+    <!-- dependency of jersey-multipart -->
+    <bundle>
+      <groupId>org.jvnet</groupId>
+      <artifactId>mimepull</artifactId>
+      <version>1.4</version>
+    </bundle>
+  </startLevel>
+  
+  <!--
+   *************************************************************************
+   Stanbol JAX-RS and Web interface modules
+   *************************************************************************
+   -->
+  <startLevel level="27">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.resources</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.base.jersey</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.home</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+</startLevel>
+
+
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/modules/contenthub-core/pom.xml b/bundlelists/modules/contenthub-core/pom.xml
new file mode 100644
index 0000000..6a891a8
--- /dev/null
+++ b/bundlelists/modules/contenthub-core/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.core</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Contenthub Core Modules</name>
+  <description>
+    This Bundlelist provides the core modules for the Stanbol Contenthub including
+    the api, the Apache Solr/Lucene based implemetnations and the Featured Search
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/contenthub-core
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/contenthub-core
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <!-- 
+     The Contenthub depends on the Enhancer core, Commons LDpath as well as
+     the Enhancer LDpath. This dependencies includes all three
+     -->
+    <dependency> 
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.ldpath</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Solr is used for indexing and faceted Search -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/contenthub-core/src/main/bundles/list.xml b/bundlelists/modules/contenthub-core/src/main/bundles/list.xml
new file mode 100644
index 0000000..654d0fc
--- /dev/null
+++ b/bundlelists/modules/contenthub-core/src/main/bundles/list.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Stanbol Contenthub Core modules
+    ********************************************************************* -->
+
+  <startLevel level="33">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.servicesapi</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.store.solr</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.ldpath</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <!-- Contenthub Solr Search -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.search.solr
+      </artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <!-- Contenthub Featured Search -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.search.featured
+      </artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
diff --git a/bundlelists/modules/contenthub-search-related/pom.xml b/bundlelists/modules/contenthub-search-related/pom.xml
new file mode 100644
index 0000000..d96a67f
--- /dev/null
+++ b/bundlelists/modules/contenthub-search-related/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.search.related</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Contenthub Releated Keyword Search</name>
+  <description>
+    This Bundlelist provides the related keyword search extension for the contenthub.
+    It can be used to use the Stanbol Entityhub or Ontologies to search for related
+    keywords to the one parsed in an search query (some kind of Query contextualization)
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/contenthub-search-releated
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/contenthub-search-releated
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency> <!-- the Contenthub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Entityhub is used for searching related keywords -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/contenthub-search-related/src/main/bundles/list.xml b/bundlelists/modules/contenthub-search-related/src/main/bundles/list.xml
new file mode 100644
index 0000000..d7cb5de
--- /dev/null
+++ b/bundlelists/modules/contenthub-search-related/src/main/bundles/list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Stanbol Contenthub Search Releated modules
+    ********************************************************************* -->
+
+  <startLevel level="33">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.search.related
+      </artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/contenthub-web/pom.xml
similarity index 63%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/contenthub-web/pom.xml
index cc7e7d5..114c9e7 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/contenthub-web/pom.xml
@@ -20,25 +20,27 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.web</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Contenthub JAX-RS and Web UI</name>
+  <description>
+    This prvides the RESTful services as well as the Web UI for the Contenthub
+  </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/contenthub-web
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/contenthub-web
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +64,21 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency> <!-- the Contenthub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    
+     <!-- The dependency to the Entityhub will be removed -->
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/contenthub-web/src/main/bundles/list.xml b/bundlelists/modules/contenthub-web/src/main/bundles/list.xml
new file mode 100644
index 0000000..2894a68
--- /dev/null
+++ b/bundlelists/modules/contenthub-web/src/main/bundles/list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Contenthub Web module
+    ********************************************************************* -->
+
+  <startLevel level="33">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.contenthub.web</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-clerezza-io/pom.xml
similarity index 67%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-clerezza-io/pom.xml
index cc7e7d5..607b606 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-clerezza-io/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.io</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for the core Clerezza libraries</name>
+  <description>This includes just the core Clerezza Libraries (no SPRAQL and Serializer)</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-io
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-io
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-clerezza-io/src/main/bundles/list.xml b/bundlelists/modules/dep-clerezza-io/src/main/bundles/list.xml
new file mode 100644
index 0000000..e03cd1d
--- /dev/null
+++ b/bundlelists/modules/dep-clerezza-io/src/main/bundles/list.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *********************************************************************
+   Apache Clerezza Parser and serializer
+   *********************************************************************
+   -->
+  <startLevel level="26">
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.rdfjson</artifactId>
+      <version>0.3-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.serializer</artifactId>
+      <version>0.9-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.parser</artifactId>
+      <version>0.10-incubating</version>
+    </bundle>
+    <!-- support for JSON-LD -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+  <!--
+   *********************************************************************
+   Apache Clerezza non RDF  modules
+   ********************************************************************* 
+   -->
+  <startLevel level="26">
+    <bundle>
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>org.json.simple</artifactId>
+      <version>0.3-incubating</version>
+    </bundle>
+  </startLevel>
+
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-clerezza-jena/pom.xml
similarity index 71%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-clerezza-jena/pom.xml
index cc7e7d5..98ee0b1 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-clerezza-jena/pom.xml
@@ -20,25 +20,27 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for the core Clerezza libraries</name>
+  <description>
+    This Bundlelist provides the Clerezza Apache Jena integration
+    (excl. Jena TDB and Jena based Serializer/Parser)</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-jena
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-jena
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +64,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-clerezza-jena/src/main/bundles/list.xml b/bundlelists/modules/dep-clerezza-jena/src/main/bundles/list.xml
new file mode 100644
index 0000000..0172796
--- /dev/null
+++ b/bundlelists/modules/dep-clerezza-jena/src/main/bundles/list.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *********************************************************************
+   Apache Clerezza Jena modules
+   *********************************************************************
+   -->
+  <startLevel level="26">
+    <bundle> <!-- the Apache Jena Bundle provided by Clerezza -->
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>com.hp.hpl.jena</artifactId>
+      <version>0.6-incubating</version>
+    </bundle>
+    <bundle> <!-- dependency of jena -->
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>javax.mail</artifactId>
+      <version>0.4-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.commons</artifactId>
+      <version>0.5-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.facade</artifactId>
+      <version>0.12-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.sparql</artifactId>
+      <version>0.5-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.storage</artifactId>
+      <version>0.5-incubating</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-clerezza-jenatdb/pom.xml
similarity index 71%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-clerezza-jenatdb/pom.xml
index cc7e7d5..7e60cb9 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-clerezza-jenatdb/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.core.clerezza.jenatdb</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for the core Clerezza Jena TDB storage support</name>
+  <description>This includes modules required to allow Clerzza to use the Jena TDB triple store</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-jenatdb
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-jenatdb
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-clerezza-jenatdb/src/main/bundles/list.xml b/bundlelists/modules/dep-clerezza-jenatdb/src/main/bundles/list.xml
new file mode 100644
index 0000000..3dddbec
--- /dev/null
+++ b/bundlelists/modules/dep-clerezza-jenatdb/src/main/bundles/list.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *********************************************************************
+   Apache Clerezza Jena TDB  modules
+   *********************************************************************
+   -->
+  <startLevel level="26">
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.tdb.storage</artifactId>
+      <version>0.5-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>com.hp.hpl.jena.tdb</artifactId>
+      <version>0.3-incubating</version>
+    </bundle>
+  </startLevel>
+  
+  <!--
+   *********************************************************************
+   Apache Clerezza non RDF  modules
+   ********************************************************************* 
+   -->
+  <startLevel level="26">
+    <!-- bundle>
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>javax.mail</artifactId>
+      <version>0.4-incubating</version>
+    </bundle -->
+  </startLevel>
+
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-clerezza-plattform/pom.xml
similarity index 66%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-clerezza-plattform/pom.xml
index cc7e7d5..1a8b762 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-clerezza-plattform/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.plattform</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Apache Clerezza Plattform</name>
+  <description>This includes the modules required for the Clerezza Plattform</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-plattform
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-plattform
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-clerezza-plattform/src/main/bundles/list.xml b/bundlelists/modules/dep-clerezza-plattform/src/main/bundles/list.xml
new file mode 100644
index 0000000..0d1e038
--- /dev/null
+++ b/bundlelists/modules/dep-clerezza-plattform/src/main/bundles/list.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *********************************************************************
+   Apache Clerezza Jena based SPARQL implementation
+   *********************************************************************
+   -->
+  <startLevel level="27">
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>platform.config</artifactId>
+			<version>0.3-incubating</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>platform</artifactId>
+			<version>0.1-incubating</version>
+		</bundle>
+		<bundle>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>platform.graphprovider.content</artifactId>
+			<version>0.6-incubating</version>
+		</bundle>
+    <!-- TODO: check if more dependencies are required -->
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-clerezza-sparql/pom.xml
similarity index 67%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-clerezza-sparql/pom.xml
index cc7e7d5..fc50cf3 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-clerezza-sparql/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.sparql</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Apache Clerezza SARQL</name>
+  <description>This includes the modules required for SPARQL in Clerezza</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-sparql
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza-sparql
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.jena</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-clerezza-sparql/src/main/bundles/list.xml b/bundlelists/modules/dep-clerezza-sparql/src/main/bundles/list.xml
new file mode 100644
index 0000000..847440c
--- /dev/null
+++ b/bundlelists/modules/dep-clerezza-sparql/src/main/bundles/list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!--
+   *********************************************************************
+   Apache Clerezza Jena based SPARQL implementation
+   *********************************************************************
+   -->
+  <startLevel level="26">
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.jena.sparql</artifactId>
+      <version>0.5-incubating</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-clerezza/pom.xml
similarity index 73%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-clerezza/pom.xml
index cc7e7d5..03b249f 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-clerezza/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for the core Clerezza libraries</name>
+  <description>This includes just the core Clerezza Libraries (no SPRAQL and Serializer)</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-clerezza
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-clerezza/src/main/bundles/list.xml b/bundlelists/modules/dep-clerezza/src/main/bundles/list.xml
new file mode 100644
index 0000000..d10ec6e
--- /dev/null
+++ b/bundlelists/modules/dep-clerezza/src/main/bundles/list.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- *********************************************************************
+   Apache Clerezza RDF core modules
+   ********************************************************************* -->
+  <startLevel level="26">
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.core</artifactId>
+      <version>0.12-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.utils</artifactId>
+      <version>0.13-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.ontologies</artifactId>
+      <version>0.11-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>rdf.rdfjson</artifactId>
+      <version>0.3-incubating</version>
+    </bundle>
+    <!-- 
+      Add support for fast index based in-memory models
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+  <!--
+   *********************************************************************
+   Apache Clerezza non RDF  modules
+   ********************************************************************* 
+   -->
+  <startLevel level="26">
+    <bundle>
+      <groupId>org.apache.clerezza</groupId>
+      <artifactId>utils</artifactId>
+      <version>0.1-incubating</version>
+    </bundle>
+    <bundle>
+      <groupId>org.wymiwyg</groupId>
+      <artifactId>wymiwyg-commons-core</artifactId>
+      <version>0.7.5</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>com.ibm.icu</artifactId>
+      <version>0.5-incubating</version>
+    </bundle>
+    <!-- bundle>
+      <groupId>org.apache.clerezza.ext</groupId>
+      <artifactId>javax.mail</artifactId>
+      <version>0.4-incubating</version>
+    </bundle -->
+  </startLevel>
+
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-commonlibs/pom.xml
similarity index 81%
rename from bundlelists/security/pom.xml
rename to bundlelists/modules/dep-commonlibs/pom.xml
index cc7e7d5..cfcf479 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-commonlibs/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for commonly used libs</name>
+  <description>This includes libs such as apache-commons, json, xml ... </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-commonlibs
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-commonlibs
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
diff --git a/bundlelists/modules/dep-commonlibs/src/main/bundles/list.xml b/bundlelists/modules/dep-commonlibs/src/main/bundles/list.xml
new file mode 100644
index 0000000..a491d56
--- /dev/null
+++ b/bundlelists/modules/dep-commonlibs/src/main/bundles/list.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+
+
+  <!-- *********************************************************************
+    Apache Commons libs 
+    ********************************************************************* -->
+  <startLevel level="20">
+    <bundle>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.2</version>
+    </bundle>
+    <bundle>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+    </bundle>
+    <bundle>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+    </bundle>
+    <bundle>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.4.1</version>
+    </bundle>
+    <bundle> <!-- dependency of commons-compress 1.4+ -->
+      <groupId>org.tukaani</groupId>
+      <artifactId>xz</artifactId>
+      <version>1.2</version>
+    </bundle>
+    <bundle>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.7</version>
+    </bundle>
+    <bundle>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.2.2</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore-osgi</artifactId>
+      <version>4.2.3</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient-osgi</artifactId>
+      <version>4.2.3</version>
+    </bundle>
+    <!-- bundle - AFAIK only used by Solr ... so not in commonslib
+       <groupId>org.apache.servicemix.bundles</groupId>
+       <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+       <version>1.8.3_1</version>
+     </bundle -->
+    <!-- bundle - AFAIK only used by Solr ... so not in commonslib
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.regexp</artifactId>
+      <version>1.3_3</version>
+    </bundle> -->
+    <!-- bundle> - AFAIK only used by Solr ... so not in commonslib
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+      <version>3.2.9_3</version>
+    </bundle -->
+    <!-- bundle> - only used by the Entityhub
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.6.2</version>
+    </bundle -->
+  </startLevel>
+
+  <!-- *********************************************************************
+   The different JSON libs used by Apache Stanbol
+   ********************************************************************* -->
+  <startLevel level="20">
+    <bundle> <!-- org.json as bundle provided by geronimo.apache.org-->
+      <groupId>org.apache.geronimo.bundles</groupId>
+      <artifactId>json</artifactId>
+      <version>20090211_1</version>
+    </bundle>
+    <bundle> <!-- used for simple JSON parsing/writing in Stanbol -->
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <version>1.3.3</version>
+    </bundle>
+    <bundle> <!-- used for stream parsing/serialization -->
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>1.9.12</version>
+    </bundle>
+    <bundle> <!--  JSON Tree model and JSON - Object mappings -->
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.9.12</version>
+    </bundle>
+    <bundle> <!-- for JAX-RS integration -->
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-jaxrs</artifactId>
+      <version>1.9.12</version>
+    </bundle>
+    
+  </startLevel>
+  
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/osgiframework/pom.xml b/bundlelists/modules/dep-sling/pom.xml
similarity index 80%
rename from bundlelists/osgiframework/pom.xml
rename to bundlelists/modules/dep-sling/pom.xml
index 7155c0a..a963cbe 100644
--- a/bundlelists/osgiframework/pom.xml
+++ b/bundlelists/modules/dep-sling/pom.xml
@@ -20,25 +20,28 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.sling</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for the OSGi Framework</name>
-  <description>This is a Maven project which produces the partial list containing the OSGi framework bundles</description>
+  <name>Apache Stanbol Bundlelist for the Apche Sling and OSGI framework</name>
+  <description>
+    Provides the Apache Sling runtime as well core OSGI modules (excluding the
+    Felix Webconsole)
+  </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-sling
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-sling
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
diff --git a/bundlelists/osgiframework/src/main/bundles/list.xml b/bundlelists/modules/dep-sling/src/main/bundles/list.xml
similarity index 61%
rename from bundlelists/osgiframework/src/main/bundles/list.xml
rename to bundlelists/modules/dep-sling/src/main/bundles/list.xml
index e1b7509..fa08fe5 100644
--- a/bundlelists/osgiframework/src/main/bundles/list.xml
+++ b/bundlelists/modules/dep-sling/src/main/bundles/list.xml
@@ -16,8 +16,18 @@
   limitations under the License.
 -->
 <bundles>
-  <!-- OSGi infrastructure -->
+  <!-- 
+   *************************************************************************
+   OSGi infrastructure
+   ************************************************************************* 
+   -->
   <startLevel level="5">
+    <!-- JDK Package Exporter -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
     <bundle>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.commons.log</artifactId>
@@ -28,11 +38,6 @@
       <artifactId>org.osgi.core</artifactId>
       <version>1.4.0</version>
     </bundle>
-    <!-- bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>1.4.0</version>
-    </bundle  -->
     <bundle>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.scr</artifactId>
@@ -53,7 +58,7 @@
       <artifactId>org.apache.felix.eventadmin</artifactId>
       <version>1.2.14</version>
     </bundle>
-    <bundle>
+    <!-- bundle>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.dependencymanager</artifactId>
       <version>3.0.0</version>
@@ -62,7 +67,7 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
       <version>3.0.0</version>
-    </bundle>
+    </bundle -->
     <!-- bundle>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.deploymentadmin</artifactId>
@@ -83,64 +88,77 @@
       <artifactId>org.apache.sling.commons.osgi</artifactId>
       <version>2.1.0</version>
     </bundle>  -->
-    
-  </startLevel>
-
-  <!-- HTTP service and Http related Utilities -->
-  <startLevel level="5">
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.http.whiteboard</artifactId>
-      <version>2.2.0</version>
-    </bundle>
-  </startLevel>
-
-  <!-- Felix web console and plugins -->
-  <startLevel level="21">
-    <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole</artifactId>
-      <version>4.0.0</version>
-    </bundle>
     <bundle>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.bundlerepository</artifactId>
       <version>1.6.6</version>
     </bundle>
+  </startLevel>
+
+  <!--
+   *************************************************************************
+   Apache Sling base
+   *************************************************************************
+   -->
+  <!-- Sling launchpad -->
+  <startLevel level="7">
     <bundle>
       <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.extensions.threaddump</artifactId>
-      <version>0.2.2</version>
+      <artifactId>org.apache.sling.launchpad.api</artifactId>
+      <version>1.1.0</version>
     </bundle>
     <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole.plugins.packageadmin</artifactId>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.settings</artifactId>
+      <version>1.2.2</version>
+    </bundle>
+  </startLevel>
+  <startLevel level="8">
+    <!-- Apache Sling Installer incl. Stanbol Extensions -->
+    <bundle>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.installer.api</artifactId>
       <version>1.0.0</version>
     </bundle>
     <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
-      <version>1.0.0</version>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.installer.core</artifactId>
+      <version>3.4.4</version>
     </bundle>
     <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole.plugins.obr</artifactId>
-      <version>1.0.0</version>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.installer.factory.configuration</artifactId>
+      <version>1.0.8</version>
     </bundle>
     <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.installer.provider.file</artifactId>
       <version>1.0.2</version>
     </bundle>
     <bundle>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
-      <version>1.0.4</version>
-    </bundle>
-    <bundle> <!-- The Apache Sling Installer WebConsole plugin -->
       <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.installer.console</artifactId>
-      <version>1.0.0</version>
+      <artifactId>org.apache.sling.launchpad.installer</artifactId>
+      <version>1.2.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.installer.bundleprovider</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+  <!--
+   *************************************************************************
+   Apache Stanbol core services
+   *************************************************************************
+   -->
+  <startLevel level="27">
+    <!-- Allows to run Stanbol in offline mode -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.stanboltools.offline
+      </artifactId>
+      <version>0.12.0-SNAPSHOT</version>
     </bundle>
   </startLevel>
 </bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-tika/pom.xml
similarity index 74%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-tika/pom.xml
index cc7e7d5..50b158b 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-tika/pom.xml
@@ -20,25 +20,24 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.tika</artifactId>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Apache Tika</name>
+  <description>This includes all modules as required for Apache Tika</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-tika
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-tika
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +61,14 @@
       </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-tika/src/main/bundles/list.xml b/bundlelists/modules/dep-tika/src/main/bundles/list.xml
new file mode 100644
index 0000000..441e896
--- /dev/null
+++ b/bundlelists/modules/dep-tika/src/main/bundles/list.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+
+  <!-- ********************************************************************* 
+    Apache Tika modules 
+    ********************************************************************* -->
+  <!-- Note: that Tika only inits the Parser correctly if the start level of
+   tika-core is lower than tika-bundle
+   -->
+  <startLevel level="26">
+    <bundle> <!-- Apache Tika core (required by the LangId and TikaEngine) -->
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-core</artifactId>
+      <version>1.2</version>
+    </bundle>
+  </startLevel>
+  <startLevel level="27">
+    <bundle> <!-- Apache Tika bundle (required by the TikaEngine) -->
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-bundle</artifactId>
+      <version>1.2</version>
+    </bundle>
+  </startLevel>
+
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/dep-velocity/pom.xml
similarity index 74%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/dep-velocity/pom.xml
index cc7e7d5..8eb79f6 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/dep-velocity/pom.xml
@@ -20,25 +20,24 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.velocity</artifactId>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Apache Velocity</name>
+  <description>This provides Apache Velocity</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-velocity
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-velocity
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +61,14 @@
       </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
 </project>
diff --git a/bundlelists/modules/dep-velocity/src/main/bundles/list.xml b/bundlelists/modules/dep-velocity/src/main/bundles/list.xml
new file mode 100644
index 0000000..bc935a9
--- /dev/null
+++ b/bundlelists/modules/dep-velocity/src/main/bundles/list.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+
+  <!-- ********************************************************************* 
+    Apache Velocity modules 
+    ********************************************************************* -->
+  <startLevel level="20">
+    <bundle>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.7</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.velocity-tools</artifactId>
+      <version>2.0_1</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/osgiframework/pom.xml b/bundlelists/modules/dep-webconsole/pom.xml
similarity index 77%
copy from bundlelists/osgiframework/pom.xml
copy to bundlelists/modules/dep-webconsole/pom.xml
index 7155c0a..a16519c 100644
--- a/bundlelists/osgiframework/pom.xml
+++ b/bundlelists/modules/dep-webconsole/pom.xml
@@ -26,19 +26,19 @@
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.dep.webconsole</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for the OSGi Framework</name>
-  <description>This is a Maven project which produces the partial list containing the OSGi framework bundles</description>
+  <name>Apache Stanbol Bundlelist adding the Felix Webconsole to the Core Runtime</name>
+  <description>Provides the core OSGI Webconsole including additinal plugins</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-webconsole
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/osgiframework
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/dep-webconsole
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,14 @@
       </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.sling</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/dep-webconsole/src/main/bundles/list.xml b/bundlelists/modules/dep-webconsole/src/main/bundles/list.xml
new file mode 100644
index 0000000..f8d34fa
--- /dev/null
+++ b/bundlelists/modules/dep-webconsole/src/main/bundles/list.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- Felix web console and plugins -->
+  <startLevel level="21">
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole</artifactId>
+      <version>4.0.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.extensions.threaddump</artifactId>
+      <version>0.2.2</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole.plugins.packageadmin</artifactId>
+      <version>1.0.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
+      <version>1.0.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole.plugins.obr</artifactId>
+      <version>1.0.0</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
+      <version>1.0.2</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
+      <version>1.0.4</version>
+    </bundle>
+    <bundle> <!-- The Apache Sling Installer WebConsole plugin -->
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.installer.console</artifactId>
+      <version>1.0.0</version>
+    </bundle>
+  </startLevel>
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/modules/engines-entityhub/pom.xml b/bundlelists/modules/engines-entityhub/pom.xml
new file mode 100644
index 0000000..ccd769b
--- /dev/null
+++ b/bundlelists/modules/engines-entityhub/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.entityhub</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Entityhub based EnhancementEngines</name>
+  <description>
+    This Bundlelist provides EnhancementEngines that depend on the Stanbol
+    Entityhub component
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/engines-entityhub
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/components/engines-entityhub
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The EntityhubLinkingEngine depends on the EntityLinking Engine -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.nodep</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/engines-entityhub/src/main/bundles/list.xml b/bundlelists/modules/engines-entityhub/src/main/bundles/list.xml
new file mode 100644
index 0000000..f593bdd
--- /dev/null
+++ b/bundlelists/modules/engines-entityhub/src/main/bundles/list.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    Stanbol Entityhub based Enhancement Engines 
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+    <!-- Named Entity Linking -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engine.entitytagging</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!-- EntityLinking for the Stanbol Entityhub -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entityhublinking</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!-- Topic Engine-->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engine.topic</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+  </startLevel>
+
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/engines-integratedservices/pom.xml
similarity index 70%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/engines-integratedservices/pom.xml
index cc7e7d5..6d708d6 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/engines-integratedservices/pom.xml
@@ -20,25 +20,26 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.integratedservices</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Engines that integrate Enhancement Services</name>
+  <description>This Bundlelist provides Engines for remote services such as
+    Zemanta, OpenCalais, DBpedia Spotlight, Celi NLP and Geonames.</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-integratedservices
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-integratedservices
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +63,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/engines-integratedservices/src/main/bundles/list.xml b/bundlelists/modules/engines-integratedservices/src/main/bundles/list.xml
new file mode 100644
index 0000000..e0a814c
--- /dev/null
+++ b/bundlelists/modules/engines-integratedservices/src/main/bundles/list.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    Enhancement Engines for Integrated Services 
+    ********************************************************************* -->
+
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+
+    <bundle> <!-- http://www.opencalais.com/ -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opencalais</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- http://www.zemanta.com/ -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- http://www.geonames.org/ -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.geonames</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+    <bundle> <!-- http://linguagrid.org/ -->
+      <groupId>org.apache.stanbol</groupId>
+	  <artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+     <!-- DBpedia Spotlight Engines (STANBOL-706) -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.dbpspotlight</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/engines-nodep/pom.xml
similarity index 76%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/engines-nodep/pom.xml
index cc7e7d5..c3820dd 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/engines-nodep/pom.xml
@@ -26,19 +26,20 @@
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.nodep</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Core EnhancementEngines</name>
+  <description>This Bundlelist provides often used Enhancement Engines without major
+  external dependencies</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-nodep
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-nodep
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +63,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/engines-nodep/src/main/bundles/list.xml b/bundlelists/modules/engines-nodep/src/main/bundles/list.xml
new file mode 100644
index 0000000..e78b67b
--- /dev/null
+++ b/bundlelists/modules/engines-nodep/src/main/bundles/list.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    Enhancement Engines without major external dependencies
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+    
+    <!-- language identification -->
+
+    <bundle> 
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.langdetect</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+
+    <bundle><!-- RESTful Language Identification engine -->
+      <groupId>org.apache.stanbol</groupId> <!-- see STANBOL-895 -->
+      <artifactId>org.apache.stanbol.enhancer.engines.restful.nlp</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+
+    
+    <!-- NLP processing engines (all STANBOL-733 and sub-tasks) -->
+    <bundle><!-- RESTful NLP Analysis engine -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.restful.nlp</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!-- NLP metadata to RDF (using NIF 1.0) - NOT YET READY FOR DEFAULT CONFIG
+     <bundle>
+     <groupId>org.apache.stanbol</groupId>
+     <artifactId>org.apache.stanbol.enhancer.engines.nlp2rdf</artifactId>
+     <version>0.10.0-SNAPSHOT</version>
+     </bundle>  -->
+        
+    <!-- Stanbol EntityLinking -->
+    <bundle><!-- Engine -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.engine</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/engines-opennlp/pom.xml
similarity index 66%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/engines-opennlp/pom.xml
index cc7e7d5..0487535 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/engines-opennlp/pom.xml
@@ -20,25 +20,26 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.opennlp</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer OpenNLP based EnhancementEngines</name>
+  <description>This Bundlelist provides EnhancementEngines based on OpenNLP
+  external dependencies</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-opennlp
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-opennlp
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +63,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.opennlp</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/engines-opennlp/src/main/bundles/list.xml b/bundlelists/modules/engines-opennlp/src/main/bundles/list.xml
new file mode 100644
index 0000000..5e1aaa3
--- /dev/null
+++ b/bundlelists/modules/engines-opennlp/src/main/bundles/list.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    OpenNLP based NLP processing engines 
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+    <!-- NLP processing engines (all STANBOL-733 and sub-tasks) -->
+    <bundle><!-- sentence detection with OpenNLP -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.sentence</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle><!-- OpenNLP based tokenizing of Texts -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.token</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle><!-- POS tagging with OpenNLP -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.pos</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle><!-- Chunking tagging with OpenNLP -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.chunker</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- Open NLP based NER -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+    <!-- Stanbol Enhancer EntityLinking Engine -->
+    <bundle><!-- OpenNLP LabelTokenizing support -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.opennlp</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+</bundles>
diff --git a/bundlelists/modules/engines-refactor/pom.xml b/bundlelists/modules/engines-refactor/pom.xml
new file mode 100644
index 0000000..2874da7
--- /dev/null
+++ b/bundlelists/modules/engines-refactor/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.refactor</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Refactor Enhancement Engine</name>
+  <description>
+    This provides the Refactor Engine. It uses the Stanbol Rules component to
+    allow rulebased rewriting of the Enhancement metadata. It also uses the
+    Entityhub Component to load additional information for linked Entities.
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-refactor
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-refactor
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- This provides the c-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.clerezza</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/engines-refactor/src/main/bundles/list.xml b/bundlelists/modules/engines-refactor/src/main/bundles/list.xml
new file mode 100644
index 0000000..5e1aaa3
--- /dev/null
+++ b/bundlelists/modules/engines-refactor/src/main/bundles/list.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    OpenNLP based NLP processing engines 
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+    <!-- NLP processing engines (all STANBOL-733 and sub-tasks) -->
+    <bundle><!-- sentence detection with OpenNLP -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.sentence</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle><!-- OpenNLP based tokenizing of Texts -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.token</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle><!-- POS tagging with OpenNLP -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.pos</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle><!-- Chunking tagging with OpenNLP -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.chunker</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- Open NLP based NER -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+    <!-- Stanbol Enhancer EntityLinking Engine -->
+    <bundle><!-- OpenNLP LabelTokenizing support -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.opennlp</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/engines-sentiment/pom.xml
similarity index 72%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/engines-sentiment/pom.xml
index cc7e7d5..7378732 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/engines-sentiment/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.sentiment</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Sentiment EnhancementEngines</name>
+  <description>This Bundlelist provides EnhancmentEngines for sentiment extraction </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-sentiment
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-sentiment
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/engines-sentiment/src/main/bundles/list.xml b/bundlelists/modules/engines-sentiment/src/main/bundles/list.xml
new file mode 100644
index 0000000..dc053df
--- /dev/null
+++ b/bundlelists/modules/engines-sentiment/src/main/bundles/list.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    Enhancement Engines for Sentiment extraction
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+
+    <!-- Sentiment Enhancement Engines -->
+    <bundle><!-- Sentiment Word Classifiers -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.sentiment.wordclassifier</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!-- NOT YET READY FOR DEFAULT CONFIG
+     <bundle>
+     <groupId>org.apache.stanbol</groupId>
+     <artifactId>org.apache.stanbol.enhancer.engines.sentiment.summarization</artifactId>
+     <version>0.10.0-SNAPSHOT</version>
+     </bundle> -->
+    
+  </startLevel>
+  
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/engines-solr-chinese/pom.xml
similarity index 70%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/engines-solr-chinese/pom.xml
index cc7e7d5..0bf89c5 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/engines-solr-chinese/pom.xml
@@ -20,25 +20,27 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.solr.chinese</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Engines baesd on Solr support for
+    Chinese</name>
+  <description>This Bundlelist provides Enhancement Engies and EntityLinking support
+  for Chinese based on Apache Solr/Lucene components (Smartcn and Paoding)</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-solr-chinese
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-solr-chinese
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +64,13 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.solr</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/engines-solr-chinese/src/main/bundles/list.xml b/bundlelists/modules/engines-solr-chinese/src/main/bundles/list.xml
new file mode 100644
index 0000000..9957f83
--- /dev/null
+++ b/bundlelists/modules/engines-solr-chinese/src/main/bundles/list.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+
+  <startLevel level="28"> <!-- commons.solr.core uses startlevel 27 -->
+    <!--
+     The paoding analyzer bundle (extension to o.a.s.commons.solr.core module)
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.extras.paoding</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!--
+     The smartcn analyzer bundle (extension to o.a.s.commons.solr.core module)
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.solr.extras.smartcn</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+  <!-- *********************************************************************
+    Enhancement Engines that depend on Apache Solr/Lucene 
+    ********************************************************************* -->
+
+  <startLevel level="35"> <!-- same startlevel as other Enhancement Engines -->
+    <!--
+     The Chinese sentence detection and tokenizer EnhancementEngine based on
+     smartcn
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.paoding.token</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!--
+     The Chinese sentence detection and tokenizer EnhancementEngine based on
+     smartcn
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.smartcn.token</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+  <!--
+   startlevel needs to be greater as those of the EntityLinkingEngine
+   (o.a.s.enhancer.engines.entitylinking.engine) module
+   -->
+  <startLevel level="36">
+    <!--
+     The Chinese LabelTokenizer required by the EntityLinkingEngine to compare
+     Tokens in the AnalyzedText with Labels of the Entities found in the
+     Controlled vocabulary.
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.paoding</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    <!--
+     The Chinese LabelTokenizer required by the EntityLinkingEngine to compare
+     Tokens in the AnalyzedText with Labels of the Entities found in the
+     Controlled vocabulary.
+     -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.smartcn</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>
diff --git a/bundlelists/modules/engines-solr/pom.xml b/bundlelists/modules/engines-solr/pom.xml
new file mode 100644
index 0000000..bb0e92d
--- /dev/null
+++ b/bundlelists/modules/engines-solr/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.solr</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Engines and Services based on
+  Apache Solr/Lucene</name>
+  <description>This Bundlelist provides Enhancement Engies and services that deoend
+  ot Apache Solr/Lucene</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-solr
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-solr
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Solr dependencies are provided by core.solr -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Solr LabelTokenizer implements an interface defined by the EntityLinking Engine -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.nodep</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/engines-solr/src/main/bundles/list.xml b/bundlelists/modules/engines-solr/src/main/bundles/list.xml
new file mode 100644
index 0000000..1fe664e
--- /dev/null
+++ b/bundlelists/modules/engines-solr/src/main/bundles/list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    Enhancement Engines that depend on Apache Solr/Lucene 
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+
+    <bundle><!-- Lucene LabelTokenizing support -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.entitylinking.labeltokenizer.lucene</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+
+  </startLevel>
+  
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/engines-tika/pom.xml
similarity index 67%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/engines-tika/pom.xml
index cc7e7d5..b420df6 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/engines-tika/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.engines.tika</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Apache Tika based EnhancementEngines</name>
+  <description>This Bundlelist provides EnhancementEngines based on Apache Tika</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-tika
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/engines-tika
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.tika</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/engines-tika/src/main/bundles/list.xml b/bundlelists/modules/engines-tika/src/main/bundles/list.xml
new file mode 100644
index 0000000..c7ab1f9
--- /dev/null
+++ b/bundlelists/modules/engines-tika/src/main/bundles/list.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+
+  <!-- *********************************************************************
+    Apache Tika based Enhancement Engines 
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer plug-ins (the Enhancement Engines) -->
+  <startLevel level="35">
+
+    <!-- language identification -->
+	 <bundle> <!-- based on Apache Tika language identification module -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.langid</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+    <bundle><!-- Apache Tika Engine -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.tika</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+    
+    <!-- XMP Extractor engine -->
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.xmpextractor</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </bundle>
+
+  </startLevel>
+
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/enhancer-benchmark/pom.xml
similarity index 66%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/enhancer-benchmark/pom.xml
index cc7e7d5..3c9d1e0 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/enhancer-benchmark/pom.xml
@@ -20,25 +20,27 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.benchmark</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Benchmarking Tool</name>
+  <description>
+    The enhancer Benchmarking tool
+  </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-benchmark
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-benchmark
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +64,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.velocity</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/enhancer-benchmark/src/main/bundles/list.xml b/bundlelists/modules/enhancer-benchmark/src/main/bundles/list.xml
new file mode 100644
index 0000000..a2a79b1
--- /dev/null
+++ b/bundlelists/modules/enhancer-benchmark/src/main/bundles/list.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Stanbol Enhancer LDpath module
+    ********************************************************************* -->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.benchmark</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/enhancer-core/pom.xml
similarity index 65%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/enhancer-core/pom.xml
index cc7e7d5..cb1af06 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/enhancer-core/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer Core Modules</name>
+  <description>This Bundlelist provides the core modules for the Stanbol Enahncer</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-core
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-core
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for the clerezza implementation -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/enhancer-core/src/main/bundles/list.xml b/bundlelists/modules/enhancer-core/src/main/bundles/list.xml
new file mode 100644
index 0000000..eb5ac51
--- /dev/null
+++ b/bundlelists/modules/enhancer-core/src/main/bundles/list.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Stanbol Enhancer API and Core Services 
+    ********************************************************************* -->
+
+  <!-- Stanbol Enhancer infrastructure and required libraries -->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- NLP processing (STANBOL-733) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle> <!-- JSON serialization support for AnalyzedText (STANBOL-878) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.nlp.json</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  <!-- EnhancementJobManager implementations -->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.eventjobmanager</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <!-- bundle>  deprecated: does not support EnhancementChains
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle -->
+  </startLevel>
+  <!-- Enhancement Chain implementations -->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.chain.allactive</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.chain.graph</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.chain.weighted</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.chain.list</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+  <!-- Default Configuration for the Stanbol Enhancer -->
+  
+  <startLevel level="36">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.defaults</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/enhancer-ldpath/pom.xml
similarity index 64%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/enhancer-ldpath/pom.xml
index cc7e7d5..3030e79 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/enhancer-ldpath/pom.xml
@@ -20,25 +20,28 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.ldpath</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer LDpath Support</name>
+  <description>
+    Adds support for LDpath over ContentItems incl. support for accessing
+    Blobs via fn:contnet(..)
+  </description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-ldpath
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-ldpath
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +65,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- for the clerezza implementation -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.ldpath</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/enhancer-ldpath/src/main/bundles/list.xml b/bundlelists/modules/enhancer-ldpath/src/main/bundles/list.xml
new file mode 100644
index 0000000..93241dc
--- /dev/null
+++ b/bundlelists/modules/enhancer-ldpath/src/main/bundles/list.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Stanbol Enhancer LDpath module
+    ********************************************************************* -->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.ldpath</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
diff --git a/bundlelists/modules/enhancer-web/pom.xml b/bundlelists/modules/enhancer-web/pom.xml
new file mode 100644
index 0000000..05c3666
--- /dev/null
+++ b/bundlelists/modules/enhancer-web/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.web</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Enhancer JAX-RS and Web UI Modules</name>
+  <description>This Bundlelist provides the JAX-RS and Web UI modules for the Stanbol Enahncer</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-web
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/enhancer-web
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer.core</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Stanbol JAX-RS and Web UI modules -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The RDF parser and Serializer -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.io</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/modules/enhancer-web/src/main/bundles/list.xml b/bundlelists/modules/enhancer-web/src/main/bundles/list.xml
new file mode 100644
index 0000000..55bd2c3
--- /dev/null
+++ b/bundlelists/modules/enhancer-web/src/main/bundles/list.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- ********************************************************************* 
+    The Enhancer Web fragment
+    ********************************************************************* -->
+
+  <startLevel level="31">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.jersey</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+</bundles>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/entityhub-clerezza/pom.xml
similarity index 64%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/entityhub-clerezza/pom.xml
index cc7e7d5..981a409 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/entityhub-clerezza/pom.xml
@@ -20,25 +20,26 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.clerezza</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Entityhub Clerezza Modules</name>
+  <description>This Bundlelist provides Entityhub implementations based on Clerezza
+  including Linked Data and SPARQL support</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-clerezza
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-clerezza
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +63,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Clerezza core and io is required -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.clerezza.io</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/entityhub-clerezza/src/main/bundles/list.xml b/bundlelists/modules/entityhub-clerezza/src/main/bundles/list.xml
new file mode 100644
index 0000000..93fcc0b
--- /dev/null
+++ b/bundlelists/modules/entityhub-clerezza/src/main/bundles/list.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- Stanbol Entityhub infrastructure and required libraries-->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.site.linkeddata</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>  
\ No newline at end of file
diff --git a/bundlelists/modules/entityhub-core/pom.xml b/bundlelists/modules/entityhub-core/pom.xml
new file mode 100644
index 0000000..7bdd051
--- /dev/null
+++ b/bundlelists/modules/entityhub-core/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for Stanbol Entityhub Core Modules</name>
+  <description>This Bundlelist provides the core modules for the Stanbol Entityhub</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-core
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-core
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.commonlibs</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Entityhub uses the Namespace Prefix service -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.nsprefix</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- LDPath is supported by the Entityhub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.ldpath</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/bundlelists/entityhub/src/main/bundles/list.xml b/bundlelists/modules/entityhub-core/src/main/bundles/list.xml
similarity index 62%
rename from bundlelists/entityhub/src/main/bundles/list.xml
rename to bundlelists/modules/entityhub-core/src/main/bundles/list.xml
index 7797b36..25e641f 100644
--- a/bundlelists/entityhub/src/main/bundles/list.xml
+++ b/bundlelists/modules/entityhub-core/src/main/bundles/list.xml
@@ -17,6 +17,13 @@
 -->
 
 <bundles>
+  <startLevel level="20">
+    <bundle> <!-- lib only used by the Entityhub -->
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.6.2</version>
+    </bundle>
+  </startLevel>
   <!-- Stanbol Entityhub infrastructure and required libraries-->
   <startLevel level="30">
     <bundle>
@@ -26,36 +33,11 @@
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.site.managed</artifactId>
       <version>0.12.0-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.site.linkeddata</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
-    </bundle>
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.core</artifactId>
       <version>0.12.0-SNAPSHOT</version>
     </bundle>
@@ -66,14 +48,6 @@
     </bundle>   
   </startLevel>
   
-  <!-- Web Fragment -->
-  <startLevel level="31">
-    <bundle>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
-    </bundle>
-  </startLevel>  
   <!-- Default configuration for the Entityhub -->
   <startLevel level="32">
     <bundle>
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/entityhub-solr/pom.xml
similarity index 64%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/entityhub-solr/pom.xml
index cc7e7d5..9b18862 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/entityhub-solr/pom.xml
@@ -20,25 +20,26 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.solr</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Entityhub Solr Modules</name>
+  <description>This Bundlelist provides the Solr based Storage implementation for
+  the Stanbol Entityhub (SolrYard)</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-solr
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-solr
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +63,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Stanbol Commons Solr component-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/entityhub-solr/src/main/bundles/list.xml b/bundlelists/modules/entityhub-solr/src/main/bundles/list.xml
new file mode 100644
index 0000000..440166a
--- /dev/null
+++ b/bundlelists/modules/entityhub-solr/src/main/bundles/list.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <!-- Stanbol Entityhub infrastructure and required libraries-->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+</bundles>  
\ No newline at end of file
diff --git a/bundlelists/security/pom.xml b/bundlelists/modules/entityhub-web/pom.xml
similarity index 65%
copy from bundlelists/security/pom.xml
copy to bundlelists/modules/entityhub-web/pom.xml
index cc7e7d5..03b4942 100644
--- a/bundlelists/security/pom.xml
+++ b/bundlelists/modules/entityhub-web/pom.xml
@@ -20,25 +20,25 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>stanbol-parent</artifactId>
-    <version>4-SNAPSHOT</version>
-    <relativePath>../../../parent</relativePath>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <groupId>org.apache.stanbol</groupId>
-  <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.web</artifactId>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>partialbundlelist</packaging>
 
-  <name>Apache Stanbol Bundlelist for Security</name>
-  <description>This is a Maven project which produces the partial list containing the bundles related to Security.</description>
+  <name>Apache Stanbol Bundlelist for Stanbol Entityhub JAX-RS and Web modules</name>
+  <description>This Bundlelist provides the JAX-RS and Web Ui fof the Stanbol Entityhub</description>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-web
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/security
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/modules/entityhub-web
     </developerConnection>
     <url>http://stanbol.apache.org/</url>
   </scm>
@@ -62,4 +62,19 @@
       </plugin>
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub.core</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Stanbol JAX-RS and Web UI modules-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/bundlelists/modules/entityhub-web/src/main/bundles/list.xml b/bundlelists/modules/entityhub-web/src/main/bundles/list.xml
new file mode 100644
index 0000000..4e9e038
--- /dev/null
+++ b/bundlelists/modules/entityhub-web/src/main/bundles/list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<bundles>
+  <startLevel level="20">
+    <bundle>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4.5</version>
+    </bundle>
+  </startLevel>
+  <!-- Web Fragment -->
+  <startLevel level="31">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/ontologymanager/pom.xml b/bundlelists/ontologymanager/pom.xml
deleted file mode 100755
index c397e79..0000000
--- a/bundlelists/ontologymanager/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

-  license agreements. See the NOTICE file distributed with this work for additional 

-  information regarding copyright ownership. The ASF licenses this file to 

-  You under the Apache License, Version 2.0 (the "License"); you may not use 

-  this file except in compliance with the License. You may obtain a copy of 

-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

-  by applicable law or agreed to in writing, software distributed under the 

-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

-  OF ANY KIND, either express or implied. See the License for the specific 

-  language governing permissions and limitations under the License. -->

-<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>org.apache.stanbol</groupId>

-    <artifactId>stanbol-parent</artifactId>

-    <version>4-SNAPSHOT</version>

-    <relativePath>../../../parent</relativePath>

-  </parent>

-

-  <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>

-  <version>0.10.0-SNAPSHOT</version>

-  <packaging>partialbundlelist</packaging>

-  

-  <name>Apache Stanbol Bundlelist for Ontology Manager</name>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

-

diff --git a/bundlelists/pom.xml b/bundlelists/pom.xml
index 32708cc..dfa4566 100644
--- a/bundlelists/pom.xml
+++ b/bundlelists/pom.xml
@@ -57,31 +57,79 @@
   </scm>
   
   <modules>
-    <!-- Commons -->
-    <module>osgiframework</module>
-    <module>stanbolcommons</module>
-
-    <!-- Data bundles -->
-    <module>defaultdata</module>
-    <module>opennlp</module>
-    <module>sentimentdata</module>
-
-    <!-- Components -->
-    <module>enhancer</module>
-    <module>entityhub</module>
-    <module>cmsadapter</module>
-    <module>contenthub</module>
-    <module>ontologymanager</module>
-    <module>reasoners</module>
-    <module>rules</module>
-
-    <!-- Specific features -->
-    <module>security</module>
-    <module>zzshell</module>
+    <!-- Bundlelists for Stanbol dependencies -->
+    <module>modules/dep-clerezza</module>
+    <module>modules/dep-clerezza-io</module>
+    <module>modules/dep-clerezza-jena</module>
+    <module>modules/dep-clerezza-jenatdb</module>
+    <module>modules/dep-clerezza-sparql</module>
+    <module>modules/dep-clerezza-plattform</module>
+    <module>modules/dep-commonlibs</module>
+    <module>modules/dep-sling</module>
+    <module>modules/dep-tika</module>
+    <module>modules/dep-velocity</module>
+    <module>modules/dep-webconsole</module>
     
-    <!-- language specific extensions -->
-    <module>language-extras/smartcn</module>
-    <module>language-extras/paoding</module>
+    <!-- Bundlelists for Stanbol Commons modules -->
+    <module>modules/commons-datafileprovider</module>
+    <module>modules/commons-jobs</module>
+    <module>modules/commons-ldpath</module>
+    <module>modules/commons-nsprefix</module>
+    <module>modules/commons-opennlp</module>
+    <module>modules/commons-owl</module>
+    <module>modules/commons-security</module>
+    <module>modules/commons-solr</module>
+    <module>modules/commons-web</module>
+    <module>modules/commons-web-ldpath</module>
+    <module>modules/commons-web-solr</module>
+    <module>modules/commons-web-sparql</module>
+
+    <!-- Bundlelists for Stanbol Enhancer modules -->
+    <module>modules/enhancer-core</module>
+    <module>modules/enhancer-ldpath</module>
+    <module>modules/enhancer-benchmark</module>
+    <module>modules/enhancer-web</module>
+    <module>modules/engines-nodep</module>
+    <module>modules/engines-htmlextract</module>
+    <module>modules/engines-solr</module>
+    <module>modules/engines-solr-chinese</module>
+    <module>modules/engines-tika</module>
+    <module>modules/engines-sentiment</module>
+    <module>modules/engines-opennlp</module>
+    <module>modules/engines-integratedservices</module>
+    <module>modules/engines-refactor</module>
+    
+    <!-- Bundlelists for Stanbol Entityhub modules -->
+    <module>modules/entityhub-core</module>
+    <module>modules/entityhub-web</module>
+    <module>modules/entityhub-clerezza</module>
+    <module>modules/entityhub-solr</module>
+    <module>modules/engines-entityhub</module>
+
+    <!-- Bundlelists for Stanbol Contenthub modules -->
+    <module>modules/contenthub-core</module>
+    <module>modules/contenthub-search-related</module>
+    <module>modules/contenthub-web</module>
+    
+    <!-- data -->
+    <module>data/data-default</module>
+    <module>data/data-opennlp</module>
+    <module>data/data-sentiment</module>
+
+    <!-- Runtimes -->
+    <module>runtime/default</module>
+    <module>runtime/minimal</module>
+    
+    <!-- Components main bundlelists-->
+    <module>components/enhancer</module>
+    <module>components/entityhub</module>
+    <module>components/cmsadapter</module>
+    <module>components/contenthub</module>
+    <module>components/ontologymanager</module>
+    <module>components/reasoners</module>
+    <module>components/rules</module>
+    <module>components/zzshell</module> <!-- not really a component, but ... -->
+    
   </modules>
 
   <profiles>
diff --git a/bundlelists/reasoners/pom.xml b/bundlelists/reasoners/pom.xml
deleted file mode 100755
index 969bdab..0000000
--- a/bundlelists/reasoners/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 

-  license agreements. See the NOTICE file distributed with this work for additional 

-  information regarding copyright ownership. The ASF licenses this file to 

-  You under the Apache License, Version 2.0 (the "License"); you may not use 

-  this file except in compliance with the License. You may obtain a copy of 

-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 

-  by applicable law or agreed to in writing, software distributed under the 

-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 

-  OF ANY KIND, either express or implied. See the License for the specific 

-  language governing permissions and limitations under the License. -->

-<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>org.apache.stanbol</groupId>

-    <artifactId>stanbol-parent</artifactId>

-    <version>4-SNAPSHOT</version>

-    <relativePath>../../../parent</relativePath>

-  </parent>

-

-  <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId>

-  <version>0.10.0-SNAPSHOT</version>

-  <packaging>partialbundlelist</packaging>

-  

-  <name>Apache Stanbol Bundlelist for Reasoners</name>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

-

diff --git a/bundlelists/rules/pom.xml b/bundlelists/rules/pom.xml
deleted file mode 100755
index c8b2f51..0000000
--- a/bundlelists/rules/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Licensed to the Apache Software Foundation (ASF) under one or more

-  contributor license agreements.  See the NOTICE file distributed with

-  this work for additional information regarding copyright ownership.

-  The ASF licenses this file to You under the Apache License, Version 2.0

-  (the "License"); you may not use this file except in compliance with

-  the License.  You may obtain a copy of the License at

-

-      http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

--->

-<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>org.apache.stanbol</groupId>

-    <artifactId>stanbol-parent</artifactId>

-    <version>4-SNAPSHOT</version>

-    <relativePath>../../../parent</relativePath>

-  </parent>

-

-  <groupId>org.apache.stanbol</groupId>

-  <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>

-  <version>0.10.0-SNAPSHOT</version>

-  <packaging>partialbundlelist</packaging>

-  

-  <name>Apache Stanbol Bundlelist for Rules</name>

-

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.sling</groupId>

-        <artifactId>maven-launchpad-plugin</artifactId>

-      </plugin>

-    </plugins>

-  </build>

-</project>

diff --git a/bundlelists/runtime/default/pom.xml b/bundlelists/runtime/default/pom.xml
new file mode 100644
index 0000000..acecc86
--- /dev/null
+++ b/bundlelists/runtime/default/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>stanbol-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../../parent</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for the Stanbol default runtime</name>
+  <description>Provides the default runtime for Apache Stanbol</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/runtime/default
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/runtime/default
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  
+  <dependencies>
+    <dependency> <!-- tke the minimal runtime as base -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.minimal</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- LDPath and the LDPath Freemaker template -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web.ldpath</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- SPARQL Endpoint -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web.sparql</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- Solr and Solr RESTful service integration -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.web.solr</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+  
+</project>
diff --git a/bundlelists/runtime/default/src/main/bundles/list.xml b/bundlelists/runtime/default/src/main/bundles/list.xml
new file mode 100644
index 0000000..2645553
--- /dev/null
+++ b/bundlelists/runtime/default/src/main/bundles/list.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- 
+   *************************************************************************
+   Empty list as this is (for now) just used to merge some core lists 
+   ************************************************************************* 
+   -->
+
+</bundles>
\ No newline at end of file
diff --git a/bundlelists/runtime/minimal/pom.xml b/bundlelists/runtime/minimal/pom.xml
new file mode 100644
index 0000000..dcd7d6e
--- /dev/null
+++ b/bundlelists/runtime/minimal/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>stanbol-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../../parent</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.minimal</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Bundlelist for the Stanbol minimal runtime</name>
+  <description>Provides a minimal Stanbol runtime without LDpath template,
+    SPARQL endpoint, Solr RESTful service integration</description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/runtime/default
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/bundlelists/runtime/default
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.sling</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Felix Webconsole-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.dep.webconsole</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The DataFileProvider and -Tracker Services-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.datafileprovider</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- The Namespace prefix service-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.commons.nsprefix</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+  
+</project>
diff --git a/bundlelists/runtime/minimal/src/main/bundles/list.xml b/bundlelists/runtime/minimal/src/main/bundles/list.xml
new file mode 100644
index 0000000..2645553
--- /dev/null
+++ b/bundlelists/runtime/minimal/src/main/bundles/list.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<bundles>
+  <!-- 
+   *************************************************************************
+   Empty list as this is (for now) just used to merge some core lists 
+   ************************************************************************* 
+   -->
+
+</bundles>
\ No newline at end of file
diff --git a/full-war/pom.xml b/full-war/pom.xml
index c826017..0420c80 100644
--- a/full-war/pom.xml
+++ b/full-war/pom.xml
@@ -48,6 +48,7 @@
       <plugin>
         <groupId>org.apache.sling</groupId>
         <artifactId>maven-launchpad-plugin</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>prepare-package</id>
@@ -120,100 +121,85 @@
       <scope>runtime</scope>
     </dependency>
 
-    <!-- OSGi Framemework Bundle List -->
-    <dependency>
+    <!-- The dependencies of this launcher -->
+    <dependency> <!-- The default Stanbol runtime-->
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
     </dependency>
-
-    <!-- Stanbol Commons Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-    </dependency>
-    <!-- Security Support-->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol CMS Adapter Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-    </dependency>
-
-    <!-- Stanbol Contenthub Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-    </dependency>
-
-    <!-- Stanbol Data Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-    </dependency>
-    <dependency> <!-- include all OpenNLP models in the full launcher -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.opennlp</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol Enhancer Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Enhancer -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
       <version>0.11.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
     </dependency>
-
-    <!-- Stanbol Entityhub Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Entityhub -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
       <version>0.12.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
     </dependency>
-    
-    <!-- Stanbol Ontology Manager Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Contenthub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol CMS Adapter (for CMIS and JCR repositories) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Ontology Manager Component -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
     </dependency>
-
-    <!-- Stanbol Rules Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Reasoning Component -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Rules Component -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
     </dependency>
-    
-    <!-- Stanbol Reasoners Bundle List -->
+    <!-- Also add the Refactor Engine for the Enahncer-->
     <dependency>
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.refactor</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
+    </dependency>
+    
+    <!-- Stanbol Default Data and OpenNLP Models -->
+    <!--
+     NOTE: Not all data files are compatible with the Apache License. See the
+     referenced modules for details!
+     -->
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.default</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- include all OpenNLP models in the full launcher -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.opennlp</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- include sentiment analysis dictionaries -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.sentiment</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
     </dependency>
     
   </dependencies>
diff --git a/full/pom.xml b/full/pom.xml
index 4027f95..f44c131 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -63,11 +63,7 @@
       <plugin>
         <groupId>org.apache.sling</groupId>
         <artifactId>maven-launchpad-plugin</artifactId>
-        <!--
-          TODO the maven-launchpad-plugin can also generate a war file and
-          Karaf description, we could add this. See
-          http://sling.apache.org/site/maven-launchpad-plugin.html
-        -->
+        <version>2.2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>prepare-package</id>
@@ -148,136 +144,86 @@
       <classifier>app</classifier>
     </dependency>
     
-    <!-- OSGi Framemework Bundle List -->
-    <dependency>
+    <!-- The dependencies of this launcher -->
+    <dependency> <!-- The default Stanbol runtime-->
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-    
-    <!-- Stanbol Commons Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Security Support -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency> 
-    
-    <!-- zz> Shell Bundle List  --> 
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.zzshell</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol CMS Adapter Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol Contenthub Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
-      <version>0.11.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol Data Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency> <!-- include all OpenNLP models in the full launcher -->
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.opennlp</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol Enhancer Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Enhancer -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
       <version>0.11.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-
-    <!-- Stanbol Entityhub Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Entityhub -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
       <version>0.12.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-
-    <!-- Stanbol Ontology Manager Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Contenthub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol CMS Adapter (for CMIS and JCR repositories) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Ontology Manager Component -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-
-    <!-- Stanbol Rules Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-    
-    <!-- Stanbol Reasoners Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Reasoning Component -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-    
-    <!-- Language Extras -->
-    <!-- Basic Cinese language support (STANBOL-855 -->
-    <dependency>
+    <dependency> <!-- the Stanbol Rules Component -->
       <groupId>org.apache.stanbol</groupId>
-	  <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.smartcn</artifactId>
-	  <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.paoding</artifactId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
+    </dependency>
+    <!-- Also add the Refactor Engine for the Enahncer-->
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.engines.refactor</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    
+    
+    <!-- Stanbol Default Data and OpenNLP Models -->
+    <!-- 
+     NOTE: Not all data files are compatible with the Apache License. See the
+     referenced modules for details!
+     -->
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.default</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- include all OpenNLP models in the full launcher -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.opennlp</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- include sentiment analysis dictionaries -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.sentiment</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
     </dependency>
     
     
diff --git a/kres/README.md b/kres/README.md
new file mode 100644
index 0000000..c26315a
--- /dev/null
+++ b/kres/README.md
@@ -0,0 +1,29 @@
+Apache Stanbol Knowledge Representation and ReaSoning (KRES) Launcher
+=====================================================================
+
+The Knowledge Representation and ReaSoning (KRES) launcher includes the following Stanbol Components:
+
+* Ontology Manager: Allows to manage Ontologies, define Scopes used for Reasoning Sessions
+* Reasoning: Allows to use Scopes for OWL-DL reasoning
+* Rules: Supports the management and execution of Rules.
+
+
+To start this after building use:
+
+    java -Xmx1024M -jar target/org.apache.stanbol.launchers.kres-*-SNAPSHOT.jar
+
+The Stanbol Enhancer HTTP endpoint should then be available at 
+
+    http://localhost:8080
+
+
+__TODO:__ add simple usage example
+
+Configure any required parameter for the enhancement engines, at
+
+    http://localhost:8080/system/console/
+
+The OSGi state is stored in the ./stanbol folder.
+
+The logs are found at stanbol/logs/error.log and can be configured from the
+OSGi console.
diff --git a/kres/pom.xml b/kres/pom.xml
new file mode 100644
index 0000000..20ecfaa
--- /dev/null
+++ b/kres/pom.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>stanbol-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.kres</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Apache Stanbol Semantic Indexing Launcher: Knowledge Representation and ReaSoning (KRES) Launcher</name>
+  <description>
+    Stanbol Launcher that provides the Ontology Manager, Reasoning and Rules
+    Components.
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/kres/
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/kres/
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>.</directory>
+              <includes>
+                <include>stanbol/**</include>
+                <include>factstore/**</include>
+                <include>*.log</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>prepare-package</id>
+            <goals>
+              <goal>prepare-package</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+              <!-- Standalone jar requires an OSGi http service implementation -->
+              <jarWebSupport>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.http.jetty</artifactId>
+                <version>2.2.0</version>
+              </jarWebSupport>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.apache.stanbol.launchpad.Main</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.7.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+              <!-- Use this to in/exclude only specific dependencies -->
+                <includes>
+                  <include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+                  <include>org.apache.sling:org.apache.sling.launchpad.base:app</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes></excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <!-- The Apache Stanbol lauchpad -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.launchpad</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <!-- maven-launchpad-plugin builds on the launchpad.base app -->
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.launchpad.base</artifactId>
+      <classifier>app</classifier>
+    </dependency>
+
+    <!-- The dependencies of this launcher -->
+    <!-- NOTE also the additional Bundle in src/main/bundles/list.xml -->
+    <dependency> <!-- The default Stanbol runtime-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Ontology Manager Component -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Reasoning Component -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Rules Component -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/kres/src/main/bundles/list.xml b/kres/src/main/bundles/list.xml
new file mode 100644
index 0000000..1a4a04b
--- /dev/null
+++ b/kres/src/main/bundles/list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+  <!--
+    Additional Bundles used by the Kres Launcher.
+  -->
+<bundles>
+  <!-- Default ontology registries used by the Ontology Manager Component -->
+  <startLevel level="30">
+    <bundle> 
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.data.registries.default</artifactId>
+      <version>1.2.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+</bundles>
diff --git a/kres/src/main/sling/common.properties b/kres/src/main/sling/common.properties
new file mode 100644
index 0000000..da96da8
--- /dev/null
+++ b/kres/src/main/sling/common.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file is loaded by Apache Sling during startup. Properties defined
+# in this file are copied over to the sling.properties file in the {sling.home}
+# directory.
+
+# The stanbol home directory
+# by default this is set to the same value as sling.home
+stanbol.home=${sling.home}
+org.osgi.framework.startlevel.beginning=40
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..0c19660
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>stanbol-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>apache-stanbol-new-launchers</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  
+  <name>Apache Stanbol New Launchers Branch</name>
+  <description>
+    Pseudo project to build the New Launchers Branch
+  </description>  
+
+  <inceptionYear>2013</inceptionYear>
+  <licenses>
+    <license>
+      <name>Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+      <comments>A business-friendly OSS license</comments>
+    </license>
+  </licenses>  
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/branches/stanbol-new-launchers
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/branches/stanbol-new-launchers
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+  
+  <modules>
+    <!-- The Bundlelists -->
+    <module>bundlelists</module>
+    <!-- The different Stanbol Launchers -->
+    <module>stateless</module>
+    <module>semindex</module>
+    <module>kres</module>
+    <module>stable</module>
+    <module>full</module>
+    <module>full-war</module>
+  </modules>
+
+</project>
diff --git a/semindex/README.md b/semindex/README.md
new file mode 100644
index 0000000..e949b18
--- /dev/null
+++ b/semindex/README.md
@@ -0,0 +1,31 @@
+Apache Stanbol Semantic Indexing Launcher
+=========================================
+
+This launcher includes the Stanbol Semantic Indexing Launcher. This includes:
+
+* Stanbol Enhancer: For extracting Knowledge from parsed Content
+* Stanbol Entityhub: For managing domain Vocabularies of Entities users want to extract from parsed Content
+* Stanbol Entityhub: For semantic indexing and semantic search over processed Content.
+
+
+To start this after building use:
+
+    java -Xmx1024M -jar target/org.apache.stanbol.launchers.semindex-*-SNAPSHOT.jar
+
+The Stanbol Enhancer HTTP endpoint should then be available at 
+
+    http://localhost:8080
+
+So that you can POST content using, for example:
+
+__TODO:__ add typical usage scenario (curl commands)
+
+
+Configure any required parameter for the enhancement engines, at
+
+    http://localhost:8080/system/console/
+
+The OSGi state is stored in the ./stanbol folder.
+
+The logs are found at stanbol/logs/error.log and can be configured from the
+OSGi console.
diff --git a/semindex/pom.xml b/semindex/pom.xml
new file mode 100644
index 0000000..3ef053c
--- /dev/null
+++ b/semindex/pom.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>stanbol-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.semindex</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Apache Stanbol Semantic Indexing Launcher: Enhancer, Entityhub, COntenthub and CMS Adapter</name>
+  <description>
+    Stanbol Launcher that provides the Enhancer, Entityhub and Contenthub Components
+    as typically required for Semantic Indexing use cases. NOTE that this launcher
+    comes without any default configuration, OpenNLP language models. Users will
+    typically want to provide the configuration by using the SLing File Installer
+    (by copying the configuration to the {working-directory}/stanbol/fileinstall
+    directory).
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/semindex/
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/semindex/
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>.</directory>
+              <includes>
+                <include>stanbol/**</include>
+                <include>factstore/**</include>
+                <include>*.log</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>prepare-package</id>
+            <goals>
+              <goal>prepare-package</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+              <!-- Standalone jar requires an OSGi http service implementation -->
+              <jarWebSupport>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.http.jetty</artifactId>
+                <version>2.2.0</version>
+              </jarWebSupport>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.apache.stanbol.launchpad.Main</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.7.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+              <!-- Use this to in/exclude only specific dependencies -->
+                <includes>
+                  <include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+                  <include>org.apache.sling:org.apache.sling.launchpad.base:app</include>
+                </includes>
+              </artifactSet>
+              <!-- transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+              </transformers -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes></excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <!-- The Apache Stanbol lauchpad -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.launchpad</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <!-- maven-launchpad-plugin builds on the launchpad.base app -->
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.launchpad.base</artifactId>
+      <classifier>app</classifier>
+    </dependency>
+
+    <!-- The dependencies of this launcher -->
+    <dependency> <!-- The default Stanbol runtime-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Enhancer -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Entityhub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Contenthub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol CMS Adapter (for CMIS and JCR repositories) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/semindex/src/main/bundles/list.xml b/semindex/src/main/bundles/list.xml
new file mode 100644
index 0000000..4784c1c
--- /dev/null
+++ b/semindex/src/main/bundles/list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+  <!--
+    List of initial bundles for the Stanbol Sling-based standalone launcher.
+  -->
+<bundles>
+  <!-- General-purpose libraries -->
+
+  <!-- *********************************************************************
+          start level 20 TO 24 reserved for Stanbol Framework
+          (Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
+       ********************************************************************* -->
+
+    
+
+  <!-- *********************************************************************
+          start level >= 30 are unused
+       ********************************************************************* -->
+
+</bundles>
diff --git a/semindex/src/main/sling/common.properties b/semindex/src/main/sling/common.properties
new file mode 100644
index 0000000..da96da8
--- /dev/null
+++ b/semindex/src/main/sling/common.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file is loaded by Apache Sling during startup. Properties defined
+# in this file are copied over to the sling.properties file in the {sling.home}
+# directory.
+
+# The stanbol home directory
+# by default this is set to the same value as sling.home
+stanbol.home=${sling.home}
+org.osgi.framework.startlevel.beginning=40
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall
diff --git a/stable/README.md b/stable/README.md
index 38dbddc..ed13a62 100644
--- a/stable/README.md
+++ b/stable/README.md
@@ -1,8 +1,9 @@
-This module builds a runnable Stanbol jar using the Sling Launchpad Maven plugin,
-including the bundles defined at src/main/bundles/list.xml.
+Stanbol Stable Launcher
+=======================
 
-This launcher includes only Stanbol components that were agreed on being stable
-components.
+This launcher is similar to the [Sateless](../stateless) but includes the DBpedia default data index as well as OpenNLP language models. It also comes with a default configuration providing some Enhancement Chains.
+
+Users that want to get started with Apache Stanbol should prefer this launcher over the stateless.
 
 To start this after building use:
 
diff --git a/stable/pom.xml b/stable/pom.xml
index ef5f1fd..d7e96f1 100644
--- a/stable/pom.xml
+++ b/stable/pom.xml
@@ -64,11 +64,7 @@
       <plugin>
         <groupId>org.apache.sling</groupId>
         <artifactId>maven-launchpad-plugin</artifactId>
-        <!--
-          TODO the maven-launchpad-plugin can also generate a war file and
-          Karaf description, we could add this. See
-          http://sling.apache.org/site/maven-launchpad-plugin.html
-        -->
+        <version>2.2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>prepare-package</id>
@@ -147,52 +143,41 @@
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.launchpad.base</artifactId>
       <classifier>app</classifier>
-      <scope>provided</scope>
     </dependency>
 
-    <!-- OSGi Framemework Bundle List -->
-    <dependency>
+    <!-- The dependencies of this launcher -->
+    <dependency> <!-- The default Stanbol runtime-->
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
       <version>0.10.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-
-    <!-- Stanbol Commons Bundle List -->
-    <dependency>
-      <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Stanbol Enhancer Bundle List -->
-    <dependency>
+    <dependency> <!-- the Stanbol Enhancer -->
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
       <version>0.11.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
+    </dependency>
+    <dependency> <!-- the Stanbol Entityhub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
     </dependency>
 
     <!-- Stanbol Data Bundle List -->
     <dependency>
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.default</artifactId>
       <version>1.1.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
-
-    <!-- Stanbol Entityhub Bundle List -->
+    <!-- Stanbol Data Bundle List -->
     <dependency>
       <groupId>org.apache.stanbol</groupId>
-      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.data.opennlp</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
       <type>partialbundlelist</type>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 
diff --git a/stateless/README.md b/stateless/README.md
new file mode 100644
index 0000000..68f946d
--- /dev/null
+++ b/stateless/README.md
@@ -0,0 +1,28 @@
+Apache Stanbol Stateless Launcher
+============
+
+This defines a Stanbol Launcher configuration for the Stateless Content Enhancement Usage Scenarion. It includes the _Stanbol Enhancer_ and the _Stanbol Entityhub_ component.
+
+
+To start this after building use:
+
+    java -Xmx512M -jar target/org.apache.stanbol.launchers.stateless-*-SNAPSHOT.jar
+
+The Stanbol Enhancer HTTP endpoint should then be available at 
+
+    http://localhost:8080
+
+So that you can POST content using, for example:
+
+    curl -H "Content-Type: text/plain" \
+        -T {content}.txt \
+        http://localhost:8080/engines
+
+Configure any required parameter for the enhancement engines, at
+
+    http://localhost:8080/system/console/
+
+The OSGi state is stored in the ./stanbol folder.
+
+The logs are found at stanbol/logs/error.log and can be configured from the
+OSGi console.
diff --git a/stateless/pom.xml b/stateless/pom.xml
new file mode 100644
index 0000000..794658f
--- /dev/null
+++ b/stateless/pom.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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>org.apache.stanbol</groupId>
+    <artifactId>stanbol-parent</artifactId>
+    <version>4-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
+  </parent>
+
+  <groupId>org.apache.stanbol</groupId>
+  <artifactId>org.apache.stanbol.launchers.stateless</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Apache Stanbol Stateless Launcher: Enhancer, Entityhub</name>
+  <description>
+    Stanbol Launcher that provides the Enhancer and Entityhub Components
+    without any default configuration, OpenNLP language models. Users will
+    typically want to provide the configuration by using the SLing File Installer
+    (by copying the configuration to the {working-directory}/stanbol/fileinstall
+    directory).
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/launchers/stateless/
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/launchers/stateless/
+    </developerConnection>
+    <url>http://stanbol.apache.org/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>.</directory>
+              <includes>
+                <include>stanbol/**</include>
+                <include>factstore/**</include>
+                <include>*.log</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>prepare-package</id>
+            <goals>
+              <goal>prepare-package</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+              <!-- Standalone jar requires an OSGi http service implementation -->
+              <jarWebSupport>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.http.jetty</artifactId>
+                <version>2.2.0</version>
+              </jarWebSupport>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.apache.stanbol.launchpad.Main</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.7.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+              <!-- Use this to in/exclude only specific dependencies -->
+                <includes>
+                  <include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+                  <include>org.apache.sling:org.apache.sling.launchpad.base:app</include>
+                </includes>
+              </artifactSet>
+              <!-- transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+              </transformers -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes></excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <!-- The Apache Stanbol lauchpad -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.launchpad</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <!-- maven-launchpad-plugin builds on the launchpad.base app -->
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.launchpad.base</artifactId>
+      <classifier>app</classifier>
+    </dependency>
+
+    <!-- The dependencies of this launcher -->
+    <dependency> <!-- The default Stanbol runtime-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.runtime.default</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Enhancer -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+    <dependency> <!-- the Stanbol Entityhub -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/stateless/src/main/bundles/list.xml b/stateless/src/main/bundles/list.xml
new file mode 100644
index 0000000..4784c1c
--- /dev/null
+++ b/stateless/src/main/bundles/list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+  <!--
+    List of initial bundles for the Stanbol Sling-based standalone launcher.
+  -->
+<bundles>
+  <!-- General-purpose libraries -->
+
+  <!-- *********************************************************************
+          start level 20 TO 24 reserved for Stanbol Framework
+          (Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
+       ********************************************************************* -->
+
+    
+
+  <!-- *********************************************************************
+          start level >= 30 are unused
+       ********************************************************************* -->
+
+</bundles>
diff --git a/stateless/src/main/sling/common.properties b/stateless/src/main/sling/common.properties
new file mode 100644
index 0000000..da96da8
--- /dev/null
+++ b/stateless/src/main/sling/common.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file is loaded by Apache Sling during startup. Properties defined
+# in this file are copied over to the sling.properties file in the {sling.home}
+# directory.
+
+# The stanbol home directory
+# by default this is set to the same value as sling.home
+stanbol.home=${sling.home}
+org.osgi.framework.startlevel.beginning=40
+# set the sling file installer dir to {working-dir}/stanbol/fileinstall
+sling.fileinstall.dir=${sling.home}/fileinstall