diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/LICENSE b/java/sca-1.x-contrib/modules/runtime-tomcat/LICENSE
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/LICENSE
rename to java/sca-1.x-contrib/modules/runtime-tomcat/LICENSE
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/NOTICE b/java/sca-1.x-contrib/modules/runtime-tomcat/NOTICE
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/NOTICE
rename to java/sca-1.x-contrib/modules/runtime-tomcat/NOTICE
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/pom.xml b/java/sca-1.x-contrib/modules/runtime-tomcat/pom.xml
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/pom.xml
rename to java/sca-1.x-contrib/modules/runtime-tomcat/pom.xml
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.x/modules/runtime-tomcat/src/test/resources/content/test.html b/java/sca-1.x-contrib/modules/runtime-tomcat/src/test/resources/content/test.html
similarity index 100%
rename from branches/sca-java-1.x/modules/runtime-tomcat/src/test/resources/content/test.html
rename to java/sca-1.x-contrib/modules/runtime-tomcat/src/test/resources/content/test.html