diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/pom.xml b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/pom.xml
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/pom.xml
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/pom.xml
diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java
diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/RuntimeIntegration.java
diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleLauncherException.java
diff --git a/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
similarity index 100%
rename from contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
rename to sca-java-2.x/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
diff --git a/contrib/samples/async/pom.xml b/sca-java-2.x/contrib/samples/async/pom.xml
similarity index 100%
rename from contrib/samples/async/pom.xml
rename to sca-java-2.x/contrib/samples/async/pom.xml
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/pom.xml b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/pom.xml
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/pom.xml
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/pom.xml
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRef.java
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRefImpl.java b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRefImpl.java
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRefImpl.java
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculateViaAsyncRefImpl.java
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorClient.java
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorService.java
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/CalculatorClient.composite
diff --git a/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-2.x/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/META-INF/sca-contribution.xml