diff --git a/src/java/net/brutex/xservices/types/ReturnCode.java b/src/java/net/brutex/xservices/types/ReturnCode.java
index c460334..a9c6e8f 100644
--- a/src/java/net/brutex/xservices/types/ReturnCode.java
+++ b/src/java/net/brutex/xservices/types/ReturnCode.java
@@ -19,6 +19,8 @@ package net.brutex.xservices.types;
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+
+import net.brutex.xservices.types.ant.AntProperty;
 import net.brutex.xservices.util.BrutexNamespaces;
 
 /**
diff --git a/src/java/net/brutex/xservices/types/TargetNodeType.java b/src/java/net/brutex/xservices/types/TargetNodeType.java
index e4689f3..624a69b 100644
--- a/src/java/net/brutex/xservices/types/TargetNodeType.java
+++ b/src/java/net/brutex/xservices/types/TargetNodeType.java
@@ -19,6 +19,8 @@ package net.brutex.xservices.types;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
+import net.brutex.xservices.util.BrutexNamespaces;
+
 
 /**
  * Defines target nodes.
@@ -26,9 +28,10 @@ import javax.xml.bind.annotation.XmlType;
  * @author Brian Rosenberger
  * @since 1.0
  */
-@XmlType()
+@XmlType(name=TargetNodeType.XML_NAME, namespace=BrutexNamespaces.WS_XSERVICES)
 public class TargetNodeType {
 
+	public static final String XML_NAME = "targetnode";
 	private String name="";
 
 
@@ -47,6 +50,9 @@ public class TargetNodeType {
 		this.name = name;
 	}
 	
+	/**
+	 * 
+	 */
 	public TargetNodeType() {
 
 	}	
diff --git a/src/java/net/brutex/xservices/types/AntProperty.java b/src/java/net/brutex/xservices/types/ant/AntProperty.java
similarity index 97%
rename from src/java/net/brutex/xservices/types/AntProperty.java
rename to src/java/net/brutex/xservices/types/ant/AntProperty.java
index 8e58899..f60c9b6 100644
--- a/src/java/net/brutex/xservices/types/AntProperty.java
+++ b/src/java/net/brutex/xservices/types/ant/AntProperty.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/java/net/brutex/xservices/types/ArchiveResource.java b/src/java/net/brutex/xservices/types/ant/ArchiveResource.java
similarity index 98%
rename from src/java/net/brutex/xservices/types/ArchiveResource.java
rename to src/java/net/brutex/xservices/types/ant/ArchiveResource.java
index a7c3e39..cdf0f1b 100644
--- a/src/java/net/brutex/xservices/types/ArchiveResource.java
+++ b/src/java/net/brutex/xservices/types/ant/ArchiveResource.java
@@ -14,12 +14,13 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.io.File;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
+
 import net.brutex.xservices.util.BrutexNamespaces;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Resource;
diff --git a/src/java/net/brutex/xservices/types/AttachmentType.java b/src/java/net/brutex/xservices/types/ant/AttachmentType.java
similarity index 94%
rename from src/java/net/brutex/xservices/types/AttachmentType.java
rename to src/java/net/brutex/xservices/types/ant/AttachmentType.java
index a02a184..d95f369 100644
--- a/src/java/net/brutex/xservices/types/AttachmentType.java
+++ b/src/java/net/brutex/xservices/types/ant/AttachmentType.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/java/net/brutex/xservices/types/CollectionType.java b/src/java/net/brutex/xservices/types/ant/CollectionType.java
similarity index 92%
rename from src/java/net/brutex/xservices/types/CollectionType.java
rename to src/java/net/brutex/xservices/types/ant/CollectionType.java
index 851df9a..943321c 100644
--- a/src/java/net/brutex/xservices/types/CollectionType.java
+++ b/src/java/net/brutex/xservices/types/ant/CollectionType.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.util.UUID;
 
diff --git a/src/java/net/brutex/xservices/types/ContainsSelectorType.java b/src/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
similarity index 97%
rename from src/java/net/brutex/xservices/types/ContainsSelectorType.java
rename to src/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
index 5bf48b8..5522d06 100644
--- a/src/java/net/brutex/xservices/types/ContainsSelectorType.java
+++ b/src/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/java/net/brutex/xservices/types/FileResource.java b/src/java/net/brutex/xservices/types/ant/FileResource.java
similarity index 98%
rename from src/java/net/brutex/xservices/types/FileResource.java
rename to src/java/net/brutex/xservices/types/ant/FileResource.java
index 9bd254e..f3f191e 100644
--- a/src/java/net/brutex/xservices/types/FileResource.java
+++ b/src/java/net/brutex/xservices/types/ant/FileResource.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.io.File;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/java/net/brutex/xservices/types/FileSetResource.java b/src/java/net/brutex/xservices/types/ant/FileSetResource.java
similarity index 99%
rename from src/java/net/brutex/xservices/types/FileSetResource.java
rename to src/java/net/brutex/xservices/types/ant/FileSetResource.java
index ebfa629..9a74adf 100644
--- a/src/java/net/brutex/xservices/types/FileSetResource.java
+++ b/src/java/net/brutex/xservices/types/ant/FileSetResource.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.io.File;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/java/net/brutex/xservices/types/PatternElement.java b/src/java/net/brutex/xservices/types/ant/PatternElement.java
similarity index 95%
rename from src/java/net/brutex/xservices/types/PatternElement.java
rename to src/java/net/brutex/xservices/types/ant/PatternElement.java
index f7cdb32..8c355f8 100644
--- a/src/java/net/brutex/xservices/types/PatternElement.java
+++ b/src/java/net/brutex/xservices/types/ant/PatternElement.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
diff --git a/src/java/net/brutex/xservices/types/PatternSetType.java b/src/java/net/brutex/xservices/types/ant/PatternSetType.java
similarity index 96%
rename from src/java/net/brutex/xservices/types/PatternSetType.java
rename to src/java/net/brutex/xservices/types/ant/PatternSetType.java
index e5fa887..1aa9ac1 100644
--- a/src/java/net/brutex/xservices/types/PatternSetType.java
+++ b/src/java/net/brutex/xservices/types/ant/PatternSetType.java
@@ -13,7 +13,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/java/net/brutex/xservices/types/ResourceInterface.java b/src/java/net/brutex/xservices/types/ant/ResourceInterface.java
similarity index 96%
rename from src/java/net/brutex/xservices/types/ResourceInterface.java
rename to src/java/net/brutex/xservices/types/ant/ResourceInterface.java
index b49536d..b9d5b64 100644
--- a/src/java/net/brutex/xservices/types/ResourceInterface.java
+++ b/src/java/net/brutex/xservices/types/ant/ResourceInterface.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Resource;
diff --git a/src/java/net/brutex/xservices/types/ResourceSetInterface.java b/src/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
similarity index 93%
rename from src/java/net/brutex/xservices/types/ResourceSetInterface.java
rename to src/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
index b91d1a4..b9ceea1 100644
--- a/src/java/net/brutex/xservices/types/ResourceSetInterface.java
+++ b/src/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
@@ -20,7 +20,7 @@
  *
  * @author Brian Rosenberger, bru@brutex.de
  */
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.ResourceCollection;
diff --git a/src/java/net/brutex/xservices/types/SelectorType.java b/src/java/net/brutex/xservices/types/ant/SelectorType.java
similarity index 96%
rename from src/java/net/brutex/xservices/types/SelectorType.java
rename to src/java/net/brutex/xservices/types/ant/SelectorType.java
index 15b716b..4e84ea0 100644
--- a/src/java/net/brutex/xservices/types/SelectorType.java
+++ b/src/java/net/brutex/xservices/types/ant/SelectorType.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/java/net/brutex/xservices/types/SelectorTypeInterface.java b/src/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
similarity index 93%
rename from src/java/net/brutex/xservices/types/SelectorTypeInterface.java
rename to src/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
index 2a27d75..87da0a6 100644
--- a/src/java/net/brutex/xservices/types/SelectorTypeInterface.java
+++ b/src/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package net.brutex.xservices.types;
+package net.brutex.xservices.types.ant;
 
 import org.apache.tools.ant.types.selectors.FileSelector;