diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index 0169d767bea..37560b5e21a 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -24,7 +24,7 @@ import java.util.Set;
 
 import com.cloud.alert.Alert;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.user.datacenter.command.ListCapabilitiesCmd;
+import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;
 import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;
 import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;
 import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;
diff --git a/api/src/org/apache/cloudstack/api/user/datacenter/command/GetCloudIdentifierCmd.java b/api/src/org/apache/cloudstack/api/user/resource/command/GetCloudIdentifierCmd.java
similarity index 98%
rename from api/src/org/apache/cloudstack/api/user/datacenter/command/GetCloudIdentifierCmd.java
rename to api/src/org/apache/cloudstack/api/user/resource/command/GetCloudIdentifierCmd.java
index f836625b9c0..09d8ecdcfe1 100644
--- a/api/src/org/apache/cloudstack/api/user/datacenter/command/GetCloudIdentifierCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/resource/command/GetCloudIdentifierCmd.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 org.apache.cloudstack.api.user.datacenter.command;
+package org.apache.cloudstack.api.user.resource.command;
 
 import java.util.ArrayList;
 
diff --git a/api/src/org/apache/cloudstack/api/user/datacenter/command/ListCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.java
similarity index 97%
rename from api/src/org/apache/cloudstack/api/user/datacenter/command/ListCapabilitiesCmd.java
rename to api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.java
index aa926c26fea..7fd69c78024 100644
--- a/api/src/org/apache/cloudstack/api/user/datacenter/command/ListCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.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 org.apache.cloudstack.api.user.datacenter.command;
+package org.apache.cloudstack.api.user.resource.command;
 
 import java.util.Map;
 
diff --git a/api/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/user/resource/command/ListResourceLimitsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListResourceLimitsCmd.java
rename to api/src/org/apache/cloudstack/api/user/resource/command/ListResourceLimitsCmd.java
index 7f832ae09cd..49e29d67dd4 100644
--- a/api/src/com/cloud/api/commands/ListResourceLimitsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/resource/command/ListResourceLimitsCmd.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.resource.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/src/com/cloud/api/commands/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceCountCmd.java
similarity index 99%
rename from api/src/com/cloud/api/commands/UpdateResourceCountCmd.java
rename to api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceCountCmd.java
index 811b917d6bb..53448c697cc 100644
--- a/api/src/com/cloud/api/commands/UpdateResourceCountCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceCountCmd.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.resource.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/src/com/cloud/api/commands/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceLimitCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/UpdateResourceLimitCmd.java
rename to api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceLimitCmd.java
index 9ef94ef4518..c1270762a55 100644
--- a/api/src/com/cloud/api/commands/UpdateResourceLimitCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceLimitCmd.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.resource.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 4ea397405be..d8883c22780 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -46,12 +46,12 @@ listDomains=com.cloud.api.commands.ListDomainsCmd;7
 listDomainChildren=com.cloud.api.commands.ListDomainChildrenCmd;7
 
 ####Cloud Identifier commands
-getCloudIdentifier=org.apache.cloudstack.api.user.datacenter.command.GetCloudIdentifierCmd;15
+getCloudIdentifier=org.apache.cloudstack.api.user.resource.command.GetCloudIdentifierCmd;15
 
 #### Limit commands
-updateResourceLimit=com.cloud.api.commands.UpdateResourceLimitCmd;7
-updateResourceCount=com.cloud.api.commands.UpdateResourceCountCmd;7
-listResourceLimits=com.cloud.api.commands.ListResourceLimitsCmd;15
+updateResourceLimit=org.apache.cloudstack.api.user.resource.command.UpdateResourceLimitCmd;7
+updateResourceCount=org.apache.cloudstack.api.user.resource.command.UpdateResourceCountCmd;7
+listResourceLimits=org.apache.cloudstack.api.user.resource.command.ListResourceLimitsCmd;15
 
 #### VM commands
 deployVirtualMachine=org.apache.cloudstack.api.user.vm.command.DeployVMCmd;15
@@ -199,7 +199,7 @@ updateConfiguration=com.cloud.api.commands.UpdateCfgCmd;1
 listConfigurations=com.cloud.api.commands.ListCfgsByCmd;1
 ldapConfig=com.cloud.api.commands.LDAPConfigCmd;1
 ldapRemove=com.cloud.api.commands.LDAPRemoveCmd;1
-listCapabilities=org.apache.cloudstack.api.user.datacenter.command.ListCapabilitiesCmd;15
+listCapabilities=org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;15
 
 #### pod commands
 createPod=com.cloud.api.commands.CreatePodCmd;1
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index bd95adbb9ec..238d9b19886 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.cloudstack.api.user.datacenter.command.ListCapabilitiesCmd;
+import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;
 import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;
 import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;
 import org.apache.cloudstack.api.user.iso.command.ListIsosCmd;