diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/LICENSE b/sandbox/fmoga/modules/binding-comet-runtime/LICENSE
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/LICENSE
rename to sandbox/fmoga/modules/binding-comet-runtime/LICENSE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/META-INF/MANIFEST.MF b/sandbox/fmoga/modules/binding-comet-runtime/META-INF/MANIFEST.MF
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/META-INF/MANIFEST.MF
rename to sandbox/fmoga/modules/binding-comet-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/NOTICE b/sandbox/fmoga/modules/binding-comet-runtime/NOTICE
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/NOTICE
rename to sandbox/fmoga/modules/binding-comet-runtime/NOTICE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/pom.xml b/sandbox/fmoga/modules/binding-comet-runtime/pom.xml
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/pom.xml
rename to sandbox/fmoga/modules/binding-comet-runtime/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometAsyncResponseInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometBindingProviderFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometComponentContext.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometInvoker.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometMessageContext.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometReferenceBindingProvider.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/CometServiceBindingProvider.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/ServletFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/callback/CometCallback.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/handler/CometBindingHandler.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptGenerator.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java b/sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/java/org/apache/tuscany/sca/binding/comet/runtime/javascript/JavascriptResource.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js b/sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/cometComponentContext.js
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/jquery.atmosphere.js b/sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/jquery.atmosphere.js
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/jquery.atmosphere.js
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/jquery.atmosphere.js
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js b/sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js
rename to sandbox/fmoga/modules/binding-comet-runtime/src/main/resources/jquery.json-2.2.min.js
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/CometTestCase.java b/sandbox/fmoga/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/CometTestCase.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/CometTestCase.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/CometTestCase.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockService.java b/sandbox/fmoga/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockService.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockService.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockService.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockServiceImpl.java b/sandbox/fmoga/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockServiceImpl.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockServiceImpl.java
rename to sandbox/fmoga/modules/binding-comet-runtime/src/test/java/org/apache/tuscany/sca/test/StockServiceImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/resources/test.composite b/sandbox/fmoga/modules/binding-comet-runtime/src/test/resources/test.composite
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet-runtime/src/test/resources/test.composite
rename to sandbox/fmoga/modules/binding-comet-runtime/src/test/resources/test.composite
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/LICENSE b/sandbox/fmoga/modules/binding-comet/LICENSE
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/LICENSE
rename to sandbox/fmoga/modules/binding-comet/LICENSE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/META-INF/MANIFEST.MF b/sandbox/fmoga/modules/binding-comet/META-INF/MANIFEST.MF
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/META-INF/MANIFEST.MF
rename to sandbox/fmoga/modules/binding-comet/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/NOTICE b/sandbox/fmoga/modules/binding-comet/NOTICE
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/NOTICE
rename to sandbox/fmoga/modules/binding-comet/NOTICE
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/pom.xml b/sandbox/fmoga/modules/binding-comet/pom.xml
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/pom.xml
rename to sandbox/fmoga/modules/binding-comet/pom.xml
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBinding.java b/sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBinding.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBinding.java
rename to sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBinding.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBindingFactory.java b/sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBindingFactory.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBindingFactory.java
rename to sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/CometBindingFactory.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingFactoryImpl.java b/sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingFactoryImpl.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingFactoryImpl.java
rename to sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingFactoryImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingImpl.java b/sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingImpl.java
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingImpl.java
rename to sandbox/fmoga/modules/binding-comet/src/main/java/org/apache/tuscany/sca/binding/comet/impl/CometBindingImpl.java
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.comet.CometBindingFactory b/sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.comet.CometBindingFactory
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.comet.CometBindingFactory
rename to sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.comet.CometBindingFactory
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
rename to sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
rename to sandbox/fmoga/modules/binding-comet/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/binding-comet.xsd b/sandbox/fmoga/modules/binding-comet/src/main/resources/binding-comet.xsd
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/binding-comet.xsd
rename to sandbox/fmoga/modules/binding-comet/src/main/resources/binding-comet.xsd
diff --git a/sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/org/apache/tuscany/sca/binding/comet/definitions.xml b/sandbox/fmoga/modules/binding-comet/src/main/resources/org/apache/tuscany/sca/binding/comet/definitions.xml
similarity index 100%
rename from sca-java-2.x/trunk/unreleased/modules/binding-comet/src/main/resources/org/apache/tuscany/sca/binding/comet/definitions.xml
rename to sandbox/fmoga/modules/binding-comet/src/main/resources/org/apache/tuscany/sca/binding/comet/definitions.xml