diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java
index c27e6c7c57d..f807297206d 100644
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@ -24,13 +24,13 @@ import com.cloud.api.commands.CreateDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
 import com.cloud.api.commands.CreateServiceOfferingCmd;
 import com.cloud.api.commands.CreateVlanIpRangeCmd;
-import com.cloud.api.commands.CreateZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
 import com.cloud.api.commands.DeleteDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
 import com.cloud.api.commands.DeletePodCmd;
 import com.cloud.api.commands.DeleteServiceOfferingCmd;
 import com.cloud.api.commands.DeleteVlanIpRangeCmd;
-import com.cloud.api.commands.DeleteZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
 import com.cloud.api.commands.LDAPConfigCmd;
 import com.cloud.api.commands.LDAPRemoveCmd;
 import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
@@ -39,7 +39,7 @@ import com.cloud.api.commands.UpdateDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
 import com.cloud.api.commands.UpdatePodCmd;
 import com.cloud.api.commands.UpdateServiceOfferingCmd;
-import com.cloud.api.commands.UpdateZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;
diff --git a/api/src/com/cloud/api/commands/CreateZoneCmd.java b/api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java
similarity index 99%
rename from api/src/com/cloud/api/commands/CreateZoneCmd.java
rename to api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java
index 4613e1ff882..30d288b88c8 100755
--- a/api/src/com/cloud/api/commands/CreateZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.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.zone.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/DeleteZoneCmd.java b/api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/DeleteZoneCmd.java
rename to api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java
index 5a61a930dc4..1144cb358e6 100644
--- a/api/src/com/cloud/api/commands/DeleteZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.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.zone.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java
rename to api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java
index 1af9445d8ba..fe130f7f219 100644
--- a/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.api.commands;
+package org.apache.cloudstack.api.admin.zone.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/UpdateZoneCmd.java b/api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java
similarity index 99%
rename from api/src/com/cloud/api/commands/UpdateZoneCmd.java
rename to api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java
index 36c34048f1b..59e715db297 100755
--- a/api/src/com/cloud/api/commands/UpdateZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.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.zone.command;
 
 import java.util.List;
 import java.util.Map;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 1379504b204..a5d609ef9ee 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -26,7 +26,7 @@ disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd
 enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7
 ###lockAccount=com.cloud.api.commands.LockAccountCmd;7
 listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15
-markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1
+markDefaultZoneForAccount=org.apache.cloudstack.api.admin.zone.command.MarkDefaultZoneForAccountCmd;1
 
 #### User commands
 createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3
@@ -209,9 +209,9 @@ deletePod=com.cloud.api.commands.DeletePodCmd;1
 listPods=com.cloud.api.commands.ListPodsByCmd;3
 
 #### zone commands
-createZone=com.cloud.api.commands.CreateZoneCmd;1
-updateZone=com.cloud.api.commands.UpdateZoneCmd;1
-deleteZone=com.cloud.api.commands.DeleteZoneCmd;1
+createZone=org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;1
+updateZone=org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;1
+deleteZone=org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;1
 listZones=org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;15
 
 #### events commands
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index bff0cd514b5..f3b1e2fbb9a 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -40,6 +40,8 @@ import javax.naming.directory.InitialDirContext;
 
 import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
+import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
 import org.apache.log4j.Logger;
 
 import com.cloud.acl.SecurityChecker;
@@ -50,12 +52,11 @@ import com.cloud.api.commands.CreateDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
 import com.cloud.api.commands.CreateServiceOfferingCmd;
 import com.cloud.api.commands.CreateVlanIpRangeCmd;
-import com.cloud.api.commands.CreateZoneCmd;
 import com.cloud.api.commands.DeleteDiskOfferingCmd;
 import com.cloud.api.commands.DeletePodCmd;
 import com.cloud.api.commands.DeleteServiceOfferingCmd;
 import com.cloud.api.commands.DeleteVlanIpRangeCmd;
-import com.cloud.api.commands.DeleteZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
 import com.cloud.api.commands.LDAPConfigCmd;
 import com.cloud.api.commands.LDAPRemoveCmd;
 import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
@@ -63,7 +64,6 @@ import com.cloud.api.commands.UpdateCfgCmd;
 import com.cloud.api.commands.UpdateDiskOfferingCmd;
 import com.cloud.api.commands.UpdatePodCmd;
 import com.cloud.api.commands.UpdateServiceOfferingCmd;
-import com.cloud.api.commands.UpdateZoneCmd;
 import com.cloud.capacity.dao.CapacityDao;
 import com.cloud.configuration.Resource.ResourceType;
 import com.cloud.configuration.dao.ConfigurationDao;
diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
index c3496f0247e..1fd10d04582 100644
--- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
@@ -28,22 +28,22 @@ import com.cloud.api.commands.CreateDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
 import com.cloud.api.commands.CreateServiceOfferingCmd;
 import com.cloud.api.commands.CreateVlanIpRangeCmd;
-import com.cloud.api.commands.CreateZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
 import com.cloud.api.commands.DeleteDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
 import com.cloud.api.commands.DeletePodCmd;
 import com.cloud.api.commands.DeleteServiceOfferingCmd;
 import com.cloud.api.commands.DeleteVlanIpRangeCmd;
-import com.cloud.api.commands.DeleteZoneCmd;
+import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
 import com.cloud.api.commands.LDAPConfigCmd;
 import com.cloud.api.commands.LDAPRemoveCmd;
+import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
 import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
 import com.cloud.api.commands.UpdateCfgCmd;
 import com.cloud.api.commands.UpdateDiskOfferingCmd;
 import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
 import com.cloud.api.commands.UpdatePodCmd;
 import com.cloud.api.commands.UpdateServiceOfferingCmd;
-import com.cloud.api.commands.UpdateZoneCmd;
 import com.cloud.configuration.Configuration;
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.configuration.ConfigurationService;