diff --git a/maven-core-it/integration-tests.txt b/maven-core-it/integration-tests.txt
index 16fcb88a54..4da858109c 100644
--- a/maven-core-it/integration-tests.txt
+++ b/maven-core-it/integration-tests.txt
@@ -60,7 +60,7 @@ it0019
 it0018
 it0017
 it0016
-#it0015
+# it0015 reserved in rememberance of Marmalade. We knew you so little.
 it0014
 it0013
 it0012
diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index 6c61a4ca8d..d6369f3fb9 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -40,12 +40,12 @@ public class MBoot
 {
     String[] builds = new String[]{"maven-model", "maven-settings", "maven-monitor", "maven-plugin-api",
         "maven-artifact", "maven-plugin-descriptor", "maven-repository-metadata", "maven-artifact-manager",
-        "maven-artifact-test", "maven-script/maven-script-beanshell", "maven-script/maven-script-marmalade",
+        "maven-artifact-test", "maven-script/maven-script-beanshell",
         "maven-profile", "maven-project", "maven-plugin-registry", "maven-reporting/maven-reporting-api",
         "maven-reporting/maven-reporting-impl", "maven-core", "maven-archiver",
         "maven-plugin-tools/maven-plugin-tools-api", "maven-plugin-tools/maven-plugin-tools-java",
         "maven-plugin-tools/maven-plugin-tools-beanshell", "maven-plugin-tools/maven-plugin-tools-pluggy",
-        "maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
+        "maven-core-it-verifier"};
 
     String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin", "maven-plugins/maven-compiler-plugin",
         "maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin", "maven-plugins/maven-plugin-plugin",
diff --git a/maven-mboot2/src/main/java/model/ModelReader.java b/maven-mboot2/src/main/java/model/ModelReader.java
index 1dfce37aa2..7632d23b75 100644
--- a/maven-mboot2/src/main/java/model/ModelReader.java
+++ b/maven-mboot2/src/main/java/model/ModelReader.java
@@ -229,7 +229,7 @@ public void endElement( String uri, String localName, String rawName )
                 version = parentVersion;
             }
 
-            // actually, these should be transtive (see MNG-77) - but some projects have circular deps that way (marmalade, and currently m2)
+            // actually, these should be transtive (see MNG-77) - but some projects have circular deps that way
             ModelReader p = retrievePom( parentGroupId, parentArtifactId, parentVersion, "pom", false );
 
             addDependencies( p.getDependencies(), parentDependencies, null, Collections.EMPTY_SET );
diff --git a/maven-site/src/site/fml/about.fml b/maven-site/src/site/fml/about.fml
index 1003be60a6..95567b3cdb 100644
--- a/maven-site/src/site/fml/about.fml
+++ b/maven-site/src/site/fml/about.fml
@@ -159,10 +159,8 @@
       <question>What plugin languages will Maven 2.0 support? What about [insert language here]?</question>
       <answer>
         <p>
-          As of the current release, Maven supports pure Java, Beanshell and Marmalade. Java is the preferred
-          language for it's familiarity and speed, while Marmalade is preferred for porting Maven 1.x plugins, and
-          writing
-          plugins based on Ant tasks.
+          As of the current release, Maven supports pure Java and Beanshell. Java is the preferred
+          language for it's familiarity and speed.
         </p>
         <p>
           We get asked a lot whether Maven 2.0 will support other languages, in particular Groovy.
diff --git a/maven-site/src/site/fml/general.fml b/maven-site/src/site/fml/general.fml
index 70fd4a9a31..12a2578a53 100644
--- a/maven-site/src/site/fml/general.fml
+++ b/maven-site/src/site/fml/general.fml
@@ -35,7 +35,7 @@
       <question>How can I use Ant tasks in Maven 2?</question>
       <answer>
         <p>
-          There are 3 alternatives:
+          There are currently 2 alternatives:
         </p>
         <ul>
           <li>
@@ -44,10 +44,6 @@
             <a href="http://ant.apache.org/manual/antexternal.html">instructions given in the Ant
               documentation</a>
           </li>
-          <li>
-            You can write your plugin using Marmalade, and use the Ant tasks much like you would from Jelly in Maven
-            1.0.
-          </li>
           <li>
             If you have very small amounts of Ant script specific to your project, you can use the
             <a href="http://www.neonics.com/projects/maven-antrun-plugin/">AntRun plugin</a>.
diff --git a/maven-site/src/site/fml/maven1.fml b/maven-site/src/site/fml/maven1.fml
index 24bb4df47c..e7e204a89b 100644
--- a/maven-site/src/site/fml/maven1.fml
+++ b/maven-site/src/site/fml/maven1.fml
@@ -64,9 +64,6 @@
           <li>
             <i>No more Jelly</i>
             - Plugins are primarily written in Java, though there are providers for other scripting languages.
-            This release includes support for Marmalade, a scripting framework that supports an XML syntax similar to
-            Jelly
-            which can be used to integrate Ant tasks and has a Jelly compatibility layer.
           </li>
           <li>
             <i>Improved repository layout</i>
@@ -138,8 +135,7 @@
       <question>Will my Maven 1.0 plugins be supported?</question>
       <answer>
         <p>
-          Not directly. While Marmalade supports a Jelly compatibility layer - the different POM format and goal
-          architecture would prevent most plugins from working.
+          Not directly.
         </p>
         <p>
           We recommend building your Jelly plugins as thin wrappers around Java beans that do not use Maven 1.0 API's,
diff --git a/maven-site/src/site/xdoc/developers/mojo-api-specification.xml b/maven-site/src/site/xdoc/developers/mojo-api-specification.xml
index 1dcf55ae5e..90fb50d9f5 100644
--- a/maven-site/src/site/xdoc/developers/mojo-api-specification.xml
+++ b/maven-site/src/site/xdoc/developers/mojo-api-specification.xml
@@ -25,8 +25,7 @@
   <body>
     <section name="Introduction">
       <p>Starting with Maven 2.0, plugins can be written in Java or any of a
-        number of scripting languages (currently just marmalade - we are
-        working to implement others). Additionally, Maven tries to stay out of
+        number of scripting languages. Additionally, Maven tries to stay out of
         the way of the programmer with its new Mojo API. This opens up the
         opportunity for many Mojos to be reused outside of Maven, or bridged
         into Maven from external systems like Ant.</p>
@@ -413,7 +412,7 @@
             <td>No. Default:
               <code>java</code>
             </td>
-            <td>The implementation language for this Mojo (marmalade, java,
+            <td>The implementation language for this Mojo (java,
               beanshell, etc.).</td>
           </tr>
           <tr>
diff --git a/maven-core-it/it0015/cli-options.txt b/sandbox/marmalade/it0015/cli-options.txt
similarity index 100%
rename from maven-core-it/it0015/cli-options.txt
rename to sandbox/marmalade/it0015/cli-options.txt
diff --git a/maven-core-it/it0015/expected-results.txt b/sandbox/marmalade/it0015/expected-results.txt
similarity index 100%
rename from maven-core-it/it0015/expected-results.txt
rename to sandbox/marmalade/it0015/expected-results.txt
diff --git a/maven-core-it/it0015/goals.txt b/sandbox/marmalade/it0015/goals.txt
similarity index 100%
rename from maven-core-it/it0015/goals.txt
rename to sandbox/marmalade/it0015/goals.txt
diff --git a/maven-core-it/it0015/pom.xml b/sandbox/marmalade/it0015/pom.xml
similarity index 100%
rename from maven-core-it/it0015/pom.xml
rename to sandbox/marmalade/it0015/pom.xml
diff --git a/maven-core-it/it0015/prebuild-hook.txt b/sandbox/marmalade/it0015/prebuild-hook.txt
similarity index 100%
rename from maven-core-it/it0015/prebuild-hook.txt
rename to sandbox/marmalade/it0015/prebuild-hook.txt
diff --git a/maven-core-it/it0015/src/main/java/org/apache/maven/it0015/tags/IT0015TagLibrary.java b/sandbox/marmalade/it0015/src/main/java/org/apache/maven/it0015/tags/IT0015TagLibrary.java
similarity index 100%
rename from maven-core-it/it0015/src/main/java/org/apache/maven/it0015/tags/IT0015TagLibrary.java
rename to sandbox/marmalade/it0015/src/main/java/org/apache/maven/it0015/tags/IT0015TagLibrary.java
diff --git a/maven-core-it/it0015/src/main/java/org/apache/maven/it0015/tags/WriteFileTag.java b/sandbox/marmalade/it0015/src/main/java/org/apache/maven/it0015/tags/WriteFileTag.java
similarity index 100%
rename from maven-core-it/it0015/src/main/java/org/apache/maven/it0015/tags/WriteFileTag.java
rename to sandbox/marmalade/it0015/src/main/java/org/apache/maven/it0015/tags/WriteFileTag.java
diff --git a/maven-core-it/it0015/src/main/resources/META-INF/marmalade/it0015.def b/sandbox/marmalade/it0015/src/main/resources/META-INF/marmalade/it0015.def
similarity index 100%
rename from maven-core-it/it0015/src/main/resources/META-INF/marmalade/it0015.def
rename to sandbox/marmalade/it0015/src/main/resources/META-INF/marmalade/it0015.def
diff --git a/maven-core-it/it0015/src/main/scripts/org/apache/maven/it0015/it0015.mmld b/sandbox/marmalade/it0015/src/main/scripts/org/apache/maven/it0015/it0015.mmld
similarity index 100%
rename from maven-core-it/it0015/src/main/scripts/org/apache/maven/it0015/it0015.mmld
rename to sandbox/marmalade/it0015/src/main/scripts/org/apache/maven/it0015/it0015.mmld
diff --git a/maven-core-it/it0015/system.properties b/sandbox/marmalade/it0015/system.properties
similarity index 100%
rename from maven-core-it/it0015/system.properties
rename to sandbox/marmalade/it0015/system.properties
diff --git a/examples/maven-hello-plugin/pom.xml b/sandbox/marmalade/maven-hello-plugin/pom.xml
similarity index 100%
rename from examples/maven-hello-plugin/pom.xml
rename to sandbox/marmalade/maven-hello-plugin/pom.xml
diff --git a/examples/maven-hello-plugin/src/main/scripts/hello.mmld b/sandbox/marmalade/maven-hello-plugin/src/main/scripts/hello.mmld
similarity index 100%
rename from examples/maven-hello-plugin/src/main/scripts/hello.mmld
rename to sandbox/marmalade/maven-hello-plugin/src/main/scripts/hello.mmld
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml b/sandbox/marmalade/maven-plugin-tools-marmalade/pom.xml
similarity index 100%
rename from maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
rename to sandbox/marmalade/maven-plugin-tools-marmalade/pom.xml
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractor.java b/sandbox/marmalade/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractor.java
similarity index 100%
rename from maven-plugin-tools/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractor.java
rename to sandbox/marmalade/maven-plugin-tools-marmalade/src/main/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractor.java
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus/components.xml b/sandbox/marmalade/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from maven-plugin-tools/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus/components.xml
rename to sandbox/marmalade/maven-plugin-tools-marmalade/src/main/resources/META-INF/plexus/components.xml
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/src/test/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractorTest.java b/sandbox/marmalade/maven-plugin-tools-marmalade/src/test/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractorTest.java
similarity index 100%
rename from maven-plugin-tools/maven-plugin-tools-marmalade/src/test/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractorTest.java
rename to sandbox/marmalade/maven-plugin-tools-marmalade/src/test/java/org/apache/maven/tools/plugin/extractor/marmalade/MarmaladeMojoDescriptorExtractorTest.java
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/src/test/resources/testMojo.mmld b/sandbox/marmalade/maven-plugin-tools-marmalade/src/test/resources/testMojo.mmld
similarity index 100%
rename from maven-plugin-tools/maven-plugin-tools-marmalade/src/test/resources/testMojo.mmld
rename to sandbox/marmalade/maven-plugin-tools-marmalade/src/test/resources/testMojo.mmld
diff --git a/maven-script/maven-script-marmalade/pom.xml b/sandbox/marmalade/maven-script-marmalade/pom.xml
similarity index 100%
rename from maven-script/maven-script-marmalade/pom.xml
rename to sandbox/marmalade/maven-script-marmalade/pom.xml
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojo.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojo.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojo.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojo.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoExecutionDirectives.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoExecutionDirectives.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoExecutionDirectives.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/MarmaladeMojoExecutionDirectives.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractBooleanValuedBodyTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractBooleanValuedBodyTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractBooleanValuedBodyTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractBooleanValuedBodyTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractStringValuedBodyTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractStringValuedBodyTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractStringValuedBodyTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AbstractStringValuedBodyTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/AggregatorTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionParent.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionParent.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionParent.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionParent.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/DescriptionTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteGoalTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteGoalTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteGoalTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteGoalTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteLifecycleTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutePhaseTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecuteTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutionStrategyTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutionStrategyTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutionStrategyTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ExecutionStrategyTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/GoalTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/GoalTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/GoalTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/GoalTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InheritByDefaultTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InstantiationStrategyTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InstantiationStrategyTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InstantiationStrategyTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/InstantiationStrategyTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/LifecyclePhaseTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/LifecyclePhaseTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/LifecyclePhaseTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/LifecyclePhaseTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MetadataTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamDefaultTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamDefaultTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamDefaultTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamDefaultTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamExpressionTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamExpressionTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamExpressionTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamExpressionTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamNameTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamNameTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamNameTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamNameTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamRequiredTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamRequiredTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamRequiredTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamRequiredTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamTypeTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamTypeTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamTypeTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamTypeTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParametersTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParametersTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParametersTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParametersTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleHintTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleHintTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleHintTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleHintTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementRoleTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequirementTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresDependencyResolutionTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresDependencyResolutionTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresDependencyResolutionTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresDependencyResolutionTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresOnlineTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresProjectTag.java b/sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresProjectTag.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresProjectTag.java
rename to sandbox/marmalade/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/RequiresProjectTag.java
diff --git a/maven-script/maven-script-marmalade/src/main/resources/META-INF/marmalade/mojo.def b/sandbox/marmalade/maven-script-marmalade/src/main/resources/META-INF/marmalade/mojo.def
similarity index 100%
rename from maven-script/maven-script-marmalade/src/main/resources/META-INF/marmalade/mojo.def
rename to sandbox/marmalade/maven-script-marmalade/src/main/resources/META-INF/marmalade/mojo.def
diff --git a/maven-script/maven-script-marmalade/src/test/java/org/apache/maven/script/marmalade/MarmaladeMojoTest.java b/sandbox/marmalade/maven-script-marmalade/src/test/java/org/apache/maven/script/marmalade/MarmaladeMojoTest.java
similarity index 100%
rename from maven-script/maven-script-marmalade/src/test/java/org/apache/maven/script/marmalade/MarmaladeMojoTest.java
rename to sandbox/marmalade/maven-script-marmalade/src/test/java/org/apache/maven/script/marmalade/MarmaladeMojoTest.java