diff --git a/sandbox/travelsample/contributions/notification-corba-contribution/pom.xml b/sandbox/travelsample/contributions/notification-corba/pom.xml
similarity index 94%
rename from sandbox/travelsample/contributions/notification-corba-contribution/pom.xml
rename to sandbox/travelsample/contributions/notification-corba/pom.xml
index f198d3510c..3999cfc9de 100644
--- a/sandbox/travelsample/contributions/notification-corba-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/notification-corba/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification-corba</artifactId>
+    <artifactId>scatours-contribution-notification-corba</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway CORBA Service</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
similarity index 80%
rename from sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/META-INF/sca-contribution.xml
rename to sandbox/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
index 27cf45a116..373d1494f6 100644
--- a/sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.notification"/>
-   <import.java package="scatours.smsgateway"/>
-</contribution>
\ No newline at end of file
+    <import.java package="com.tuscanyscatours.notification" />
+    <import.java package="com.tuscanyscatours.notification.impl" />
+    <import.java package="com.tuscanyscatours.smsgateway" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/notification-corba-contribution/src/main/resources/notification-corba.composite b/sandbox/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
similarity index 80%
rename from sandbox/travelsample/contributions/notification-corba-contribution/src/main/resources/notification-corba.composite
rename to sandbox/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
index c4cb35c9ec..8baca02509 100644
--- a/sandbox/travelsample/contributions/notification-corba-contribution/src/main/resources/notification-corba.composite
+++ b/sandbox/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
@@ -18,19 +18,18 @@
     * under the License.    
 -->
 <composite xmlns="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"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="notification">
 
     <component name="Notification">
-        <implementation.java class="scatours.notification.NotificationImpl" />
+        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
         <service name="Notification">
-            <interface.java interface="scatours.notification.Notification"/>
+            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
         </service>
 
         <reference name="smsGateway">
-            <interface.java interface="scatours.smsgateway.SMSGateway"/>
+            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
                 <tuscany:binding.corba host="localhost" port="5080" name="SMSGatewayCORBAService"/>
         </reference>
     </component>
diff --git a/sandbox/travelsample/contributions/notification-ejb-contribution/pom.xml b/sandbox/travelsample/contributions/notification-ejb/pom.xml
similarity index 94%
rename from sandbox/travelsample/contributions/notification-ejb-contribution/pom.xml
rename to sandbox/travelsample/contributions/notification-ejb/pom.xml
index 9cfae6db4b..9e1fd4d2d3 100644
--- a/sandbox/travelsample/contributions/notification-ejb-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/notification-ejb/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification-ejb</artifactId>
+    <artifactId>scatours-contribution-notification-ejb</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway EJB Service</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/notification-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
similarity index 80%
rename from sandbox/travelsample/contributions/notification-contribution/src/main/resources/META-INF/sca-contribution.xml
rename to sandbox/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
index 33281cd9d3..373d1494f6 100644
--- a/sandbox/travelsample/contributions/notification-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.notification"/>
-   <export.java package="scatours.smsgateway"/>
-</contribution>
\ No newline at end of file
+    <import.java package="com.tuscanyscatours.notification" />
+    <import.java package="com.tuscanyscatours.notification.impl" />
+    <import.java package="com.tuscanyscatours.smsgateway" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/notification-ejb-contribution/src/main/resources/notification-ejb.composite b/sandbox/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
similarity index 78%
rename from sandbox/travelsample/contributions/notification-ejb-contribution/src/main/resources/notification-ejb.composite
rename to sandbox/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
index 2163cd487c..11b632fd79 100644
--- a/sandbox/travelsample/contributions/notification-ejb-contribution/src/main/resources/notification-ejb.composite
+++ b/sandbox/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
@@ -18,18 +18,17 @@
     * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="notification">
 
     <component name="Notification">
-        <implementation.java class="scatours.notification.NotificationImpl" />
+        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
         <service name="Notification">
-            <interface.java interface="scatours.notification.Notification"/>
+            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
         </service>
 
         <reference name="smsGateway">
-            <interface.java interface="scatours.smsgateway.SMSGateway"/>
+            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
             <binding.ejb uri="SMSGatewayImplRemote"/>
         </reference>
     </component>
diff --git a/sandbox/travelsample/contributions/notification-jms-contribution/pom.xml b/sandbox/travelsample/contributions/notification-jms/pom.xml
similarity index 94%
rename from sandbox/travelsample/contributions/notification-jms-contribution/pom.xml
rename to sandbox/travelsample/contributions/notification-jms/pom.xml
index bd76433d10..13d7a01b4a 100644
--- a/sandbox/travelsample/contributions/notification-jms-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/notification-jms/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification-jms</artifactId>
+    <artifactId>scatours-contribution-notification-jms</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway JMS Service</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/notification-ejb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
similarity index 80%
rename from sandbox/travelsample/contributions/notification-ejb-contribution/src/main/resources/META-INF/sca-contribution.xml
rename to sandbox/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
index 27cf45a116..373d1494f6 100644
--- a/sandbox/travelsample/contributions/notification-ejb-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.notification"/>
-   <import.java package="scatours.smsgateway"/>
-</contribution>
\ No newline at end of file
+    <import.java package="com.tuscanyscatours.notification" />
+    <import.java package="com.tuscanyscatours.notification.impl" />
+    <import.java package="com.tuscanyscatours.smsgateway" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/notification-jms.composite b/sandbox/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
similarity index 82%
rename from sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/notification-jms.composite
rename to sandbox/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
index 2f44ff99ab..dfd96ae918 100644
--- a/sandbox/travelsample/contributions/notification-jms-contribution/src/main/resources/notification-jms.composite
+++ b/sandbox/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
@@ -18,18 +18,17 @@
     * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="notification">
 
     <component name="Notification">
-        <implementation.java class="scatours.notification.NotificationImpl" />
+        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
         <service name="Notification">
-            <interface.java interface="scatours.notification.Notification"/>
+            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
         </service>
 
         <reference name="smsGateway">
-            <interface.java interface="scatours.smsgateway.SMSGateway"/>
+            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
             <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"
                              jndiURL="tcp://localhost:61619">
                 <destination name="SMSRequestQueue" create="ifnotexist"/>
diff --git a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 27cf45a116..0000000000
--- a/sandbox/travelsample/contributions/notification-rmi-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.notification"/>
-   <import.java package="scatours.smsgateway"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/notification-rmi-contribution/pom.xml b/sandbox/travelsample/contributions/notification-rmi/pom.xml
similarity index 94%
rename from sandbox/travelsample/contributions/notification-rmi-contribution/pom.xml
rename to sandbox/travelsample/contributions/notification-rmi/pom.xml
index ecf070279a..3edec653fd 100644
--- a/sandbox/travelsample/contributions/notification-rmi-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/notification-rmi/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification-rmi</artifactId>
+    <artifactId>scatours-contribution-notification-rmi</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway RMI Service</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/notification-corba-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
similarity index 80%
rename from sandbox/travelsample/contributions/notification-corba-contribution/src/main/resources/META-INF/sca-contribution.xml
rename to sandbox/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
index 27cf45a116..373d1494f6 100644
--- a/sandbox/travelsample/contributions/notification-corba-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.notification"/>
-   <import.java package="scatours.smsgateway"/>
-</contribution>
\ No newline at end of file
+    <import.java package="com.tuscanyscatours.notification" />
+    <import.java package="com.tuscanyscatours.notification.impl" />
+    <import.java package="com.tuscanyscatours.smsgateway" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/notification-rmi.composite b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
similarity index 80%
rename from sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/notification-rmi.composite
rename to sandbox/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
index c6de1fae52..e80c381b55 100644
--- a/sandbox/travelsample/contributions/notification-rmi-contribution/src/main/resources/notification-rmi.composite
+++ b/sandbox/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
@@ -18,19 +18,18 @@
     * under the License.    
 -->
 <composite xmlns="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"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="notification">
 
     <component name="Notification">
-        <implementation.java class="scatours.notification.NotificationImpl" />
+        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
         <service name="Notification">
-            <interface.java interface="scatours.notification.Notification"/>
+            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
         </service>
 
         <reference name="smsGateway">
-            <interface.java interface="scatours.smsgateway.SMSGateway"/>
+            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
             <tuscany:binding.rmi host="localhost" port="8099" serviceName="SMSGatewayRMI"/>
         </reference>
     </component>
diff --git a/sandbox/travelsample/contributions/notification-ws-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-ws-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 27cf45a116..0000000000
--- a/sandbox/travelsample/contributions/notification-ws-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.notification"/>
-   <import.java package="scatours.smsgateway"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/notification-ws-contribution/pom.xml b/sandbox/travelsample/contributions/notification-ws/pom.xml
similarity index 94%
rename from sandbox/travelsample/contributions/notification-ws-contribution/pom.xml
rename to sandbox/travelsample/contributions/notification-ws/pom.xml
index b77f5ae291..56edf8e712 100644
--- a/sandbox/travelsample/contributions/notification-ws-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/notification-ws/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification-ws</artifactId>
+    <artifactId>scatours-contribution-notification-ws</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway Web Service</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..373d1494f6
--- /dev/null
+++ b/sandbox/travelsample/contributions/notification-ws/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.notification" />
+    <import.java package="com.tuscanyscatours.notification.impl" />
+    <import.java package="com.tuscanyscatours.smsgateway" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/notification-ws-contribution/src/main/resources/notification-ws.composite b/sandbox/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
similarity index 78%
rename from sandbox/travelsample/contributions/notification-ws-contribution/src/main/resources/notification-ws.composite
rename to sandbox/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
index a1854a7019..e2051ad612 100644
--- a/sandbox/travelsample/contributions/notification-ws-contribution/src/main/resources/notification-ws.composite
+++ b/sandbox/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
@@ -18,19 +18,18 @@
     * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="notification">
 
     <component name="Notification">
-        <implementation.java class="scatours.notification.NotificationImpl" />
+        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
         <service name="Notification">
-            <interface.java interface="scatours.notification.Notification"/>
+            <interface.java interface="com.tuscanyscatours.notification.Notification" />
         </service>
 
         <reference name="smsGateway">
-            <interface.java interface="scatours.smsgateway.SMSGateway"/>
-            <binding.ws uri="http://localhost:8081/SMSGatewayService"/>
+            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway" />
+            <binding.ws uri="http://localhost:8081/SMSGatewayService" />
         </reference>
     </component>
 </composite>
diff --git a/sandbox/travelsample/contributions/notification-contribution/pom.xml b/sandbox/travelsample/contributions/notification/pom.xml
similarity index 94%
rename from sandbox/travelsample/contributions/notification-contribution/pom.xml
rename to sandbox/travelsample/contributions/notification/pom.xml
index 825093fa0b..804dc43729 100644
--- a/sandbox/travelsample/contributions/notification-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/notification/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-notification</artifactId>
+    <artifactId>scatours-contribution-notification</artifactId>
     <name>Apache Tuscany SCA Tours Notification Contribution</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/notification/Notification.java b/sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/Notification.java
similarity index 95%
rename from sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/notification/Notification.java
rename to sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/Notification.java
index 79706fcc9d..2767844c2c 100644
--- a/sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/notification/Notification.java
+++ b/sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/Notification.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.notification;
+package com.tuscanyscatours.notification;
 
 public interface Notification {
   
diff --git a/sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/notification/NotificationImpl.java b/sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
similarity index 92%
rename from sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/notification/NotificationImpl.java
rename to sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
index 1c29cdea88..f374e22afe 100644
--- a/sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/notification/NotificationImpl.java
+++ b/sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
@@ -17,12 +17,13 @@
  * under the License.    
  */
 
-package scatours.notification;
+package com.tuscanyscatours.notification.impl;
 
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-import scatours.smsgateway.SMSGateway;
+import com.tuscanyscatours.notification.Notification;
+import com.tuscanyscatours.smsgateway.SMSGateway;
 
 @Service(Notification.class)
 public class NotificationImpl implements Notification {
diff --git a/sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
similarity index 96%
rename from sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/smsgateway/SMSGateway.java
rename to sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
index b96d0b2473..fdf5872565 100644
--- a/sandbox/travelsample/contributions/notification-contribution/src/main/java/scatours/smsgateway/SMSGateway.java
+++ b/sandbox/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
 
 import org.osoa.sca.annotations.Remotable;
 
diff --git a/sandbox/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..518c7e363b
--- /dev/null
+++ b/sandbox/travelsample/contributions/notification/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">
+    <export.java package="com.tuscanyscatours.notification" />
+    <export.java package="com.tuscanyscatours.notification.impl" />
+    <export.java package="com.tuscanyscatours.smsgateway" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 49473cdba6..d46740348b 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -67,12 +67,12 @@
                 <module>introducing-client</module>
                 <module>introducing-tours</module>
                 <module>introducing-trips</module>
-                <module>notification-contribution</module>
-                <module>notification-ws-contribution</module>
-                <module>notification-corba-contribution</module>
-                <module>notification-ejb-contribution</module>
-                <module>notification-jms-contribution</module>
-                <module>notification-rmi-contribution</module>
+                <module>notification</module>
+                <module>notification-ws</module>
+                <module>notification-corba</module>
+                <module>notification-ejb</module>
+                <module>notification-jms</module>
+                <module>notification-rmi</module>
                 <module>shoppingcart</module>   
                 <module>travelcatalog</module>         
                 <module>tripbooking</module>