diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index fe68c3e3729..e73b04ecc86 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -22,10 +22,10 @@ import java.util.Map;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
+import org.apache.cloudstack.api.admin.user.command.RegisterCmd;
 import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
 import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
 import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
-import com.cloud.api.commands.RegisterCmd;
 import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;
 import com.cloud.domain.Domain;
 import com.cloud.exception.ConcurrentOperationException;
diff --git a/api/src/com/cloud/api/commands/RegisterCmd.java b/api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/RegisterCmd.java
rename to api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.java
index 7e9b01e8401..8aa4d0473e3 100644
--- a/api/src/com/cloud/api/commands/RegisterCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.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.admin.user.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index e95458177f8..2f4f1b1c6ab 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -257,7 +257,7 @@ migrateVolume=org.apache.cloudstack.api.user.volume.command.MigrateVolumeCmd;15
 ####                                 use that key...the key is stored in the db associated w/
 ####                                 the userId...every request to the developer API should be
 ####                                 checked against the key
-registerUserKeys=com.cloud.api.commands.RegisterCmd;1
+registerUserKeys=org.apache.cloudstack.api.admin.user.command.RegisterCmd;1
 
 ### async-query command
 queryAsyncJobResult=org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;15
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index ae5be6662e6..980ee3a7ef2 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -37,6 +37,7 @@ import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
 import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
+import org.apache.cloudstack.api.admin.user.command.RegisterCmd;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 
@@ -47,7 +48,6 @@ import com.cloud.acl.SecurityChecker.AccessType;
 import com.cloud.api.ApiDBUtils;
 import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
 import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
-import com.cloud.api.commands.RegisterCmd;
 import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;
 import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
 import com.cloud.configuration.Config;
diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java
index 484a2cc57ae..03e2c1adfd5 100644
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@ -26,8 +26,8 @@ import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
 import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
+import org.apache.cloudstack.api.admin.user.command.RegisterCmd;
 import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
-import com.cloud.api.commands.RegisterCmd;
 import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;
 import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
 import com.cloud.api.view.vo.ControlledViewEntity;