diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index ff4e3b78be5..001d498e2dc 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -22,7 +22,7 @@ import java.util.Map;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.SecurityChecker.AccessType;
 import com.cloud.api.commands.DeleteUserCmd;
-import com.cloud.api.commands.ListAccountsCmd;
+import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
 import com.cloud.api.commands.ListUsersCmd;
 import com.cloud.api.commands.RegisterCmd;
 import com.cloud.api.commands.UpdateAccountCmd;
diff --git a/api/src/com/cloud/api/commands/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/account/command/DisableAccountCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/DisableAccountCmd.java
rename to api/src/org/apache/cloudstack/api/admin/account/command/DisableAccountCmd.java
index 669378665ed..e6e9fd5878c 100644
--- a/api/src/com/cloud/api/commands/DisableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/account/command/DisableAccountCmd.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.account.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/account/command/EnableAccountCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/EnableAccountCmd.java
rename to api/src/org/apache/cloudstack/api/admin/account/command/EnableAccountCmd.java
index 36d9b7b6da9..ca0c9521d1a 100644
--- a/api/src/com/cloud/api/commands/EnableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/account/command/EnableAccountCmd.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.account.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/user/account/command/AddAccountToProjectCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/AddAccountToProjectCmd.java
rename to api/src/org/apache/cloudstack/api/user/account/command/AddAccountToProjectCmd.java
index 0e5fe567599..56dea9ebc76 100644
--- a/api/src/com/cloud/api/commands/AddAccountToProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/account/command/AddAccountToProjectCmd.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.account.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/user/account/command/DeleteAccountFromProjectCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/DeleteAccountFromProjectCmd.java
rename to api/src/org/apache/cloudstack/api/user/account/command/DeleteAccountFromProjectCmd.java
index d6e3494debc..d5ce0e9c02a 100644
--- a/api/src/com/cloud/api/commands/DeleteAccountFromProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/account/command/DeleteAccountFromProjectCmd.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.account.command;
 
 import org.apache.cloudstack.api.user.project.command.DeleteProjectCmd;
 import org.apache.log4j.Logger;
diff --git a/api/src/com/cloud/api/commands/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/user/account/command/ListAccountsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListAccountsCmd.java
rename to api/src/org/apache/cloudstack/api/user/account/command/ListAccountsCmd.java
index ddf18ccf3fd..1a412859b73 100755
--- a/api/src/com/cloud/api/commands/ListAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/account/command/ListAccountsCmd.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.account.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/src/com/cloud/api/commands/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/user/account/command/ListProjectAccountsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListProjectAccountsCmd.java
rename to api/src/org/apache/cloudstack/api/user/account/command/ListProjectAccountsCmd.java
index 4f8a6e312d9..3ad7fe644a0 100644
--- a/api/src/com/cloud/api/commands/ListProjectAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/account/command/ListProjectAccountsCmd.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.account.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
index 9b1606e1847..d7191967e09 100644
--- a/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
@@ -19,6 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.apache.cloudstack.api.user.account.command.AddAccountToProjectCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -29,7 +30,6 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.projects.Project;
 import com.cloud.projects.ProjectService;
 import com.cloud.user.Account;
-import com.cloud.api.commands.AddAccountToProjectCmd;
 
 public class AddAccountToProjectCmdTest extends TestCase {
 
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 378e4716e7b..48cca46ba9b 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -22,10 +22,10 @@
 createAccount=com.cloud.api.commands.CreateAccountCmd;3
 deleteAccount=com.cloud.api.commands.DeleteAccountCmd;3
 updateAccount=com.cloud.api.commands.UpdateAccountCmd;3
-disableAccount=com.cloud.api.commands.DisableAccountCmd;7
-enableAccount=com.cloud.api.commands.EnableAccountCmd;7
+disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd;7
+enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7
 ###lockAccount=com.cloud.api.commands.LockAccountCmd;7
-listAccounts=com.cloud.api.commands.ListAccountsCmd;15
+listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15
 markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1
 
 #### User commands
@@ -328,9 +328,9 @@ updateProject=org.apache.cloudstack.api.user.project.command.UpdateProjectCmd;15
 activateProject=org.apache.cloudstack.api.user.project.command.ActivateProjectCmd;15
 suspendProject=org.apache.cloudstack.api.user.project.command.SuspendProjectCmd;15
 listProjects=org.apache.cloudstack.api.user.project.command.ListProjectsCmd;15
-addAccountToProject=com.cloud.api.commands.AddAccountToProjectCmd;15
-deleteAccountFromProject=com.cloud.api.commands.DeleteAccountFromProjectCmd;15
-listProjectAccounts=com.cloud.api.commands.ListProjectAccountsCmd;15
+addAccountToProject=org.apache.cloudstack.api.user.account.command.AddAccountToProjectCmd;15
+deleteAccountFromProject=org.apache.cloudstack.api.user.account.command.DeleteAccountFromProjectCmd;15
+listProjectAccounts=org.apache.cloudstack.api.user.account.command.ListProjectAccountsCmd;15
 listProjectInvitations=org.apache.cloudstack.api.user.project.command.ListProjectInvitationsCmd;15
 updateProjectInvitation=org.apache.cloudstack.api.user.project.command.UpdateProjectInvitationCmd;15
 deleteProjectInvitation=org.apache.cloudstack.api.user.project.command.DeleteProjectInvitationCmd;15
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index f59547885fe..5a1f8405d44 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -44,7 +44,7 @@ import com.cloud.acl.SecurityChecker;
 import com.cloud.acl.SecurityChecker.AccessType;
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.commands.DeleteUserCmd;
-import com.cloud.api.commands.ListAccountsCmd;
+import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
 import com.cloud.api.commands.ListUsersCmd;
 import com.cloud.api.commands.RegisterCmd;
 import com.cloud.api.commands.UpdateAccountCmd;
diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java
index 08234fda0a0..d464fc85ca2 100644
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@ -25,7 +25,7 @@ import javax.naming.ConfigurationException;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.SecurityChecker.AccessType;
 import com.cloud.api.commands.DeleteUserCmd;
-import com.cloud.api.commands.ListAccountsCmd;
+import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
 import com.cloud.api.commands.ListUsersCmd;
 import com.cloud.api.commands.RegisterCmd;
 import com.cloud.api.commands.UpdateAccountCmd;