diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/DeltaCloudClientIntegrationTestSuite.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/DeltaCloudClientIntegrationTestSuite.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/DeltaCloudClientIntegrationTestSuite.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/DeltaCloudClientIntegrationTestSuite.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/DeltaCloudClientTestSuite.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/DeltaCloudClientTestSuite.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/DeltaCloudClientTestSuite.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/DeltaCloudClientTestSuite.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/APIDomUnmarshallingTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/APIDomUnmarshallingTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/APIDomUnmarshallingTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/APIDomUnmarshallingTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/HardwareProfileDomUnmarshallingTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/HardwareProfileDomUnmarshallingTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/HardwareProfileDomUnmarshallingTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/HardwareProfileDomUnmarshallingTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ImageDomUnmarshallingTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ImageDomUnmarshallingTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ImageDomUnmarshallingTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ImageDomUnmarshallingTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ImageMockIntegrationTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ImageMockIntegrationTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ImageMockIntegrationTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ImageMockIntegrationTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/InstanceDomUnmarshallingTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/InstanceDomUnmarshallingTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/InstanceDomUnmarshallingTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/InstanceDomUnmarshallingTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/InstanceMockIntegrationTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/InstanceMockIntegrationTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/InstanceMockIntegrationTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/InstanceMockIntegrationTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/KeyDomUnmarshallingTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/KeyDomUnmarshallingTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/KeyDomUnmarshallingTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/KeyDomUnmarshallingTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/KeyMockIntegrationTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/KeyMockIntegrationTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/KeyMockIntegrationTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/KeyMockIntegrationTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ProfileMockIntegrationTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ProfileMockIntegrationTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ProfileMockIntegrationTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ProfileMockIntegrationTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/RealmDomUnmarshallingTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/RealmDomUnmarshallingTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/RealmDomUnmarshallingTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/RealmDomUnmarshallingTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/RealmMockIntegrationTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/RealmMockIntegrationTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/RealmMockIntegrationTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/RealmMockIntegrationTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ServerTypeMockIntegrationTest.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ServerTypeMockIntegrationTest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/client/ServerTypeMockIntegrationTest.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/client/ServerTypeMockIntegrationTest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/context/MockIntegrationTestContext.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/context/MockIntegrationTestContext.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/context/MockIntegrationTestContext.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/context/MockIntegrationTestContext.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/APIResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/APIResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/APIResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/APIResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/HardwareProfileResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/HardwareProfileResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/HardwareProfileResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/HardwareProfileResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/ImageResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/ImageResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/ImageResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/ImageResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/InstanceResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/InstanceResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/InstanceResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/InstanceResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/KeyResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/KeyResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/KeyResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/KeyResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/RealmResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/RealmResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/RealmResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/RealmResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/ServerFake.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/ServerFake.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/ServerFake.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/ServerFake.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/ServerResponseFakes.java b/clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/ServerResponseFakes.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client.test/src/org/jboss/tools/internal/deltacloud/client/test/fakes/ServerResponseFakes.java
rename to clients/java/org.jboss.tools.deltacloud.client.test/src/org/apache/deltacloud/client/internal/test/fakes/ServerResponseFakes.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/about.html b/clients/java/org.jboss.tools.deltacloud.client/about.html
deleted file mode 100644
index 44fa9425..00000000
--- a/clients/java/org.jboss.tools.deltacloud.client/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Cloud Development Tools</title>
-<style type="text/css" media="screen">
-<!--
-  body {
-    font-family: Sans-serif, Arial, Helvetica;
-  }
-
--->
-</style>
-</head>
-<body>
-<h1>DeltaCloud Client</h1>
-
-<p>
-This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
-</p>
-
-<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
-
-<p>
-This software is distributed under the terms of the Apache License, Version 2.0
-(see <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>).
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/API.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/API.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/API.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/API.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Action.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Action.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Action.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Action.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/ActionAware.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/ActionAware.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/ActionAware.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/ActionAware.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/AddressList.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/AddressList.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/AddressList.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/AddressList.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudAuthClientException.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudAuthClientException.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudAuthClientException.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudAuthClientException.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudClient.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudClient.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudClient.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudClient.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudClientException.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudClientException.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudClientException.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudClientException.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudClientImpl.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudClientImpl.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudClientImpl.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudClientImpl.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudNotFoundClientException.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudNotFoundClientException.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/DeltaCloudNotFoundClientException.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/DeltaCloudNotFoundClientException.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HardwareProfile.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HardwareProfile.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HardwareProfile.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HardwareProfile.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HttpMethod.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HttpMethod.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HttpMethod.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HttpMethod.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HttpStatusCode.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HttpStatusCode.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HttpStatusCode.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HttpStatusCode.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HttpStatusRange.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HttpStatusRange.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/HttpStatusRange.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/HttpStatusRange.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/IdAware.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/IdAware.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/IdAware.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/IdAware.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Image.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Image.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Image.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Image.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Instance.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Instance.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Instance.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Instance.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Key.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Key.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Key.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Key.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Property.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Property.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Property.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Property.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Realm.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Realm.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/Realm.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/Realm.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/ResourceAction.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/ResourceAction.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/ResourceAction.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/ResourceAction.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/StateAware.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/StateAware.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/StateAware.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/StateAware.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/AbstractDeltaCloudRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/AbstractDeltaCloudRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/AbstractDeltaCloudRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/AbstractDeltaCloudRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/AbstractListObjectsRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/AbstractListObjectsRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/AbstractListObjectsRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/AbstractListObjectsRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/CreateInstanceRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/CreateInstanceRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/CreateInstanceRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/CreateInstanceRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/CreateKeyRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/CreateKeyRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/CreateKeyRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/CreateKeyRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/DeltaCloudRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/DeltaCloudRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/DeltaCloudRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/DeltaCloudRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListHardwareProfileRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListHardwareProfileRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListHardwareProfileRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListHardwareProfileRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListHardwareProfilesRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListHardwareProfilesRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListHardwareProfilesRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListHardwareProfilesRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListImageRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListImageRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListImageRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListImageRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListImagesRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListImagesRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListImagesRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListImagesRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListInstanceRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListInstanceRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListInstanceRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListInstanceRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListInstancesRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListInstancesRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListInstancesRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListInstancesRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListKeyRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListKeyRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListKeyRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListKeyRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListKeysRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListKeysRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListKeysRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListKeysRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListRealmRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListRealmRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListRealmRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListRealmRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListRealmsRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListRealmsRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/ListRealmsRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/ListRealmsRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/PerformActionRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/PerformActionRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/PerformActionRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/PerformActionRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/TypeRequest.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/TypeRequest.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/request/TypeRequest.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/request/TypeRequest.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/AbstractHttpTransport.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/AbstractHttpTransport.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/AbstractHttpTransport.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/AbstractHttpTransport.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/Base64Coder.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/Base64Coder.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/Base64Coder.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/Base64Coder.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/IHttpTransport.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/IHttpTransport.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/IHttpTransport.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/IHttpTransport.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/URLConnectionTransport.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/URLConnectionTransport.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/transport/URLConnectionTransport.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/transport/URLConnectionTransport.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/APIUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/APIUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/APIUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/APIUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractActionAwareUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractActionAwareUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractActionAwareUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractActionAwareUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractDOMUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractDOMUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractDOMUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractDOMUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractDeltaCloudObjectUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractDeltaCloudObjectUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractDeltaCloudObjectUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractDeltaCloudObjectUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractDeltaCloudObjectsUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractDeltaCloudObjectsUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/AbstractDeltaCloudObjectsUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/AbstractDeltaCloudObjectsUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/ActionUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/ActionUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/ActionUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/ActionUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/HardwareProfileUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/HardwareProfileUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/HardwareProfileUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/HardwareProfileUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/HardwareProfilesUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/HardwareProfilesUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/HardwareProfilesUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/HardwareProfilesUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/IDeltaCloudObjectUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/IDeltaCloudObjectUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/IDeltaCloudObjectUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/IDeltaCloudObjectUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/ImageUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/ImageUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/ImageUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/ImageUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/ImagesUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/ImagesUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/ImagesUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/ImagesUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/InstanceUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/InstanceUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/InstanceUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/InstanceUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/InstancesUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/InstancesUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/InstancesUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/InstancesUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/KeyUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/KeyUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/KeyUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/KeyUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/KeysUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/KeysUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/KeysUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/KeysUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/RealmUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/RealmUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/RealmUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/RealmUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/RealmsUnmarshaller.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/RealmsUnmarshaller.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/unmarshal/RealmsUnmarshaller.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/unmarshal/RealmsUnmarshaller.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/Assert.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/Assert.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/Assert.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/Assert.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/StreamUtils.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/StreamUtils.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/StreamUtils.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/StreamUtils.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/StringUtils.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/StringUtils.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/StringUtils.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/StringUtils.java
diff --git a/clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/UrlBuilder.java b/clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/UrlBuilder.java
similarity index 100%
rename from clients/java/org.jboss.tools.deltacloud.client/src/org/jboss/tools/deltacloud/client/utils/UrlBuilder.java
rename to clients/java/org.jboss.tools.deltacloud.client/src/org/apache/deltacloud/client/utils/UrlBuilder.java