diff --git a/command-line-debugger/module.ivy b/command-line-debugger/module.ivy
index 493f21b..67588e7 100644
--- a/command-line-debugger/module.ivy
+++ b/command-line-debugger/module.ivy
@@ -15,22 +15,23 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
-    <info organisation="org.apache.easyant.tasks" module="cl-debugger"
-            status="integration" revision="0.1">
-        <ea:build module="build-std-java" revision="0.2">
-            <ea:property name="project.ivy.instance" value="easyant.ivy.instance"/>
-            <ea:property name="src.main.java" value="src/main"/>
-            <ea:property name="src.main.resources" value="src/main"/>
-            <ea:property name="resources.std.includes.pattern" value="**/*.properties"/>
-        </ea:build>
+    <info organisation="org.apache.easyant.tasks" module="cl-debugger" status="integration" revision="0.1">
+        <extends organisation="org.apache.easyant.tasks" module="parent-task" revision="0.1"/>
+        <ea:build module="build-std-java" revision="0.9" />
+        <ea:property name="src.main.java" value="src/main" />
+        <ea:property name="src.main.resources" value="src/main" />
+        <ea:property name="resources.std.includes.pattern" value="**/*.properties" />
+    </ea:build>
     </info>
     <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
-        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-        <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+        <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test" visibility="private"
+            description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+        <conf name="provided" visibility="public"
+            description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
     </configurations>
     <dependencies>
-        <dependency org="junit" name="junit" rev="4.4" conf="test->default"/>
-        <dependency org="org.apache.ant" name="ant" rev="1.8.2" conf="provided->default"/>
+        <dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+        <dependency org="org.apache.ant" name="ant" rev="1.8.2" conf="provided->default" />
     </dependencies>
 </ivy-module>
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/Auditor.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/Auditor.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/Auditor.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/Auditor.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/DebugCommandSet.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/DebugCommandSet.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/DebugCommandSet.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/DebugCommandSet.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/DebugPrompt.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/DebugPrompt.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/DebugPrompt.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/DebugPrompt.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/DebugSupport.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/DebugSupport.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/DebugSupport.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/DebugSupport.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/DebugUtils.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/DebugUtils.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/DebugUtils.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/DebugUtils.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/DefaultAuditor.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/DefaultAuditor.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/DefaultAuditor.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/DefaultAuditor.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/Inspector.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/Inspector.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/Inspector.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/Inspector.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/NoOp.java b/command-line-debugger/src/main/java/org/apache/ant/debugger/NoOp.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/NoOp.java
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/NoOp.java
diff --git a/command-line-debugger/src/main/org/apache/ant/debugger/debug-support.properties b/command-line-debugger/src/main/java/org/apache/ant/debugger/debug-support.properties
similarity index 100%
rename from command-line-debugger/src/main/org/apache/ant/debugger/debug-support.properties
rename to command-line-debugger/src/main/java/org/apache/ant/debugger/debug-support.properties
diff --git a/command-line-debugger/src/main/org/apache/tools/ant/Locator.java b/command-line-debugger/src/main/java/org/apache/tools/ant/Locator.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/tools/ant/Locator.java
rename to command-line-debugger/src/main/java/org/apache/tools/ant/Locator.java
diff --git a/command-line-debugger/src/main/org/apache/tools/ant/PropertyDebugHelper.java b/command-line-debugger/src/main/java/org/apache/tools/ant/PropertyDebugHelper.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/tools/ant/PropertyDebugHelper.java
rename to command-line-debugger/src/main/java/org/apache/tools/ant/PropertyDebugHelper.java
diff --git a/command-line-debugger/src/main/org/apache/tools/ant/listener/DebuggerListener.java b/command-line-debugger/src/main/java/org/apache/tools/ant/listener/DebuggerListener.java
similarity index 100%
rename from command-line-debugger/src/main/org/apache/tools/ant/listener/DebuggerListener.java
rename to command-line-debugger/src/main/java/org/apache/tools/ant/listener/DebuggerListener.java
diff --git a/mavenivy-adapters/module.ivy b/mavenivy-adapters/module.ivy
index bddcd2c..d4b9156 100755
--- a/mavenivy-adapters/module.ivy
+++ b/mavenivy-adapters/module.ivy
@@ -15,28 +15,24 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
-    <info organisation="org.apache.easyant.tasks" module="mavenivy-adapters"
-            status="integration" revision="0.1">
-        <ea:build module="build-std-java" revision="0.2">
-            <ea:property name="project.ivy.instance" value="easyant.ivy.instance"/>
-            <ea:property name="release.resolver" value="easyant-shared-modules"/>
-            <ea:property name="shared.resolver" value="easyant-shared-modules"/>
-            <ea:property name="local.resolver" value="easyant-shared-modules"/>
-        </ea:build>
+    <info organisation="org.apache.easyant.tasks" module="mavenivy-adapters" status="integration" revision="0.1">
+        <extends organisation="org.apache.easyant.tasks" module="parent-task" revision="0.1"/>
+        <ea:build module="build-std-java" revision="0.9" />
     </info>
     <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
-        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-        <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-
+        <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test" visibility="private"
+            description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+        <conf name="provided" visibility="public"
+            description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
     </configurations>
     <dependencies>
         <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.0" conf="default->default">
-            <exclude org="ant" module="ant"/>
+            <exclude org="ant" module="ant" />
         </dependency>
-        <dependency org="org.apache.ivy" name="ivy" rev="2.1.0" conf="provided->default"/>
-        <dependency org="junit" name="junit" rev="4.4" conf="test->default"/>
-        <dependency org="org.apache.ant" name="ant" rev="1.8.1" conf="provided->default"/>
-            <dependency org="org.apache.ant" name="ant-testutil" rev="1.8.1" conf="test->default" transitive="false" />
+        <dependency org="org.apache.ivy" name="ivy" rev="2.1.0" conf="provided->default" />
+        <dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+        <dependency org="org.apache.ant" name="ant" rev="1.8.4" conf="provided->default" />
+        <dependency org="org.apache.ant" name="ant-testutil" rev="1.8.4" conf="test->default" transitive="false" />
     </dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file
diff --git a/partial-jnlp-ant-task/module.ivy b/partial-jnlp-ant-task/module.ivy
index 19e2dc7..fc2f25b 100644
--- a/partial-jnlp-ant-task/module.ivy
+++ b/partial-jnlp-ant-task/module.ivy
@@ -14,23 +14,22 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.tasks" module="partial-jnlp-task" 
-            status="integration" revision="0.1">
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+    <info organisation="org.apache.easyant.tasks" module="partial-jnlp-task" status="integration" revision="0.1">
+        <extends organisation="org.apache.easyant.tasks" module="parent-task" revision="0.1" />
         <description>
             This task is used to modify existing jnlp file.
         </description>
-        <ea:build module="build-std-java" revision="0.2"/>
-        <ea:property name="project.ivy.instance" value="easyant.ivy.instance"/>
-        <ea:property name="shared.resolver" value="easyant-modules"/>
-        <ea:property name="release.resolver" value="easyant-modules"/>
+        <ea:build module="build-std-java" revision="0.9" />
     </info>
     <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf"/>
-        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-        <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+        <conf name="default" visibility="public" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test" visibility="private"
+            description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." />
+        <conf name="provided" visibility="public"
+            description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive." />
     </configurations>
     <dependencies>
-        <dependency org="org.apache.ant" name="ant" rev="1.7.1" conf="provided->default"/>
+        <dependency org="org.apache.ant" name="ant" rev="1.7.1" conf="provided->default" />
     </dependencies>
-</ivy-module>
+</ivy-module>
\ No newline at end of file