133 files changed, 1128 insertions, 974 deletions
diff --git a/sandbox/travelsample/contributions/car-contribution/pom.xml b/sandbox/travelsample/contributions/car/pom.xml
index 2db056b0df..1995972cf2 100644
--- a/sandbox/travelsample/contributions/car-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/car/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-car-contribution</artifactId>
+    <artifactId>scatours-contribution-car</artifactId>
     <name>Apache Tuscany SCA Tours Car Contribution</name>
 
     <dependencies>
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
index 04742446ed..23834a7909 100644
--- a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
+++ b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.car;
+package com.tuscanyscatours.car.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
 
 /**
- * An implementation of the Hotel service
+ * An implementation of the Car service
  */
 @Scope("STATELESS")
 @Service(interfaces={Search.class, Book.class})
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarInfo.java b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java
index ebddf61a5d..88226f4b1a 100644
--- a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
+++ b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.car;
+package com.tuscanyscatours.car.impl;
 
 
 public class CarInfo {
diff --git a/sandbox/travelsample/contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
index bce42b050c..eb9ffba20d 100644
--- a/sandbox/travelsample/contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,6 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <export.java package="scatours.flight"/>
-</contribution>
-\ No newline at end of file
+   <import.java package="com.tuscanyscatours.common"/>
+   <export.java package="com.tuscanyscatours.car.impl"/>
+</contribution>
diff --git a/sandbox/travelsample/contributions/common-contribution/build.xml b/sandbox/travelsample/contributions/common-contribution/build.xml
deleted file mode 100644
index 8c70f0ef13..0000000000
--- a/sandbox/travelsample/contributions/common-contribution/build.xml
+++ /dev/null
@@ -1,61 +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.    
--->
-<project name="scatours-common-contribution" default="compile">
-	<property environment="env"/> 
-	
-    <target name="compile">
-    	<mkdir dir="target/classes"/>
-        <javac srcdir="src" destdir="target/classes" 
-        	           debug="on" source="1.5" target="1.5">
-            <classpath>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>   	
-    </target>
-	
-    <target name="run">
-        <java classname="client.CurrencyConverterClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target> 	
-	
-    <target name="runtrip">
-        <java classname="client.TripClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="runtripws">
-        <java classname="client.TripWsClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target>   	
-</project>
diff --git a/sandbox/travelsample/contributions/common-contribution/pom.xml b/sandbox/travelsample/contributions/common/pom.xml
index e61ce39fc3..b151842e19 100644
--- a/sandbox/travelsample/contributions/common-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/common/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-common-contribution</artifactId>
+    <artifactId>scatours-contribution-common</artifactId>
     <name>Apache Tuscany SCA Tours Common Artefacts Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Book.java b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
index 0c8033d137..47b6f50bec 100644
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Book.java
+++ b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.common;
+package com.tuscanyscatours.common;
 
 import org.osoa.sca.annotations.Remotable;
 
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Search.java b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
index 097ae69e38..b8af6ba93f 100644
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/Search.java
+++ b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.common;
+package com.tuscanyscatours.common;
 
 import org.osoa.sca.annotations.Callback;
 import org.osoa.sca.annotations.Conversational;
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
index 252fb955a2..fea43c6261 100644
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
+++ b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.common;
+package com.tuscanyscatours.common;
 
 import org.osoa.sca.annotations.Conversational;
 import org.osoa.sca.annotations.EndsConversation;
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/TripItem.java b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripItem.java
index afef47bf33..3458cd9d27 100644
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/TripItem.java
+++ b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripItem.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.common;
+package com.tuscanyscatours.common;
 
 
 
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/TripLeg.java b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripLeg.java
index 5972398732..ea549da52f 100644
--- a/sandbox/travelsample/contributions/common-contribution/src/main/java/scatours/common/TripLeg.java
+++ b/sandbox/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripLeg.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.common;
+package com.tuscanyscatours.common;
 
 
 public class TripLeg {
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
index f2a82bca4b..d7ada5afe7 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
@@ -18,5 +18,5 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.currencyconverter"/>
-</contribution>
-\ No newline at end of file
+    <export.java package="com.tuscanyscatours.common" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb/pom.xml
index c59fb1cf30..f83e89764a 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/pom.xml
@@ -26,7 +26,7 @@
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>
+    <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
     <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB</name>
 
     <dependencies>
@@ -125,7 +125,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>payment.creditcard</packageName>
+                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
                             <wsdlDirectory>${basedir}/src/main/resources
                         </wsdlDirectory>
                             <wsdlFiles>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index 1f2c1d7043..b9227b1752 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -17,8 +17,10 @@
  * under the License.    
  */
 
-package payment.creditcard;
+package com.tuscanyscatours.payment.creditcard.impl;
 
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
 import org.osoa.sca.annotations.Service;
 
 /**
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl
index 6dcc619c48..6dcc619c48 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
index 76427565fc..ea6bed8e09 100644
--- a/sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
@@ -1,24 +1,24 @@
-<?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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:currency"/>
-   <import.java package="scatours.currencyconverter"/>
-</contribution>
-\ No newline at end of file
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <export.java package="com.tuscanyscatours.payment.creditcard" />
+    <deployable composite="scatours:creditcard" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite
index e675da0372..db6907cf7e 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite
@@ -18,13 +18,11 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="http://creditcard"
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:c="http://creditcard" 
+           targetNamespace="http://tuscanyscatours.com/"
            name="creditcard">
 
-    <component name="CreditCardPaymentComponent">
-        <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
+    <component name="CreditCardPayment">
+        <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" />
         <service name="CreditCardPayment">
             <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)" /> 
             <binding.ws uri="http://localhost:8082/CreditCardPayment" />
@@ -32,4 +30,4 @@
         </service>
     </component>
     
-</composite>
-\ No newline at end of file
+</composite>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index 5beca2ddb0..2bb8b3b35c 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -17,7 +17,14 @@
  * under the License.
  */
 
-package payment.creditcard;
+package scatours.payment.creditcard;
+
+import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
+import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
+import com.tuscanyscatours.payment.creditcard.ObjectFactory;
+import com.tuscanyscatours.payment.creditcard.PayerType;
 
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
@@ -52,7 +59,7 @@ public class CreditCardPaymentTestCase {
     @Test
     public void testCreditCardPayment() {
         SCAClient client = (SCAClient) node;
-        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPaymentComponent/CreditCardPayment");
+        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
 
         ObjectFactory objectFactory = new ObjectFactory();
         CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
diff --git a/sandbox/travelsample/contributions/currency-contribution/pom.xml b/sandbox/travelsample/contributions/currency/pom.xml
index 42d3e7ec8e..0a5d00cef8 100644
--- a/sandbox/travelsample/contributions/currency-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/currency/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-currency-contribution</artifactId>
+    <artifactId>scatours-contribution-currency</artifactId>
     <name>Apache Tuscany SCA Tours Currency Converter Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
index 6d0efc8c66..24d945b2f4 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.currencyconverter;
+package com.tuscanyscatours.currencyconverter;
 
 import org.osoa.sca.annotations.Remotable;
 
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
index 533e6795d7..13519a4969 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/java/scatours/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.currencyconverter;
+package com.tuscanyscatours.currencyconverter.impl;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
 import org.osoa.sca.annotations.Service;
 
 /**
diff --git a/sandbox/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b11328f405
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <export.java package="com.tuscanyscatours.currencyconverter" />
+    <export.java package="com.tuscanyscatours.currencyconverter.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/currency-converter.composite b/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
index 13d4e9a45c..41d0d325d4 100644
--- a/sandbox/travelsample/contributions/currency-contribution/src/main/resources/currency-converter.composite
+++ b/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
@@ -18,12 +18,11 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="currencyconverter">
 
     <component name="CurrencyConverter">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl" />
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />
         <service name="CurrencyConverter"/>
     </component>
 </composite>
diff --git a/sandbox/travelsample/contributions/flight-contribution/pom.xml b/sandbox/travelsample/contributions/flight/pom.xml
index 2b3ccc5169..ee9340a1c6 100644
--- a/sandbox/travelsample/contributions/flight-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/flight/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-flight-contribution</artifactId>
+    <artifactId>scatours-contribution-flight</artifactId>
     <name>Apache Tuscany SCA Tours Flight Contribution</name>
 
     <dependencies>
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java b/sandbox/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
index 307c740ca1..cd7830e321 100644
--- a/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightImpl.java
+++ b/sandbox/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.flight;
+package com.tuscanyscatours.flight.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,17 +24,18 @@ import java.util.List;
 import org.osoa.sca.annotations.Callback;
 import org.osoa.sca.annotations.ComponentName;
 import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
 
 /**
- * An implementation of the Hotel service
+ * An implementation of the Flight service
  */
 @Scope("CONVERSATION")
 @Service(interfaces={Search.class, Book.class})
@@ -47,8 +48,8 @@ public class FlightImpl implements Search, Book {
     
     @ComponentName
     protected String componentName;
-    
-    protected int percentComplete = 0;
+
+    private int percentComplete = 0;
 
     @Init
     public void init() {
diff --git a/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightInfo.java b/sandbox/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightInfo.java
index 5acec9850d..d2b31cd9b7 100644
--- a/sandbox/travelsample/contributions/flight-contribution/src/main/java/scatours/flight/FlightInfo.java
+++ b/sandbox/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightInfo.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.flight;
+package com.tuscanyscatours.flight.impl;
 
 
 public class FlightInfo {
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
index 783027831d..1e539bf13b 100644
--- a/sandbox/travelsample/contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,6 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <export.java package="scatours.car"/>
-</contribution>
-\ No newline at end of file
+   <import.java package="com.tuscanyscatours.common"/>
+   <export.java package="com.tuscanyscatours.flight.impl"/>
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/pom.xml b/sandbox/travelsample/contributions/fullapp-bespoketrip/pom.xml
index fc26b8fa65..fa7ce37acc 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-bespoketrip-contribution</artifactId>
+    <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Bespoke Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..45344f051d
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:bespoketrip" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.hotel" />
+    <import.java package="com.tuscanyscatours.hotel.impl" />
+    <import.java package="com.tuscanyscatours.flight.impl" />
+    <import.java package="com.tuscanyscatours.car.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
index 8e3d6fb2e5..d746337917 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-bespoketrip/src/main/resources/scatours.composite
@@ -18,13 +18,12 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
+           targetNamespace="http://tuscanyscatours.com/"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="bespoketrip">
     
-    <component name="HotelComponent">
-        <implementation.java class="scatours.hotel.HotelImpl"/>
+    <component name="Hotel">
+        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
         <service name="Search">
             <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
             <!-- tuscany:binding.jsonrpc name="searchjsonrpc"/-->
@@ -35,11 +34,11 @@
         <service name="Book"/>
     </component>  
     
-    <component name="FlightComponent">
-        <implementation.java class="scatours.flight.FlightImpl"/>
+    <component name="Flight">
+        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
         <service name="Search">
-            <interface.java interface="scatours.common.Search" 
-                            callbackInterface="scatours.common.SearchCallback"/>
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
             <binding.ws name="searchws" uri="http://localhost:8086/Flight/Search"/>
             <tuscany:binding.jsonrpc name="searchjsonrpc"/>
             <callback>
@@ -49,8 +48,8 @@
         <service name="Book"/>
     </component> 
     
-    <component name="CarComponent">
-        <implementation.java class="scatours.car.CarImpl"/>
+    <component name="Car">
+        <implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
         <service name="Search">
             <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
             <tuscany:binding.jsonrpc name="searchjsonrpc"/>
diff --git a/sandbox/travelsample/contributions/fullapp-currency-contribution/pom.xml b/sandbox/travelsample/contributions/fullapp-currency/pom.xml
index 52c4252a62..bc019808f6 100644
--- a/sandbox/travelsample/contributions/fullapp-currency-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-currency/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-currency-contribution</artifactId>
+    <artifactId>scatours-contribution-fullapp-currency</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Currency Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
index 2b61ac6c84..c439cf9a77 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
@@ -18,8 +18,8 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:packagedtrip"/>
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.trip"/>
-</contribution>
-\ No newline at end of file
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:currency" />
+    <import.java package="com.tuscanyscatours.currencyconverter" />
+    <import.java package="com.tuscanyscatours.currencyconverter.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
index d5070a6423..7336c4c91d 100644
--- a/sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-currency/src/main/resources/scatours.composite
@@ -18,13 +18,11 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           targetNamespace="http://tuscanyscatours.com/"
            name="currency">
   
-    <component name="CurrencyConverterComponent">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
+    <component name="CurrencyConverter">
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
     </component> 
     
 </composite>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend-contribution/pom.xml b/sandbox/travelsample/contributions/fullapp-frontend/pom.xml
index 0a8765f119..8d16499312 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-frontend/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-frontend-contribution</artifactId>
+    <artifactId>scatours-contribution-fullapp-frontend</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Front End Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml
index 88b1c66441..99a98f6136 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/META-INF/sca-contribution.xml
@@ -18,16 +18,13 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:frontend"/>
-   <import.java package="scatours"/>
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.hotel"/>
-   <import.java package="scatours.flight"/>
-   <import.java package="scatours.car"/>
-   <import.java package="scatours.trip"/>
-   <import.java package="scatours.currencyconverter"/>
-   <import.java package="scatours.tripbooking"/>
-   <import.java package="scatours.travelcatalog"/> 
-   <import.java package="scatours.shoppingcart"/>  
-</contribution>
-\ No newline at end of file
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:frontend" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.currencyconverter" /> 
+    <import.java package="com.tuscanyscatours.travelcatalog" /> 
+    <import.java package="com.tuscanyscatours.travelcatalog.impl" /> 
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <import.java package="com.tuscanyscatours.tripbooking" />
+    <import.java package="com.tuscanyscatours.tripbooking.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
index 403882ce26..a64f9f160a 100644
--- a/sandbox/travelsample/contributions/fullapp-frontend-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
@@ -18,13 +18,11 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           targetNamespace="http://tuscanyscatours.com/"
            name="frontend">
     
-    <component name="TravelCatalogComponent">
-        <implementation.java class="scatours.travelcatalog.TravelCatalogImpl"/>
+    <component name="TravelCatalog">
+        <implementation.java class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
         <service name="TravelCatalogSearch"/>
         <reference name="hotelSearch">
             <binding.ws uri="http://localhost:8086/Hotel/Search"/>
@@ -34,8 +32,8 @@
             </callback>
         </reference>
         <reference name="flightSearch">
-            <interface.java interface="scatours.common.Search" 
-                            callbackInterface="scatours.common.SearchCallback"/>
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
             <binding.ws uri="http://localhost:8086/Flight/Search"/>
             <callback>
                 <binding.ws name="callback"
@@ -56,19 +54,19 @@
                             uri="http://localhost:8084/Trip/SearchCallback"/>
             </callback>
         </reference>     
-        <reference name="currencyConverter" target="CurrencyConverterComponent">
+        <reference name="currencyConverter" target="CurrencyConverter">
         </reference>
         <property name="quoteCurrencyCode">GBP</property>
     </component>
     
-    <component name="TripBookingComponent">
-        <implementation.java class="scatours.tripbooking.TripBookingImpl"/>
+    <component name="TripBooking">
+        <implementation.java class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
         <service name="TripBooking"/>
-        <reference name="hotelBook" target="HotelComponent/Book"/>
-        <reference name="flightBook" target="TripComponent/Book"/>
-        <reference name="carBook" target="CarComponent/Book"/>   
-        <reference name="tripBook" target="TripComponent/Book"/>  
-        <reference name="shoppingCart" target="ShoppingCartComponent/ShoppingCart"/>      
+        <reference name="hotelBook" target="Hotel/Book"/>
+        <reference name="flightBook" target="Trip/Book"/>
+        <reference name="carBook" target="Car/Book"/>   
+        <reference name="tripBook" target="Trip/Book"/>  
+        <reference name="shoppingCart" target="ShoppingCart"/>      
     </component>    
 
 </composite>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/pom.xml b/sandbox/travelsample/contributions/fullapp-packagedtrip/pom.xml
index 2a2b76e53d..637ea9da57 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-packagedtrip-contribution</artifactId>
+    <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Packaged Trip Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
index f9cc655b83..7844d200db 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
@@ -18,9 +18,8 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:shoppingcart"/>
-   <!-- import.java package="scatours.common"/-->
-   <import.java package="payment"/>
-   <import.java package="scatours.shoppingcart"/>
-</contribution>
-\ No newline at end of file
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:packagedtrip" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.trip.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
index 024969edcc..0bd670c1a4 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
@@ -18,13 +18,12 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
+           targetNamespace="http://tuscanyscatours.com/"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="packagedtrip">
 
-    <component name="TripComponent">
-        <implementation.java class="scatours.trip.TripImpl"/>
+    <component name="Trip">
+        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
         <service name="Search">
             <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
             <tuscany:binding.jsonrpc name="searchjsonrpc"/>
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/pom.xml b/sandbox/travelsample/contributions/fullapp-shoppingcart/pom.xml
index 64d94250af..e1038a1570 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-shoppingcart-contribution</artifactId>
+    <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Shopping Cart Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
index cabffa6a30..29769ba852 100644
--- a/sandbox/travelsample/contributions/fullapp-bespoketrip-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
@@ -18,11 +18,9 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:bespoketrip"/>
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.hotel"/>
-   <import.java package="scatours.flight"/>
-   <import.java package="scatours.car"/>
-   <import.java package="scatours.trip"/>
-</contribution>
-\ No newline at end of file
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:shoppingcart" />
+    <import.java package="com.tuscanyscatours.payment" />
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <import.java package="com.tuscanyscatours.shoppingcart.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
index a1d06880aa..327145df71 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
@@ -18,22 +18,20 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           targetNamespace="http://tuscanyscatours.com/"
            name="shoppingcart">
     
-    <component name="ShoppingCartComponent">
-        <implementation.java class="scatours.shoppingcart.ShoppingCartImpl"/>
+    <component name="ShoppingCart">
+        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
         <service name="ShoppingCart"/>
-        <reference name="cartStore" target="CartStoreComponent/CartStore"/>     
+        <reference name="cartStore" target="CartStore"/>     
         <reference name="payment">
             <binding.ws uri="http://localhost:8081/Payment" />
         </reference> 
     </component>    
     
-    <component name="CartStoreComponent">
-        <implementation.java class="scatours.shoppingcart.CartStoreImpl"/>
+    <component name="CartStore">
+        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
         <service name="CartStore"/>
     </component> 
 
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 9512c64b56..0000000000
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,28 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:ui"/>
-   <import.java package="scatours"/>
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.tripbooking"/>
-   <import.java package="scatours.travelcatalog"/> 
-   <import.java package="scatours.shoppingcart"/> 
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/pom.xml b/sandbox/travelsample/contributions/fullapp-ui/pom.xml
index 293a3ce206..ec2bba21c3 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/fullapp-ui/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-ui-contribution</artifactId>
+    <artifactId>scatours-contribution-fullapp-ui</artifactId>
     <name>Apache Tuscany SCA Tours Full Application User Interface Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..6832ecaf79
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:ui" />
+    <import.java package="com.tuscanyscatours" />
+    <import.java package="com.tuscanyscatours.impl" />
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <import.java package="com.tuscanyscatours.travelcatalog" />
+    <import.java package="com.tuscanyscatours.tripbooking" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
index cd76747cb5..acc92c10b2 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
@@ -18,10 +18,8 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
+           targetNamespace="http://tuscanyscatours.com/"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:pp="http://www.example.org/PaymentProcess"
            name="ui">
            
     <component name="scatours">
@@ -29,19 +27,19 @@
         <service name="Widget">
             <tuscany:binding.http uri="/scatours"/>
         </service>
-        <reference name="scaToursCatalog" target="SCAToursComponent/SCAToursSearch">
+        <reference name="scaToursCatalog" target="SCATours/SCAToursSearch">
             <tuscany:binding.jsonrpc/>
         </reference> 
-        <reference name="scaToursBooking" target="SCAToursComponent/SCAToursBooking">
+        <reference name="scaToursBooking" target="SCATours/SCAToursBooking">
             <tuscany:binding.jsonrpc/>
         </reference>
-        <reference name="scaToursCart" target="SCAToursComponent/SCAToursCart">
+        <reference name="scaToursCart" target="SCATours/SCAToursCart">
             <tuscany:binding.jsonrpc/>
         </reference>                
     </component>   
     
-    <component name="SCAToursComponent">
-        <implementation.java class="scatours.SCAToursImpl"/>
+    <component name="SCATours">
+        <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/>
         <service name="SCAToursSearch">
             <tuscany:binding.jsonrpc/>
         </service>
@@ -51,9 +49,9 @@
         <service name="SCAToursCart">
             <tuscany:binding.jsonrpc/>
         </service>        
-        <reference name="travelCatalogSearch" target="TravelCatalogComponent/TravelCatalogSearch"/>
-        <reference name="tripBooking" target="TripBookingComponent/TripBooking"/>
-        <reference name="shoppingCart" target="ShoppingCartComponent/ShoppingCart"/>       
+        <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/>
+        <reference name="tripBooking" target="TripBooking"/>
+        <reference name="shoppingCart" target="ShoppingCart"/>       
     </component>    
    
 </composite>
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html
index e53d4fd27f..e53d4fd27f 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg
index 8466377374..8466377374 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png
index 563bf4ea91..563bf4ea91 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/style.css b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/style.css
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/style.css
diff --git a/sandbox/travelsample/contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e55e3b8cb9..0000000000
--- a/sandbox/travelsample/contributions/hotel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <export.java package="scatours.hotel"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/hotel-contribution/pom.xml b/sandbox/travelsample/contributions/hotel/pom.xml
index e87ebb0944..60da8f5af9 100644
--- a/sandbox/travelsample/contributions/hotel-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/hotel/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-hotel-contribution</artifactId>
+    <artifactId>scatours-contribution-hotel</artifactId>
     <name>Apache Tuscany SCA Tours Hotel Contribution</name>
 
     <dependencies>
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelInfo.java b/sandbox/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelInfo.java
index b0fa3fe006..a4ba9b3b96 100644
--- a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelInfo.java
+++ b/sandbox/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelInfo.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.hotel;
+package com.tuscanyscatours.hotel;
 
 
 public class HotelInfo {
diff --git a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelManagement.java b/sandbox/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelManagement.java
index fa74f938ab..476da9a544 100644
--- a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelManagement.java
+++ b/sandbox/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelManagement.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.hotel;
+package com.tuscanyscatours.hotel;
 
 public interface HotelManagement {
     void addHotelInfo(HotelInfo hotelInfo);
diff --git a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java b/sandbox/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
index cb5626441a..eefa88a9cd 100644
--- a/sandbox/travelsample/contributions/hotel-contribution/src/main/java/scatours/hotel/HotelImpl.java
+++ b/sandbox/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.hotel;
+package com.tuscanyscatours.hotel.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,11 +26,13 @@ import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+import com.tuscanyscatours.hotel.HotelInfo;
+import com.tuscanyscatours.hotel.HotelManagement;
 
 /**
  * An implementation of the Hotel service
diff --git a/sandbox/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..40382221a5
--- /dev/null
+++ b/sandbox/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+   <import.java package="com.tuscanyscatours.common"/>
+   <export.java package="com.tuscanyscatours.hotel"/>
+   <export.java package="com.tuscanyscatours.hotel.impl"/>
+</contribution>
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
index ffcc08c0c8..1f6f5b69fa 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
@@ -39,8 +39,8 @@ public class PaymentTestCase {
     public static void setUpBeforeClass() throws Exception {  
         try {
             creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                    new SCAContribution("creditcard", "../creditcard-payment-jaxb-contribution/target/classes"),
-                    new SCAContribution("creditcard-test", "../creditcard-payment-jaxb-contribution/target/test-classes"));
+                    new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"),
+                    new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes"));
                 
             creditCardNode.start();
                 
diff --git a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java
index 9099588278..9a1629f693 100644
--- a/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-groovy-contribution/src/test/java/payment/PaymentTestCase.java
@@ -40,8 +40,8 @@ public class PaymentTestCase {
     public static void setUpBeforeClass() throws Exception {  
         try {
             creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                    new SCAContribution("creditcard", "../creditcard-payment-jaxb-contribution/target/classes"),
-                    new SCAContribution("creditcard-test", "../creditcard-payment-jaxb-contribution/target/test-classes"));
+                    new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"),
+                    new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes"));
                 
             creditCardNode.start();
                 
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 12b9852bf0..0000000000
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:scatours="http://scatours">
-   <export.java package="payment"/>
-   <deployable composite="scatours:payment" />
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/pom.xml b/sandbox/travelsample/contributions/payment-java/pom.xml
index 54f11f3dd3..c3dca55e7c 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/payment-java/pom.xml
@@ -26,7 +26,7 @@
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-payment-java-contribution</artifactId>
+    <artifactId>scatours-contribution-payment-java</artifactId>
     <name>Apache Tuscany SCA Tours Payment Java Contribution</name>
 
     <dependencies>
@@ -132,7 +132,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>payment</packageName>
+                            <packageName>com.tuscanyscatours.payment</packageName>
                             <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
                             <wsdlFiles>
                                 <wsdlFile>Payment.wsdl</wsdlFile>
@@ -150,7 +150,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>payment.creditcard</packageName>
+                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
                             <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
                             <wsdlFiles>
                                 <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java
index daf56353a3..c97ba8fb9f 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java
@@ -17,9 +17,9 @@
  * under the License.    
  */
 
-package scatours.customer;
+package com.tuscanyscatours.customer;
 
-import payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
 
 /**
  * Customer data
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
index 89f56ce6ec..58772c747c 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.customer;
+package com.tuscanyscatours.customer;
 
 
 public class CustomerNotFoundException extends Exception {
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
index cfd79a7f95..38a2759660 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
@@ -17,11 +17,11 @@
  * under the License.    
  */
 
-package scatours.customer;
+package com.tuscanyscatours.customer;
 
 import java.util.Collection;
 
-import payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
 
 /**
  * Customer registry interface
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index e6328f062c..ac7b71c17f 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.customer;
+package com.tuscanyscatours.customer.impl;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -30,10 +30,13 @@ import org.osoa.sca.annotations.Requires;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardTypeType;
-import payment.creditcard.ObjectFactory;
-import payment.creditcard.PayerType;
+import com.tuscanyscatours.customer.Customer;
+import com.tuscanyscatours.customer.CustomerNotFoundException;
+import com.tuscanyscatours.customer.CustomerRegistry;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
+import com.tuscanyscatours.payment.creditcard.ObjectFactory;
+import com.tuscanyscatours.payment.creditcard.PayerType;
 
 /**
  * An in-memory customer registry implementation
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
index d360381327..8c6ca806d2 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.emailgateway;
+package com.tuscanyscatours.emailgateway;
 
 import org.osoa.sca.annotations.Remotable;
 
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index 060c3dabda..b942eebddf 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -17,9 +17,10 @@
  * under the License.    
  */
 
-package scatours.emailgateway;
+package com.tuscanyscatours.emailgateway.impl;
 
 import org.osoa.sca.annotations.Service;
+import com.tuscanyscatours.emailgateway.EmailGateway;
 
 @Service(EmailGateway.class)
 public class EmailGatewayImpl implements EmailGateway {
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 53e896a580..8fb56c67e7 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package payment;
+package com.tuscanyscatours.payment.impl;
 
 import javax.annotation.security.RolesAllowed;
 import javax.annotation.security.RunAs;
@@ -27,13 +27,14 @@ import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-import payment.creditcard.AuthorizeFault_Exception;
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-import scatours.customer.Customer;
-import scatours.customer.CustomerNotFoundException;
-import scatours.customer.CustomerRegistry;
-import scatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.customer.Customer;
+import com.tuscanyscatours.customer.CustomerNotFoundException;
+import com.tuscanyscatours.customer.CustomerRegistry;
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
 
 /**
  * The payment implementation
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl
index d17497d1f6..d17497d1f6 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
index ac556c3518..f8ff7b4623 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
@@ -18,7 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:creditcard="http://creditcard">
-   <export.java package="payment.creditcard"/>
-   <deployable composite="creditcard:creditcard" />
-</contribution>
-\ No newline at end of file
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <export.java package="com.tuscanyscatours.payment" />
+    <deployable composite="scatours:payment" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl
index 3885764899..3885764899 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/definitions.xml b/sandbox/travelsample/contributions/payment-java/src/main/resources/definitions.xml
index 9060e75ed2..dc47395e9b 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/definitions.xml
+++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/definitions.xml
@@ -19,8 +19,7 @@
 -->
 <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
  			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+ 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
 
     <!-- Policy Intents Defined by the SCA Runtime -->
     <intent name="authorization" constrains="sca:implementation"/>
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
index 45c802ed31..69160e24f8 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
@@ -18,30 +18,28 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="http://scatours"
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:c="http://scatours" 
+           targetNamespace="http://tuscanyscatours.com/"
            name="payment">
            
-    <component name="PaymentComponent">
-        <implementation.java class="payment.PaymentImpl" />
+    <component name="Payment">
+        <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />
         <service name="Payment">
            <binding.ws uri="http://localhost:8081/Payment"/>
         </service>
-        <reference name="customerRegistry" target="CustomerRegistryComponent"/>
+        <reference name="customerRegistry" target="CustomerRegistry"/>
         <reference name="creditCardPayment">
             <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
         </reference>
-        <reference name="emailGateway" target="EmailGatewayComponent"/>
+        <reference name="emailGateway" target="EmailGateway"/>
         <property name="transactionFee">0.02</property>
     </component>
         
-    <component name="CustomerRegistryComponent">
-        <implementation.java class="scatours.customer.CustomerRegistryImpl" />
+    <component name="CustomerRegistry">
+        <implementation.java class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl" />
     </component>
             
-    <component name="EmailGatewayComponent">
-        <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
+    <component name="EmailGateway">
+        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
     </component>    
     
 </composite>
 \ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
index b6c7561a15..631642ea0a 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
@@ -17,8 +17,9 @@
  * under the License.    
  */
 
-package payment;
+package scatours.payment;
 
+import com.tuscanyscatours.payment.Payment;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
@@ -33,21 +34,16 @@ public class PaymentTestCase {
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-    	try {
-	        node = SCANodeFactory.newInstance().createSCANode(null, 
-	            new SCAContribution("payment", "./target/classes"),
-	            new SCAContribution("tuscanyscatours", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"));
-	
-	        node.start();
-    	} catch (Exception ex) {
-    		ex.printStackTrace();
-    	}
+        node = SCANodeFactory.newInstance().createSCANode(null, 
+                new SCAContribution("payment", "./target/classes"),
+                new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb/target/classes"));
+        node.start();
     }
     
     @Test
     public void testPayment() {
         SCAClient client = (SCAClient) node;
-        Payment payment = client.getService(Payment.class, "PaymentComponent");
+        Payment payment = client.getService(Payment.class, "Payment");
         
         System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
         System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
index d9f471e45e..80d7c90d15 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
@@ -41,8 +41,8 @@ public class PaymentTestCase {
     public static void setUpBeforeClass() throws Exception {  
         try {
             creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                new SCAContribution("creditcard", "../creditcard-payment-jaxb-contribution/target/classes"),
-                new SCAContribution("creditcard-test", "../creditcard-payment-jaxb-contribution/target/test-classes"));
+                new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"),
+                new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes"));
             
             creditCardNode.start();
                        
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/PaymentTestCase.java
index 79fb9f1132..326463d299 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/PaymentTestCase.java
@@ -38,8 +38,8 @@ public class PaymentTestCase {
     public static void setUpBeforeClass() throws Exception {  
         try {
             creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                new SCAContribution("creditcard", "../creditcard-payment-jaxb-contribution/target/classes"),
-                new SCAContribution("creditcard-test", "../creditcard-payment-jaxb-contribution/target/test-classes"));
+                new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"),
+                new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes"));
             
             creditCardNode.start();
                        
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index a37485ba64..40e6593470 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -39,11 +39,11 @@
             <modules>
                 <module>blog-feed-contribution/</module>
                 <module>calendar-contribution</module>
-                <module>car-contribution</module>
-                <module>common-contribution</module>
-                <module>creditcard-payment-jaxb-contribution</module>
+                <module>car</module>
+                <module>common</module>
+                <module>creditcard-payment-jaxb</module>
                 <module>creditcard-payment-sdo-contribution</module>
-                <module>currency-contribution</module>
+                <module>currency</module>
                 <module>currency-corba-contribution</module>
                 <module>currency-jms-contribution</module>
                 <module>currency-jsp-contribution</module>
@@ -52,15 +52,15 @@
                 <module>databinding-client-contribution</module>
                 <module>emailgateway-contribution</module>
                 <module>feed-logger-contribution</module>
-                <module>flight-contribution</module>
-                <module>fullapp-ui-contribution</module>
-                <module>fullapp-frontend-contribution</module>
-                <module>fullapp-currency-contribution</module>
-                <module>fullapp-packagedtrip-contribution</module>
-                <module>fullapp-bespoketrip-contribution</module>
-                <module>fullapp-shoppingcart-contribution</module>
+                <module>flight</module>
+                <module>fullapp-ui</module>
+                <module>fullapp-frontend</module>
+                <module>fullapp-currency</module>
+                <module>fullapp-packagedtrip</module>
+                <module>fullapp-bespoketrip</module>
+                <module>fullapp-shoppingcart</module>
                 <module>help-pages-contribution</module>
-                <module>hotel-contribution</module>
+                <module>hotel</module>
                 <module>interaction-client-contribution</module>
                 <module>interaction-service-remote-contribution</module>
                 <module>introducing-client</module>
@@ -72,12 +72,12 @@
                 <module>notification-ejb-contribution</module>
                 <module>notification-jms-contribution</module>
                 <module>notification-rmi-contribution</module>
-                <module>shoppingcart-contribution</module>   
-                <module>travelcatalog-contribution</module>         
-                <module>tripbooking-contribution</module>
-                <module>trip-contribution</module>
-                <module>scatours-contribution</module>
-                <module>payment-java-contribution</module>
+                <module>shoppingcart</module>   
+                <module>travelcatalog</module>         
+                <module>tripbooking</module>
+                <module>trip</module>
+                <module>scatours</module>
+                <module>payment-java</module>
                 <module>payment-spring-contribution</module>
                 <module>payment-spring-scatag-contribution</module>
                 <module>payment-bpel-contribution</module>
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d392a94fbe..0000000000
--- a/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.travelcatalog"/>
-   <import.java package="scatours.tripbooking"/>
-   <import.java package="scatours.shoppingcart"/>
-   <export.java package="scatours"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/scatours-contribution/pom.xml b/sandbox/travelsample/contributions/scatours/pom.xml
index 12fa6f8325..fc900d2a27 100644
--- a/sandbox/travelsample/contributions/scatours-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/scatours/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-scatours-contribution</artifactId>
+    <artifactId>scatours-contribution-scatours</artifactId>
     <name>Apache Tuscany SCA Tours SCATours Contribution</name>
 
     <dependencies>
@@ -43,43 +43,29 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
+            <artifactId>scatours-contribution-travelcatalog</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-travelcatalog-contribution</artifactId>
+            <artifactId>scatours-contribution-tripbooking</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-tripbooking-contribution</artifactId>
+            <artifactId>scatours-contribution-shoppingcart</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-shoppingcart-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-paymentprocess-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        -->
-
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.5</version>
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
index 771f4f5ff9..605745e0c8 100644
--- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours;
+package com.tuscanyscatours;
 
 
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
 
 /**
  * The SCA Tours trip booking service interface
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
index 47fd658ef6..67764e1c0d 100644
--- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours;
+package com.tuscanyscatours;
 
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
 
 /**
  * The ShoppingCart service interface
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
index eeddc62f73..6ce03fbb86 100644
--- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours;
+package com.tuscanyscatours;
 
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
 
 /**
- * The Trip service interface
+ * The Search service interface
  */
 @Remotable
 public interface SCAToursSearch {
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
index 2ac1e00f5f..a39e6a5623 100644
--- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours;
+package com.tuscanyscatours.impl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,11 +29,14 @@ import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import scatours.shoppingcart.ShoppingCart;
-import scatours.travelcatalog.TravelCatalogSearch;
-import scatours.tripbooking.TripBooking;
+import com.tuscanyscatours.SCAToursBooking;
+import com.tuscanyscatours.SCAToursCart;
+import com.tuscanyscatours.SCAToursSearch;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
+import com.tuscanyscatours.tripbooking.TripBooking;
 
 /**
  * An implementation of the SCA tours component. it's just a pass through and allows
diff --git a/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..2728a88840
--- /dev/null
+++ b/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,27 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.travelcatalog" />
+    <import.java package="com.tuscanyscatours.tripbooking" />
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <export.java package="com.tuscanyscatours" />
+    <export.java package="com.tuscanyscatours.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d5de488e69..0000000000
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <export.java package="scatours.shoppingcart"/>
-   <export.java package="payment"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/pom.xml b/sandbox/travelsample/contributions/shoppingcart/pom.xml
index 39eb4f081e..6e434d3337 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/shoppingcart/pom.xml
@@ -26,7 +26,7 @@
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-shoppingcart-contribution</artifactId>
+    <artifactId>scatours-contribution-shoppingcart</artifactId>
     <name>Apache Tuscany SCA Tours Shopping Cart Contribution</name>
 
     <dependencies>
@@ -44,19 +44,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-payment-java-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
@@ -114,7 +102,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>payment</packageName>
+                            <packageName>com.tuscanyscatours.payment</packageName>
                             <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
                             <wsdlFiles>
                                 <wsdlFile>Payment.wsdl</wsdlFile>
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
index 949a602686..62e7da5a1f 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart;
 
 import org.osoa.sca.annotations.Conversational;
 import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
 
 /**
  * The CartStore service interface
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java
index e2773f6754..9242686b69 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart;
 
 import org.osoa.sca.annotations.Conversational;
 import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
 
 /**
  * The ShoppingCart service interface
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
index 934bc04f75..855e2d8371 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,11 +28,12 @@ import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import payment.Payment;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.shoppingcart.CartStore;
 
 /**
- * An implementation of the Trip service
+ * An implementation of the CartStore service
  */
 @Scope("CONVERSATION")
 @Service(interfaces={CartStore.class})
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
index fa4ef02e55..676d6bac86 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,11 +34,13 @@ import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import payment.Payment;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.shoppingcart.CartStore;
+import com.tuscanyscatours.shoppingcart.ShoppingCart;
 
 /**
- * An implementation of the Trip service
+ * An implementation of the ShoppingCart service
  */
 @Service(interfaces={ShoppingCart.class})
 public class ShoppingCartImpl implements ShoppingCart{
diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..176c031c4c
--- /dev/null
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="com.tuscanyscatours.common" />
+    <export.java package="com.tuscanyscatours.payment" />
+    <export.java package="com.tuscanyscatours.shoppingcart" />
+    <export.java package="com.tuscanyscatours.shoppingcart.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/shoppingcart/src/main/resources/Payment.wsdl
index 3885764899..3885764899 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7b3f7b6a0e..0000000000
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.currencyconverter"/>
-   <export.java package="scatours.travelcatalog"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/contributions/travelcatalog/pom.xml
index 10d992f227..81d3cb56d0 100644
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/travelcatalog/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-travelcatalog-contribution</artifactId>
+    <artifactId>scatours-contribution-travelcatalog</artifactId>
     <name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>
 
     <dependencies>
@@ -43,19 +43,13 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-tripbooking-contribution</artifactId>
+            <artifactId>scatours-contribution-currency</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
index 480fb96f7e..e558439f82 100644
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java
+++ b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.travelcatalog;
+package com.tuscanyscatours.travelcatalog;
 
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
 
 /**
- * The Trip service interface
+ * The TravelCatalogSearch service interface
  */
 @Remotable
 public interface TravelCatalogSearch {
diff --git a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
index 124bdbf73c..31e035bcdc 100644
--- a/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java
+++ b/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.travelcatalog;
+package com.tuscanyscatours.travelcatalog.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,14 +32,15 @@ import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import scatours.currencyconverter.CurrencyConverter;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
+import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
 
 /**
- * An implementation of the Trip service
+ * An implementation of the travel catalog service
  */
 @Scope("COMPOSITE")
 @Service(interfaces={TravelCatalogSearch.class})
diff --git a/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b18ae45a09
--- /dev/null
+++ b/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.currencyconverter" />
+    <export.java package="com.tuscanyscatours.travelcatalog" />
+    <export.java package="com.tuscanyscatours.travelcatalog.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 4184b0c306..0000000000
--- a/sandbox/travelsample/contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <export.java package="scatours.trip"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/trip-contribution/pom.xml b/sandbox/travelsample/contributions/trip/pom.xml
index d56a7d7a88..a4ade5cd48 100644
--- a/sandbox/travelsample/contributions/trip-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/trip/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-trip-contribution</artifactId>
+    <artifactId>scatours-contribution-trip</artifactId>
     <name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>
 
     <dependencies>
@@ -64,7 +64,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency> 
         
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
index 224065876f..c4fd0df05d 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java
+++ b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.trip;
+package com.tuscanyscatours.trip.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
 
 /**
- * An implementation of the Hotel service
+ * An implementation of the Trip service
  */
 @Scope("STATELESS")
 @Service(interfaces={Search.class, Book.class})
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java
index 13a352ec9b..d236c1243f 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java
+++ b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.trip;
+package com.tuscanyscatours.trip.impl;
 
 
 public class TripInfo {
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
index 51540f80a2..7f2efe2de7 100644
--- a/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
@@ -18,5 +18,6 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.common"/>
-</contribution>
-\ No newline at end of file
+   <import.java package="com.tuscanyscatours.common"/>
+   <export.java package="com.tuscanyscatours.trip.impl"/>
+</contribution>
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
index e5116fd0d4..88df6f4c2e 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java
+++ b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
@@ -27,8 +27,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import scatours.common.Book;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.TripItem;
 
 /**
  * 
@@ -53,7 +53,7 @@ public class TripTestCase {
     @Test
     public void testPayment() {
         SCAClient client = (SCAClient) tripNode;
-        Book booking = client.getService(Book.class, "TripComponent/Book");
+        Book booking = client.getService(Book.class, "Trip/Book");
         TripItem tripItem = new TripItem("1234",
                                          "5678",
                                          TripItem.TRIP,
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml b/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml
index 61fe02ca86..8d7ff59b0c 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml
+++ b/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml
@@ -20,8 +20,7 @@
 <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
              targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
              xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:scatours="http://scatours">
+             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <!-- PolicySets -->
     <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
@@ -30,4 +29,4 @@
             <logLevel>FINER</logLevel>
         </tuscany:jdkLogger>
     </policySet>
-</definitions>
-\ No newline at end of file
+</definitions>
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite b/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite
index e7f0df3cee..06c449633c 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite
+++ b/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite
@@ -19,12 +19,11 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="packagedtrip">
 
-    <component name="TripComponent">
-        <implementation.java class="scatours.trip.TripImpl" requires="tuscany:logging"/>
+    <component name="Trip">
+        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl" requires="tuscany:logging"/>
         <service name="Search"/>
         <service name="Book"/>        
     </component>
diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/build.xml b/sandbox/travelsample/contributions/tripbooking-contribution/build.xml
deleted file mode 100644
index 911a648295..0000000000
--- a/sandbox/travelsample/contributions/tripbooking-contribution/build.xml
+++ /dev/null
@@ -1,61 +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.    
--->
-<project name="scatours-tripbooking-contribution" default="compile">
-	<property environment="env"/> 
-	
-    <target name="compile">
-    	<mkdir dir="target/classes"/>
-        <javac srcdir="src" destdir="target/classes" 
-        	           debug="on" source="1.5" target="1.5">
-            <classpath>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>   	
-    </target>
-	
-    <target name="run">
-        <java classname="client.CurrencyConverterClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target> 	
-	
-    <target name="runtrip">
-        <java classname="client.TripClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>	
-	
-    <target name="runtripws">
-        <java classname="client.TripWsClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target>   	
-</project>
diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b8f57ddbd0..0000000000
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.currencyconverter"/>
-   <import.java package="scatours.shoppingcart"/>
-   <export.java package="scatours.tripbooking"/>
-</contribution>
-\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/pom.xml b/sandbox/travelsample/contributions/tripbooking/pom.xml
index 108cefb53f..3403fdfbc6 100644
--- a/sandbox/travelsample/contributions/tripbooking-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/tripbooking/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-tripbooking-contribution</artifactId>
+    <artifactId>scatours-contribution-tripbooking</artifactId>
     <name>Apache Tuscany SCA Tours Trip Booking Contribution</name>
 
     <dependencies>
@@ -43,19 +43,19 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
+            <artifactId>scatours-contribution-currency</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-shoppingcart-contribution</artifactId>
+            <artifactId>scatours-contribution-shoppingcart</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java b/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
index 8959bc29f3..f866c6208f 100644
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java
+++ b/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.tripbooking;
+package com.tuscanyscatours.tripbooking;
 
 import org.osoa.sca.annotations.Remotable;
 
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
 
 /**
- * The Trip service interface
+ * The TripBooking service interface
  */
 @Remotable
 public interface TripBooking {
diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java b/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
index debbafda64..6d66a1ec45 100644
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
+++ b/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package scatours.tripbooking;
+package com.tuscanyscatours.tripbooking.impl;
 
 import org.osoa.sca.ComponentContext;
 import org.osoa.sca.ServiceReference;
@@ -24,12 +24,13 @@ import org.osoa.sca.annotations.Context;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-import scatours.common.Book;
-import scatours.common.TripItem;
-import scatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.tripbooking.TripBooking;
 
 /**
- * An implementation of the Trip service
+ * An implementation of the TripBooking service
  */
 @Service(interfaces={TripBooking.class})
 public class TripBookingImpl implements TripBooking{
diff --git a/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..906f892d1f
--- /dev/null
+++ b/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.currencyconverter" />
+    <import.java package="com.tuscanyscatours.shoppingcart" />
+    <export.java package="com.tuscanyscatours.tripbooking" />
+    <export.java package="com.tuscanyscatours.tripbooking.impl" />
+</contribution>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java b/sandbox/travelsample/launchers/fullapp-domain/build.xml
index 9fae5de58a..9ad84ef602 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java
+++ b/sandbox/travelsample/launchers/fullapp-domain/build.xml
@@ -1,37 +1,36 @@
-/*
- * 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.
- */
-
-package scatours;
-
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-public class LaunchFullAppDomain {
-    public static void main(String[] args) throws Exception {
-        LaunchFullAppDomain.launchFromFileSystemDir();
-    }
-
-    public static void launchFromFileSystemDir(){
-
-        try {
-        	DomainManagerLauncher.main(null);
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-}
+<!--
+ * 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 name="scatours-launcher-fullapp-domain" default="run">
+    <property environment="env"/> 
+
+    <target name="run">
+        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
+              dir="target/classes" fork="true">
+            <classpath>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="clean">
+        <delete dir="./target"/>
+    </target>
+
+</project>
diff --git a/sandbox/travelsample/launchers/fullapp-domain/pom.xml b/sandbox/travelsample/launchers/fullapp-domain/pom.xml
new file mode 100644
index 0000000000..b9c343a523
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-domain/pom.xml
@@ -0,0 +1,93 @@
+<?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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-launcher-fullapp-domain</artifactId>
+    <name>Apache Tuscany SCA Tours Full App Domain Launcher</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-currency</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-frontend</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-payment-java</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-fullapp-ui</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>        
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
index a0c2ba9e75..812736e620 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
@@ -21,7 +21,7 @@
            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
            xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:ns2="http://scatours/cloud">
+           xmlns:ns2="http://tuscany.apache.org/cloud">
       
   <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
   <include name="ns2:frontend" uri="http://tuscany.apache.org/cloud" />
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
index c793a36126..51f48a93f1 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="bespoketrip">
 
     <component name="bespoketrip">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite
index 46e7091c8d..93e1727266 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite
@@ -19,13 +19,13 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:c="http://creditcard"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="creditcard">
 
     <component name="creditcard">
-        <t:implementation.node uri="fullapp-creditcard" composite="c:creditcard"/>
+        <t:implementation.node uri="fullapp-creditcard" composite="s:creditcard"/>
         <service name="Node">
             <binding.sca uri="http://localhost:8082"/>
             <binding.ws uri="http://localhost:8082"/>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
index e625c77cea..808d2843bd 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="currency">
 
     <component name="currency">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
index ef71edc684..75c95daf4b 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="frontend">
 
     <component name="frontend">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
index 2ee42cfc58..a6ec78b56c 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="packagedtrip">
 
     <component name="packagedtrip">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite
index af57963673..a73d034805 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="payment">
 
     <component name="payment">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
index 8b92721c24..dce5fe829e 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -19,9 +19,9 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-		xmlns:s="http://scatours"
+        targetNamespace="http://tuscany.apache.org/cloud"
+        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+        xmlns:s="http://tuscanyscatours.com/"
 		name="shoppingcart">
 
     <component name="shoppingcart">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
index 4841ab5246..d72432daff 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
@@ -19,8 +19,8 @@
 -->
 <composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
 		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://scatours/cloud"
-		xmlns:s="http://scatours"
+		targetNamespace="http://tuscany.apache.org/cloud"
+		xmlns:s="http://tuscanyscatours.com/"
 		name="ui">
 
     <component name="ui">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/domain.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
index e1ebe1f1f4..636397c705 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/domain.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
@@ -21,10 +21,9 @@
            targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
            xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
-           xmlns:ns2="http://scatours"
-           xmlns:ns3="http://creditcard">
+           xmlns:ns2="http://tuscanyscatours.com/">
        
-  <include name="ns3:creditcard" uri="fullapp-creditcard" />         
+  <include name="ns2:creditcard" uri="fullapp-creditcard" />         
   <include name="ns2:payment" uri="fullapp-payment" />    
   <include name="ns2:shoppingcart" uri="fullapp-shoppingcart" />
   <include name="ns2:currency" uri="fullapp-currency" />
diff --git a/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
new file mode 100644
index 0000000000..59fea4eec2
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml
@@ -0,0 +1,41 @@
+<?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.    
+-->
+<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
+           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
+  <contribution location="file:../../../../contributions/common/target/scatours-contribution-common.jar"  uri="common"/>
+  <contribution location="file:../../../../contributions/currency/target/scatours-contribution-currency.jar"  uri="currency"/>
+  <contribution location="file:../../../../contributions/hotel/target/scatours-contribution-hotel.jar"  uri="hotel"/>
+  <contribution location="file:../../../../contributions/flight/target/scatours-contribution-flight.jar"  uri="flight"/>
+  <contribution location="file:../../../../contributions/car/target/scatours-contribution-car.jar"  uri="car"/>
+  <contribution location="file:../../../../contributions/trip/target/scatours-contribution-trip.jar"  uri="trip"/>
+  <contribution location="file:../../../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>
+  <contribution location="file:../../../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>
+  <contribution location="file:../../../../contributions/payment-java/target/scatours-contribution-payment-java.jar"  uri="fullapp-payment"/>
+  <contribution location="file:../../../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"  uri="fullapp-creditcard"/>
+  <contribution location="file:../../../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>
+  <contribution location="file:../../../../contributions/scatours/target/scatours-contribution-scatours.jar"  uri="scatours"/>
+  <contribution location="file:../../../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>
+  <contribution location="file:../../../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-frontend.jar"  uri="fullapp-frontend"/>
+  <contribution location="file:../../../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>
+  <contribution location="file:../../../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>
+  <contribution location="file:../../../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>
+  <contribution location="file:../../../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>
+  <contribution location="file:./cloud" uri="http://tuscany.apache.org/cloud"/>  
+</workspace>
+\ No newline at end of file
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java
deleted file mode 100644
index 5ec587f421..0000000000
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java
+++ /dev/null
@@ -1,84 +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.
- */
-
-package scatours;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-public class LaunchFullAppDomainNodes {
-    public static void main(String[] args) throws Exception {
-        LaunchFullAppDomainNodes.launchFromFileSystemDir();
-    }
-
-    // OK for development but you must launch the node from this module
-    public static void launchFromFileSystemDir(){
-
-        try {
-        	// turn off validation 
-            System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", "false");
-      	
-        	SCANode nodeCreditcard = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard");
-        	nodeCreditcard.start();
-        	
-        	SCANode nodePayment = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment");
-        	nodePayment.start();        	
-        	
-        	SCANode nodeShoppingcart = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart");
-        	nodeShoppingcart.start();
-        	
-        	SCANode nodeCurrency = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency");
-        	nodeCurrency.start();
-        	
-        	SCANode nodePackagedtrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip");
-        	nodePackagedtrip.start();
-        	
-        	SCANode nodeBespoketrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip");
-        	nodeBespoketrip.start();
-        	
-        	SCANode nodeFrontend = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/frontend");
-        	nodeFrontend.start();
-       	
-        	SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui");
-        	nodeUI.start();
-
-            System.out.println("Node started - Press enter to shutdown.");
-
-            try {
-                System.in.read();
-            } catch (IOException e) {}
-
-            nodeCreditcard.stop();
-            nodePayment.stop();
-            nodeShoppingcart.stop();
-            nodeCurrency.stop();
-            nodePackagedtrip.stop();
-            nodeBespoketrip.stop();             
-            nodeFrontend.stop();
-            nodeUI.stop();
-
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-}
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
deleted file mode 100644
index 4ef76d1807..0000000000
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
+++ /dev/null
@@ -1,73 +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.
- */
-
-package scatours;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-public class LaunchFullAppNode {
-    public static void main(String[] args) throws Exception {
-        LaunchFullAppNode.launchFromFileSystemDir();
-    }
-
-    // OK for development but you must launch the node from this module
-    public static void launchFromFileSystemDir(){
-
-        try {
-        	SCANode node1 = SCANodeFactory.newInstance().createSCANode(null,
-	           new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
-	           new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"),
-	           new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
-	           new SCAContribution("flight", "../../contributions/flight-contribution/target/classes"),
-	           new SCAContribution("car", "../../contributions/car-contribution/target/classes"),
-	           new SCAContribution("trip", "../../contributions/trip-contribution/target/classes"),
-	           new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"),
-	           new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"),
-	           new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"),
-	           //new SCAContribution("payment", "../../contributions/payment-spring-contribution/target/classes"),
-	           new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
-	           new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
-	           new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),
-	           new SCAContribution("fullapp-ui", "../../contributions/fullapp-ui-contribution/target/classes"),
-	           new SCAContribution("fullapp-frontend", "../../contributions/fullapp-frontend-contribution/target/classes"),
-	           new SCAContribution("fullapp-currency", "../../contributions/fullapp-currency-contribution/target/classes"),
-	           new SCAContribution("fullapp-packagedtrip", "../../contributions/fullapp-packagedtrip-contribution/target/classes"),
-	           new SCAContribution("fullapp-bespoketrip", "../../contributions/fullapp-bespoketrip-contribution/target/classes"),
-	           new SCAContribution("fullapp-shoppingcart", "../../contributions/fullapp-shoppingcart-contribution/target/classes"));
-
-            node1.start();
-
-            System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
-            System.out.println("Node started - Press enter to shutdown.");
-
-            try {
-                System.in.read();
-            } catch (IOException e) {}
-
-            node1.stop();
-
-        } catch (Exception ex) {
-            System.out.println(ex.toString());
-        }
-    }
-}
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml b/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml
deleted file mode 100644
index 7833f3deb6..0000000000
--- a/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml
+++ /dev/null
@@ -1,41 +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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" 
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
-  <contribution location="file:../../contributions/common-contribution/target/scatours-common-contribution.jar"  uri="common"/>
-  <contribution location="file:../../contributions/currency-contribution/target/scatours-currency-contribution.jar"  uri="currency"/>
-  <contribution location="file:../../contributions/hotel-contribution/target/scatours-hotel-contribution.jar"  uri="hotel"/>
-  <contribution location="file:../../contributions/flight-contribution/target/scatours-flight-contribution.jar"  uri="flight"/>
-  <contribution location="file:../../contributions/car-contribution/target/scatours-car-contribution.jar"  uri="car"/>
-  <contribution location="file:../../contributions/trip-contribution/target/scatours-trip-contribution.jar"  uri="trip"/>
-  <contribution location="file:../../contributions/tripbooking-contribution/target/scatours-tripbooking-contribution.jar"  uri="tripbooking"/>
-  <contribution location="file:../../contributions/travelcatalog-contribution/target/scatours-travelcatalog-contribution.jar"  uri="travelcatalog"/>
-  <contribution location="file:../../contributions/payment-java-contribution/target/scatours-payment-java-contribution.jar"  uri="fullapp-payment"/>
-  <contribution location="file:../../contributions/creditcard-payment-jaxb-contribution/target/scatours-creditcard-payment-jaxb-contribution.jar"  uri="fullapp-creditcard"/>
-  <contribution location="file:../../contributions/shoppingcart-contribution/target/scatours-shoppingcart-contribution.jar"  uri="shoppingcart"/>
-  <contribution location="file:../../contributions/scatours-contribution/target/scatours-scatours-contribution.jar"  uri="scatours"/>
-  <contribution location="file:../../contributions/fullapp-ui-contribution/target/scatours-fullapp-ui-contribution.jar"  uri="fullapp-ui"/>
-  <contribution location="file:../../contributions/fullapp-frontend-contribution/target/scatours-fullapp-frontend-contribution.jar"  uri="fullapp-frontend"/>
-  <contribution location="file:../../contributions/fullapp-currency-contribution/target/scatours-fullapp-currency-contribution.jar"  uri="fullapp-currency"/>
-  <contribution location="file:../../contributions/fullapp-packagedtrip-contribution/target/scatours-fullapp-packagedtrip-contribution.jar"  uri="fullapp-packagedtrip"/>
-  <contribution location="file:../../contributions/fullapp-bespoketrip-contribution/target/scatours-fullapp-bespoketrip-contribution.jar"  uri="fullapp-bespoketrip"/>
-  <contribution location="file:../../contributions/fullapp-shoppingcart-contribution/target/scatours-fullapp-shoppingcart-contribution.jar"  uri="fullapp-shoppingcart"/>
-  <contribution location="file:./src/main/resources/cloud" uri="http://tuscany.apache.org/cloud"/>  
-</workspace>
-\ No newline at end of file
diff --git a/sandbox/travelsample/launchers/fullapp-nodes/build.xml b/sandbox/travelsample/launchers/fullapp-nodes/build.xml
new file mode 100644
index 0000000000..996452a6a2
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-nodes/build.xml
@@ -0,0 +1,56 @@
+<!--
+ * 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 name="scatours-launcher-fullapp-nodes" default="compile">
+    <property environment="env"/> 
+
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+            <src path="src\main\java"/>
+            <classpath>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac>
+        <copy todir="target/classes">
+            <fileset dir="src\main\resources"/>
+        </copy>
+        <jar destfile="target/scatours-launcher-fullapp-nodes.jar" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="scatours.FullAppNodesLauncher"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="run">
+        <java classname="scatours.FullAppNodesLauncher" fork="true">
+            <classpath>
+                <pathelement location="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+</project>
diff --git a/sandbox/travelsample/launchers/fullapp-nodes/pom.xml b/sandbox/travelsample/launchers/fullapp-nodes/pom.xml
new file mode 100644
index 0000000000..0c7018a06e
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-nodes/pom.xml
@@ -0,0 +1,194 @@
+<?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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-launcher-fullapp-nodes</artifactId>
+    <name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name>
+
+    <dependencies>
+    
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>        
+            
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom-abdera</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-js</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel-ode</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-transaction</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.3.1.4</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java b/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
new file mode 100644
index 0000000000..6367bb60f3
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package scatours;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class FullAppNodesLauncher {
+      	
+    public static void main(String[] args) throws Exception {
+        SCANode nodeCreditcard = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard");
+        nodeCreditcard.start();
+
+        SCANode nodePayment = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment");
+        nodePayment.start();        	
+
+        SCANode nodeShoppingcart = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart");
+       	nodeShoppingcart.start();
+
+        SCANode nodeCurrency = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency");
+        nodeCurrency.start();
+
+        SCANode nodePackagedtrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip");
+       	nodePackagedtrip.start();
+
+        SCANode nodeBespoketrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip");
+        nodeBespoketrip.start();
+
+        SCANode nodeFrontend = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/frontend");
+        nodeFrontend.start();
+
+        SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui");
+        nodeUI.start();
+
+        System.out.println("Nodes started - Press enter to shutdown.");
+
+        try {
+            System.in.read();
+        } catch (IOException e) {}
+
+        nodeCreditcard.stop();
+        nodePayment.stop();
+        nodeShoppingcart.stop();
+        nodeCurrency.stop();
+        nodePackagedtrip.stop();
+        nodeBespoketrip.stop();             
+        nodeFrontend.stop();
+        nodeUI.stop();
+    }
+}
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/build.xml b/sandbox/travelsample/launchers/fullapp/build.xml
index 77aacfb41a..8061df32e3 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/build.xml
+++ b/sandbox/travelsample/launchers/fullapp/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-fullapp-launcher" default="compile">
+<project name="scatours-launcher-fullapp" default="compile">
     <property environment="env"/> 
 
     <target name="compile">
@@ -31,15 +31,15 @@
         <copy todir="target/classes">
             <fileset dir="src\main\resources"/>
         </copy>
-        <jar destfile="target/scatours-fullapp-launcher.jar" basedir="target/classes">
+        <jar destfile="target/scatours-launcher-fullapp.jar" basedir="target/classes">
             <manifest>
-                <attribute name="Main-Class" value="scatours.LaunchFullAppNode"/>
+                <attribute name="Main-Class" value="scatours.FullAppLauncher"/>
             </manifest>
         </jar>
     </target>
 
     <target name="run">
-        <java classname="scatours.LaunchFullAppNode" fork="true">
+        <java classname="scatours.FullAppLauncher" fork="true">
             <classpath>
                 <pathelement location="target/classes"/>
                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
@@ -47,24 +47,6 @@
         </java>
     </target>
 	
-    <target name="run-domain">
-        <java classname="scatours.LaunchFullAppDomain" fork="true">
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>	
-
-    <target name="run-domain-nodes">
-        <java classname="scatours.LaunchFullAppDomainNodes" fork="true">
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>   
-
     <target name="clean">
         <delete includeemptydirs="true">
             <fileset dir="target"/>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml b/sandbox/travelsample/launchers/fullapp/pom.xml
index 97e2eddd05..ca4a64207a 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/fullapp/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-fullapp-launcher</artifactId>
+    <artifactId>scatours-launcher-fullapp</artifactId>
     <name>Apache Tuscany SCA Tours Full Application Launcher</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
new file mode 100644
index 0000000000..426aeb60ff
--- /dev/null
+++ b/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package scatours;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class FullAppLauncher {
+
+    public static void main(String[] args) throws Exception {
+        SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+            new SCAContribution("common", "../../contributions/common/target/classes"),
+            new SCAContribution("currency", "../../contributions/currency/target/classes"),
+            new SCAContribution("hotel", "../../contributions/hotel/target/classes"),
+            new SCAContribution("flight", "../../contributions/flight/target/classes"),
+            new SCAContribution("car", "../../contributions/car/target/classes"),
+            new SCAContribution("trip", "../../contributions/trip/target/classes"),
+            new SCAContribution("tripbooking", "../../contributions/tripbooking/target/classes"),
+            new SCAContribution("travelcatalog", "../../contributions/travelcatalog/target/classes"),
+            new SCAContribution("payment", "../../contributions/payment-java/target/classes"),
+            //new SCAContribution("payment", "../../contributions/payment-spring/target/classes"),
+            new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb/target/classes"),
+            new SCAContribution("shoppingcart", "../../contributions/shoppingcart/target/classes"),
+            new SCAContribution("scatours", "../../contributions/scatours/target/classes"),
+            new SCAContribution("fullapp-ui", "../../contributions/fullapp-ui/target/classes"),
+            new SCAContribution("fullapp-frontend", "../../contributions/fullapp-frontend/target/classes"),
+            new SCAContribution("fullapp-currency", "../../contributions/fullapp-currency/target/classes"),
+            new SCAContribution("fullapp-packagedtrip", "../../contributions/fullapp-packagedtrip/target/classes"),
+            new SCAContribution("fullapp-bespoketrip", "../../contributions/fullapp-bespoketrip/target/classes"),
+            new SCAContribution("fullapp-shoppingcart", "../../contributions/fullapp-shoppingcart/target/classes"));
+
+        node.start();
+
+        System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
+        System.out.println("Node started - Press enter to shutdown.");
+
+        try {
+            System.in.read();
+        } catch (IOException e) {}
+
+        node.stop();
+    }
+}
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index a442e10212..8a2b953be3 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -50,7 +50,9 @@
                 <module>introducing-client</module>
                 <module>introducing-domain</module>
                 <module>jumpstart-launcher</module>
-                <module>fullapp-launcher</module>
+                <module>fullapp</module>
+                <module>fullapp-domain</module>
+                <module>fullapp-nodes</module>
                 <module>help-pages-launcher</module>
                 <module>notification-ws-launcher</module>
                 <module>notification-corba-launcher</module>