diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index e2ab658aa92..1b6cac791f9 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -32,7 +32,7 @@ import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;
 import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd;
 import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
 import com.cloud.api.commands.ListAlertsCmd;
-import com.cloud.api.commands.ListAsyncJobsCmd;
+import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;
 import com.cloud.api.commands.ListCapabilitiesCmd;
 import com.cloud.api.commands.ListCapacityCmd;
 import com.cloud.api.commands.ListCfgsByCmd;
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
index d711fcf65c3..99398550a1f 100755
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import com.cloud.api.commands.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;
 import com.cloud.api.response.AccountResponse;
 import com.cloud.api.response.AsyncJobResponse;
 import com.cloud.api.response.AutoScalePolicyResponse;
diff --git a/api/src/com/cloud/api/commands/ListAsyncJobsCmd.java b/api/src/org/apache/cloudstack/api/user/job/command/ListAsyncJobsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListAsyncJobsCmd.java
rename to api/src/org/apache/cloudstack/api/user/job/command/ListAsyncJobsCmd.java
index 734b578a6e7..addaa12a67d 100644
--- a/api/src/com/cloud/api/commands/ListAsyncJobsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/job/command/ListAsyncJobsCmd.java
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.api.commands;
+package org.apache.cloudstack.api.user.job.command;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/api/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java b/api/src/org/apache/cloudstack/api/user/job/command/QueryAsyncJobResultCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java
rename to api/src/org/apache/cloudstack/api/user/job/command/QueryAsyncJobResultCmd.java
index e9f91afb22d..defeab7fab4 100644
--- a/api/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/job/command/QueryAsyncJobResultCmd.java
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.api.commands;
+package org.apache.cloudstack.api.user.job.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 3a549f51e20..77b7cd7398d 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -260,8 +260,8 @@ migrateVolume=com.cloud.api.commands.MigrateVolumeCmd;15
 registerUserKeys=com.cloud.api.commands.RegisterCmd;1
 
 ### async-query command
-queryAsyncJobResult=com.cloud.api.commands.QueryAsyncJobResultCmd;15
-listAsyncJobs=com.cloud.api.commands.ListAsyncJobsCmd;15
+queryAsyncJobResult=org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;15
+listAsyncJobs=org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;15
 
 #### storage pools commands
 listStoragePools=com.cloud.api.commands.ListStoragePoolsCmd;3
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index f4d0eeb7953..24fb480944e 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -39,7 +39,7 @@ import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import com.cloud.api.commands.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;
 import com.cloud.api.response.AccountResponse;
 import com.cloud.api.response.ApiResponseSerializer;
 import com.cloud.api.response.AsyncJobResponse;
diff --git a/server/src/com/cloud/async/AsyncJobManager.java b/server/src/com/cloud/async/AsyncJobManager.java
index 482499714c6..7876b551903 100644
--- a/server/src/com/cloud/async/AsyncJobManager.java
+++ b/server/src/com/cloud/async/AsyncJobManager.java
@@ -18,7 +18,7 @@ package com.cloud.async;
 
 import java.util.List;
 
-import com.cloud.api.commands.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;
 import com.cloud.utils.component.Manager;
 
 public interface AsyncJobManager extends Manager {
diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java
index a90d4435885..a451f28c438 100644
--- a/server/src/com/cloud/async/AsyncJobManagerImpl.java
+++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java
@@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;
 import org.apache.log4j.Logger;
 import org.apache.log4j.NDC;
 
@@ -43,7 +44,6 @@ import com.cloud.api.ApiSerializerHelper;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.commands.QueryAsyncJobResultCmd;
 import com.cloud.api.response.ExceptionResponse;
 import com.cloud.async.dao.AsyncJobDao;
 import com.cloud.cluster.ClusterManager;
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index e4c357c7e28..145b256d750 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -43,6 +43,7 @@ import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.cloudstack.api.user.iso.command.ListIsosCmd;
+import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;
 import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;
 import org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd;
 import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;
@@ -69,7 +70,6 @@ import com.cloud.api.commands.DestroySystemVmCmd;
 import com.cloud.api.commands.ExtractVolumeCmd;
 import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
 import com.cloud.api.commands.ListAlertsCmd;
-import com.cloud.api.commands.ListAsyncJobsCmd;
 import com.cloud.api.commands.ListCapabilitiesCmd;
 import com.cloud.api.commands.ListCapacityCmd;
 import com.cloud.api.commands.ListCfgsByCmd;