diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1907c39
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.classpath
+.project
+*.vlt
+.settings/
+target/
diff --git a/README.md b/README.md
index df71051..e0c024a 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,19 @@
 CQ Commerce implementation sample
-=======================
+=================================
 
 A simple example that shows how to implement the CQ Commerce API.
 
 This content package provides a bundle with a new custom implementation of the CQ Commerce API.
 The bundle doesn't provide any particular extension; it just help understanding how to set it up and define it as the commerce provider.
 
+Prerequisites
+=============
+
+A clean installation of Adobe Experience Manager 5.6.1 with the Geometrixx Outdoors demo site.
+
 Installation
 ===========
 
-mvn clean install -P installPackage
+    mvn clean install -P installPackage
 
-change /content/geometrixx-outdoors/en/jcr:content/cq:commerceProvider value to 'training'
+Change `/content/geometrixx-outdoors/en/jcr:content/cq:commerceProvider` value from `geometrixx` to `training` and then view a commerce page such as [http://localhost:4502/cf#/content/geometrixx-outdoors/en/equipment/skiing/banff-snow.html](http://localhost:4502/cf#/content/geometrixx-outdoors/en/equipment/skiing/banff-snow.html)
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 5dc0673..dc2a053 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -28,6 +28,9 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
+                <configuration>
+                    <specVersion>1.2</specVersion>
+                </configuration>
                 <executions>
                     <execution>
                         <id>generate-scr-descriptor</id>
@@ -144,7 +147,7 @@
         <dependency>
             <groupId>com.adobe.cq.commerce</groupId>
             <artifactId>cq-commerce-core</artifactId>
-            <version>5.6.8</version>
+            <version>5.6.18</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceFactory.java b/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceFactory.java
index 621c7c7..c52b4f9 100644
--- a/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceFactory.java
+++ b/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceFactory.java
@@ -27,7 +27,7 @@ public class TrainingCommerceServiceFactory extends AbstractJcrCommerceServiceFa
      * Create a new <code>TrainingCommerceServiceImpl</code>.
      */
 	public CommerceService getCommerceService(Resource res) {
-		return new TrainingCommerceServiceImpl(getServices(), res);
+		return new TrainingCommerceServiceImpl(getServiceContext(), res);
 	}
 
 }
diff --git a/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceImpl.java b/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceImpl.java
index 06e052e..e2501d7 100644
--- a/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceImpl.java
+++ b/bundle/src/main/java/com/adobe/training/TrainingCommerceServiceImpl.java
@@ -1,6 +1,8 @@
 package com.adobe.training;
 
 import java.util.List;
+
+import com.adobe.cq.commerce.common.ServiceContext;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.resource.Resource;
@@ -22,8 +24,8 @@ public class TrainingCommerceServiceImpl extends AbstractJcrCommerceService impl
 	private Resource resource;
     private ResourceResolver resolver;
     
-    public TrainingCommerceServiceImpl(AbstractJcrCommerceServiceFactory.Services services, Resource res) {
-        super(services);
+    public TrainingCommerceServiceImpl(ServiceContext serviceContext, Resource res) {
+        super(serviceContext);
         this.resource = res;
         this.resolver = res.getResourceResolver();
     }
@@ -60,5 +62,8 @@ public CommerceResult search(CommerceQuery arg0) throws CommerceException {
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
+    public boolean isAvailable(String s) {
+        return true;
+    }
 }
diff --git a/bundle/target/classes/META-INF/MANIFEST.MF b/bundle/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 00432b4..0000000
--- a/bundle/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1363621758014
-Build-Jdk: 1.6.0_43
-Built-By: paolomoz
-Bundle-Description: Maven Multimodule project for Commerce Training Bund
- le.
-Bundle-ManifestVersion: 2
-Bundle-Name: Commerce Training Bundle Bundle
-Bundle-SymbolicName: com.adobe.training.commerce-training-bundle
-Bundle-Version: 1.0.0.SNAPSHOT
-Created-By: Apache Maven Bundle Plugin
-Export-Package: com.adobe.training;uses:="org.osgi.framework,org.osgi.se
- rvice.component,org.slf4j,com.adobe.cq.commerce.common,com.adobe.cq.com
- merce.api,org.apache.sling.api.resource,org.apache.sling.api,com.adobe.
- cq.commerce.api.promotion,javax.jcr,com.adobe.cq.commerce.common.promot
- ion,com.day.cq.personalization,org.apache.jackrabbit.api.security.user,
- com.day.cq.commons.jcr,com.adobe.granite.security.user,org.apache.jackr
- abbit.api,com.day.cq.wcm.api";version="1.0.0.SNAPSHOT"
-Import-Package: com.adobe.cq.commerce.api;version="[1.1,2)",com.adobe.cq
- .commerce.api.promotion;version="[1.0,2)",com.adobe.cq.commerce.common;
- version="[1.1,2)",com.adobe.cq.commerce.common.promotion;version="[1.0,
- 2)",com.adobe.granite.security.user,com.day.cq.commons.jcr,com.day.cq.p
- ersonalization,com.day.cq.wcm.api,javax.jcr;version="[2.0,3)",org.apach
- e.jackrabbit.api;version="[2.3,3)",org.apache.jackrabbit.api.security.u
- ser;version="[2.3,3)",org.apache.sling.api;version="[2.1,3)",org.apache
- .sling.api.resource;version="[2.1,3)",org.osgi.framework;version="[1.5,
- 2)",org.osgi.service.component;version="[1.1,2)",org.slf4j;version="[1.
- 5,2)"
-Service-Component: OSGI-INF/serviceComponents.xml
-Tool: Bnd-1.50.0
diff --git a/bundle/target/classes/com/adobe/training/SimpleDSComponent.class b/bundle/target/classes/com/adobe/training/SimpleDSComponent.class
deleted file mode 100644
index f4774e8..0000000
Binary files a/bundle/target/classes/com/adobe/training/SimpleDSComponent.class and /dev/null differ
diff --git a/bundle/target/classes/com/adobe/training/TrainingCommerceServiceFactory.class b/bundle/target/classes/com/adobe/training/TrainingCommerceServiceFactory.class
deleted file mode 100644
index ffbe03c..0000000
Binary files a/bundle/target/classes/com/adobe/training/TrainingCommerceServiceFactory.class and /dev/null differ
diff --git a/bundle/target/classes/com/adobe/training/TrainingCommerceServiceImpl.class b/bundle/target/classes/com/adobe/training/TrainingCommerceServiceImpl.class
deleted file mode 100644
index e57a3f4..0000000
Binary files a/bundle/target/classes/com/adobe/training/TrainingCommerceServiceImpl.class and /dev/null differ
diff --git a/bundle/target/classes/com/adobe/training/TrainingCommerceSessionImpl.class b/bundle/target/classes/com/adobe/training/TrainingCommerceSessionImpl.class
deleted file mode 100644
index a4995df..0000000
Binary files a/bundle/target/classes/com/adobe/training/TrainingCommerceSessionImpl.class and /dev/null differ
diff --git a/bundle/target/classes/com/adobe/training/TrainingProductImpl.class b/bundle/target/classes/com/adobe/training/TrainingProductImpl.class
deleted file mode 100644
index 2c9c2cf..0000000
Binary files a/bundle/target/classes/com/adobe/training/TrainingProductImpl.class and /dev/null differ
diff --git a/bundle/target/commerce-training-bundle-1.0-SNAPSHOT.jar b/bundle/target/commerce-training-bundle-1.0-SNAPSHOT.jar
deleted file mode 100644
index a2d87cd..0000000
Binary files a/bundle/target/commerce-training-bundle-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/bundle/target/scr-plugin-generated/OSGI-INF/metatype/metatype.xml b/bundle/target/scr-plugin-generated/OSGI-INF/metatype/metatype.xml
deleted file mode 100644
index 4affe50..0000000
--- a/bundle/target/scr-plugin-generated/OSGI-INF/metatype/metatype.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
-    <OCD id="com.adobe.training.SimpleDSComponent" name="%com.adobe.training.SimpleDSComponent.name" description="%com.adobe.training.SimpleDSComponent.description"/>
-    <OCD id="com.adobe.training.TrainingCommerceServiceFactory" name="Day CQ Commerce Factory for Training" description="%com.adobe.training.TrainingCommerceServiceFactory.description">
-        <AD id="commerceProvider" type="String" default="training" name="%commerceProvider.name" description="%commerceProvider.description"/>
-    </OCD>
-    <Designate pid="com.adobe.training.SimpleDSComponent">
-        <Object ocdref="com.adobe.training.SimpleDSComponent"/>
-    </Designate>
-    <Designate pid="com.adobe.training.TrainingCommerceServiceFactory">
-        <Object ocdref="com.adobe.training.TrainingCommerceServiceFactory"/>
-    </Designate>
-</metatype:MetaData>
diff --git a/bundle/target/scr-plugin-generated/OSGI-INF/scr-plugin/scrinfo.xml b/bundle/target/scr-plugin-generated/OSGI-INF/scr-plugin/scrinfo.xml
deleted file mode 100644
index b64d4a8..0000000
--- a/bundle/target/scr-plugin-generated/OSGI-INF/scr-plugin/scrinfo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <scr:component enabled="true" name="com.adobe.training.SimpleDSComponent">
-        <implementation class="com.adobe.training.SimpleDSComponent"/>
-        <service servicefactory="false">
-            <provide interface="java.lang.Runnable"/>
-        </service>
-        <property name="service.pid" value="com.adobe.training.SimpleDSComponent" private="false"/>
-    </scr:component>
-    <scr:component enabled="true" name="com.adobe.training.TrainingCommerceServiceFactory">
-        <implementation class="com.adobe.training.TrainingCommerceServiceFactory"/>
-        <service servicefactory="false">
-            <provide interface="com.adobe.cq.commerce.api.CommerceServiceFactory"/>
-        </service>
-        <property name="service.description" type="String" value="Factory for training commerce service" private="false"/>
-        <property name="commerceProvider" type="String" value="training" private="false"/>
-        <property name="service.vendor" type="String" value="Day Management AG" private="false"/>
-        <property name="service.pid" value="com.adobe.training.TrainingCommerceServiceFactory" private="false"/>
-        <reference name="languageManager" interface="com.day.cq.wcm.api.LanguageManager" cardinality="1..1" policy="static" bind="bindLanguageManager" unbind="unbindLanguageManager" checked="true" strategy="event"/>
-        <reference name="userPropertiesService" interface="com.adobe.granite.security.user.UserPropertiesService" cardinality="1..1" policy="static" bind="bindUserPropertiesService" unbind="unbindUserPropertiesService" checked="true" strategy="event"/>
-        <reference name="slingSettingsService" interface="org.apache.sling.settings.SlingSettingsService" cardinality="1..1" policy="static" bind="bindSlingSettingsService" unbind="unbindSlingSettingsService" checked="true" strategy="event"/>
-        <reference name="slingRepository" interface="org.apache.sling.jcr.api.SlingRepository" cardinality="1..1" policy="static" bind="bindSlingRepository" unbind="unbindSlingRepository" checked="true" strategy="event"/>
-    </scr:component>
-</components>
diff --git a/bundle/target/scr-plugin-generated/OSGI-INF/serviceComponents.xml b/bundle/target/scr-plugin-generated/OSGI-INF/serviceComponents.xml
deleted file mode 100644
index 7c1e901..0000000
--- a/bundle/target/scr-plugin-generated/OSGI-INF/serviceComponents.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <scr:component enabled="true" name="com.adobe.training.SimpleDSComponent">
-        <implementation class="com.adobe.training.SimpleDSComponent"/>
-        <service servicefactory="false">
-            <provide interface="java.lang.Runnable"/>
-        </service>
-        <property name="service.pid" value="com.adobe.training.SimpleDSComponent"/>
-    </scr:component>
-    <scr:component enabled="true" name="com.adobe.training.TrainingCommerceServiceFactory">
-        <implementation class="com.adobe.training.TrainingCommerceServiceFactory"/>
-        <service servicefactory="false">
-            <provide interface="com.adobe.cq.commerce.api.CommerceServiceFactory"/>
-        </service>
-        <property name="service.description" type="String" value="Factory for training commerce service"/>
-        <property name="commerceProvider" type="String" value="training"/>
-        <property name="service.vendor" type="String" value="Day Management AG"/>
-        <property name="service.pid" value="com.adobe.training.TrainingCommerceServiceFactory"/>
-        <reference name="languageManager" interface="com.day.cq.wcm.api.LanguageManager" cardinality="1..1" policy="static" bind="bindLanguageManager" unbind="unbindLanguageManager"/>
-        <reference name="userPropertiesService" interface="com.adobe.granite.security.user.UserPropertiesService" cardinality="1..1" policy="static" bind="bindUserPropertiesService" unbind="unbindUserPropertiesService"/>
-        <reference name="slingSettingsService" interface="org.apache.sling.settings.SlingSettingsService" cardinality="1..1" policy="static" bind="bindSlingSettingsService" unbind="unbindSlingSettingsService"/>
-        <reference name="slingRepository" interface="org.apache.sling.jcr.api.SlingRepository" cardinality="1..1" policy="static" bind="bindSlingRepository" unbind="unbindSlingRepository"/>
-    </scr:component>
-</components>
diff --git a/bundle/target/surefire-reports/TEST-com.adobe.training.SimpleUnitTest.xml b/bundle/target/surefire-reports/TEST-com.adobe.training.SimpleUnitTest.xml
deleted file mode 100644
index e79d0ab..0000000
--- a/bundle/target/surefire-reports/TEST-com.adobe.training.SimpleUnitTest.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.004" errors="0" skipped="0" tests="1" name="com.adobe.training.SimpleUnitTest">
-  <properties>
-    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
-    <property name="sun.boot.library.path" value="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Libraries"/>
-    <property name="java.vm.version" value="20.14-b01-447"/>
-    <property name="awt.nativeDoubleBuffering" value="true"/>
-    <property name="gopherProxySet" value="false"/>
-    <property name="mrj.build" value="11M4203"/>
-    <property name="java.vm.vendor" value="Apple Inc."/>
-    <property name="java.vendor.url" value="http://www.apple.com/"/>
-    <property name="path.separator" value=":"/>
-    <property name="guice.disable.misplaced.annotation.check" value="true"/>
-    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
-    <property name="file.encoding.pkg" value="sun.io"/>
-    <property name="user.country" value="US"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="sun.os.patch.level" value="unknown"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="user.dir" value="/Users/paolomoz/code/cqgems/commerce-training"/>
-    <property name="java.runtime.version" value="1.6.0_43-b01-447-11M4203"/>
-    <property name="java.awt.graphicsenv" value="apple.awt.CGraphicsEnvironment"/>
-    <property name="java.endorsed.dirs" value="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/endorsed"/>
-    <property name="os.arch" value="x86_64"/>
-    <property name="java.io.tmpdir" value="/var/folders/vk/_ndndrpj6855_00wqj15hrkr0000gn/T/"/>
-    <property name="line.separator" value="
-"/>
-    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
-    <property name="os.name" value="Mac OS X"/>
-    <property name="classworlds.conf" value="/usr/share/maven/bin/m2.conf"/>
-    <property name="sun.jnu.encoding" value="MacRoman"/>
-    <property name="java.library.path" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="java.class.version" value="50.0"/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="os.version" value="10.8.2"/>
-    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="user.home" value="/Users/paolomoz"/>
-    <property name="user.timezone" value="Europe/Brussels"/>
-    <property name="java.awt.printerjob" value="apple.awt.CPrinterJob"/>
-    <property name="java.specification.version" value="1.6"/>
-    <property name="file.encoding" value="MacRoman"/>
-    <property name="user.name" value="paolomoz"/>
-    <property name="java.class.path" value="/usr/share/maven/boot/plexus-classworlds-2.4.jar"/>
-    <property name="java.vm.specification.version" value="1.0"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="java.home" value="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"/>
-    <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher clean install -P installPackage"/>
-    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
-    <property name="user.language" value="en"/>
-    <property name="awt.toolkit" value="apple.awt.CToolkit"/>
-    <property name="java.vm.info" value="mixed mode"/>
-    <property name="java.version" value="1.6.0_43"/>
-    <property name="java.ext.dirs" value="/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext"/>
-    <property name="sun.boot.class.path" value="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsfd.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/ui.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/laf.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/sunrsasign.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsse.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jce.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/charsets.jar"/>
-    <property name="java.vendor" value="Apple Inc."/>
-    <property name="maven.home" value="/usr/share/maven"/>
-    <property name="file.separator" value="/"/>
-    <property name="java.vendor.url.bug" value="http://bugreport.apple.com/"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
-    <property name="mrj.version" value="1070.1.6.0_43-447"/>
-    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="sun.cpu.isalist" value=""/>
-  </properties>
-  <testcase time="0.004" classname="com.adobe.training.SimpleUnitTest" name="someTest"/>
-</testsuite>
\ No newline at end of file
diff --git a/bundle/target/surefire-reports/com.adobe.training.SimpleUnitTest.txt b/bundle/target/surefire-reports/com.adobe.training.SimpleUnitTest.txt
deleted file mode 100644
index 126d4c0..0000000
--- a/bundle/target/surefire-reports/com.adobe.training.SimpleUnitTest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.adobe.training.SimpleUnitTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec
diff --git a/bundle/target/test-classes/com/adobe/training/SimpleUnitTest.class b/bundle/target/test-classes/com/adobe/training/SimpleUnitTest.class
deleted file mode 100644
index 1fea81a..0000000
Binary files a/bundle/target/test-classes/com/adobe/training/SimpleUnitTest.class and /dev/null differ
diff --git a/content/target/classes/apps/commerce-training/config/put-your-configs-here.txt b/content/target/classes/apps/commerce-training/config/put-your-configs-here.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/content/target/classes/apps/commerce-training/install/bundle-will-go-here.txt b/content/target/classes/apps/commerce-training/install/bundle-will-go-here.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/content/target/commerce-training-content-1.0-SNAPSHOT.zip b/content/target/commerce-training-content-1.0-SNAPSHOT.zip
deleted file mode 100644
index 2b536e7..0000000
Binary files a/content/target/commerce-training-content-1.0-SNAPSHOT.zip and /dev/null differ
diff --git a/content/target/maven-archiver/pom.properties b/content/target/maven-archiver/pom.properties
deleted file mode 100644
index 126da05..0000000
--- a/content/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Mar 18 16:49:18 CET 2013
-version=1.0-SNAPSHOT
-groupId=com.adobe.training
-artifactId=commerce-training-content
diff --git a/content/target/vault-work/META-INF/vault/config.xml b/content/target/vault-work/META-INF/vault/config.xml
deleted file mode 100644
index ad93727..0000000
--- a/content/target/vault-work/META-INF/vault/config.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-  Copyright 2012 Adobe Systems Incorporated
-
-  Licensed 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.
-  -->
-<vaultfs version="1.1">
-    <!--
-        Defines the content aggregation. The order of the defined aggregates
-        is important for finding the correct aggregator.
-    -->
-    <aggregates>
-        <!--
-            Defines an aggregate that handles nt:file and nt:resource nodes.
-        -->
-        <aggregate type="file" title="File Aggregate"/>
-
-        <!--
-            Defines an aggregate that handles file/folder like nodes. It matches
-            all nt:hierarchyNode nodes that have or define a jcr:content
-            child node and excludes child nodes that are nt:hierarchyNodes.
-        -->
-        <aggregate type="filefolder" title="File/Folder Aggregate"/>
-
-        <!--
-            Defines an aggregate that handles nt:nodeType nodes and serializes
-            them into .cnd notation.
-        -->
-        <aggregate type="nodetype" title="Node Type Aggregate" />
-
-        <!--
-            Defines an aggregate that defines full coverage for certain node
-            types that cannot be covered by the default aggregator.
-        -->
-        <aggregate type="full" title="Full Coverage Aggregate">
-            <matches>
-                <include nodeType="rep:AccessControl" respectSupertype="true" />
-                <include nodeType="cq:Widget" respectSupertype="true" />
-                <include nodeType="cq:WidgetCollection" respectSupertype="true" />
-                <include nodeType="cq:EditConfig" respectSupertype="true" />
-                <include nodeType="cq:WorkflowModel" respectSupertype="true" />
-                <include nodeType="vlt:FullCoverage" respectSupertype="true" />
-                <include nodeType="mix:language" respectSupertype="true" />
-                <include nodeType="sling:OsgiConfig" respectSupertype="true" />
-            </matches>
-        </aggregate>
-
-        <!--
-            Defines an aggregate that handles nt:folder like nodes.
-        -->
-        <aggregate type="generic" title="Folder Aggregate">
-            <matches>
-                <include nodeType="nt:folder" respectSupertype="true" />
-            </matches>
-            <contains>
-                <exclude isNode="true" />
-            </contains>
-        </aggregate>
-
-        <!--
-            Defines the default aggregate
-        -->
-        <aggregate type="generic" title="Default Aggregator" isDefault="true">
-            <contains>
-                <exclude nodeType="nt:hierarchyNode" respectSupertype="true" />
-            </contains>
-            <matches>
-                <!-- all -->
-            </matches>
-        </aggregate>
-
-    </aggregates>
-
-    <!--
-      defines the input handlers
-    -->
-    <handlers>
-        <handler type="folder"/>
-        <handler type="file"/>
-        <handler type="nodetype"/>
-        <handler type="generic"/>
-    </handlers>
-</vaultfs>
\ No newline at end of file
diff --git a/content/target/vault-work/META-INF/vault/definition/.content.xml b/content/target/vault-work/META-INF/vault/definition/.content.xml
deleted file mode 100644
index 2edc22d..0000000
--- a/content/target/vault-work/META-INF/vault/definition/.content.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2012 Adobe Systems Incorporated
-
-  Licensed 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.
-  -->
-<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
-    jcr:primaryType="vlt:PackageDefinition">
-    <thumbnail.png/>
-</jcr:root>
\ No newline at end of file
diff --git a/content/target/vault-work/META-INF/vault/definition/thumbnail.png b/content/target/vault-work/META-INF/vault/definition/thumbnail.png
deleted file mode 100644
index 0cc982c..0000000
Binary files a/content/target/vault-work/META-INF/vault/definition/thumbnail.png and /dev/null differ
diff --git a/content/target/vault-work/META-INF/vault/filter.xml b/content/target/vault-work/META-INF/vault/filter.xml
deleted file mode 100644
index 70289ef..0000000
--- a/content/target/vault-work/META-INF/vault/filter.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workspaceFilter version="1.0">
-    <filter root="/apps/commerce-training" />
-</workspaceFilter>
\ No newline at end of file
diff --git a/content/target/vault-work/META-INF/vault/properties.xml b/content/target/vault-work/META-INF/vault/properties.xml
deleted file mode 100644
index b9e6307..0000000
--- a/content/target/vault-work/META-INF/vault/properties.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-<comment>Commerce Training Bundle Package</comment>
-<entry key="createdBy">paolomoz</entry>
-<entry key="name">commerce-training-content</entry>
-<entry key="created">2013-03-18T16:49:18.647+0100</entry>
-<entry key="groupId">com.adobe.training</entry>
-<entry key="version">1.0-SNAPSHOT</entry>
-<entry key="requiresRoot">false</entry>
-<entry key="group">adobe/training</entry>
-<entry key="description">Maven Multimodule project for Commerce Training Bundle.</entry>
-<entry key="artifactId">commerce-training-content</entry>
-<entry key="path">/etc/packages/adobe/training/commerce-training-content.zip</entry>
-</properties>
diff --git a/content/target/vault-work/META-INF/vault/settings.xml b/content/target/vault-work/META-INF/vault/settings.xml
deleted file mode 100644
index 5bc7e40..0000000
--- a/content/target/vault-work/META-INF/vault/settings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2012 Adobe Systems Incorporated
-
-  Licensed 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.
-  -->
-<vault version="1.0">
-  <ignore name=".svn"/>
-  <ignore name=".DS_Store"/>
-</vault>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6a57a2b..bb6cab5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.4</version>
+                    <version>1.8.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
@@ -108,7 +108,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.scr.annotations</artifactId>
-                <version>1.6.0</version>
+                <version>1.7.0</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>