diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index f6d7efa43e4..a697b3835fd 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import com.cloud.alert.Alert;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;
+import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;
 import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;
 import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;
 import com.cloud.api.commands.DestroySystemVmCmd;
@@ -38,7 +39,6 @@ import org.apache.cloudstack.api.user.configuration.command.ListCapabilitiesCmd;
 import com.cloud.api.commands.ListCapacityCmd;
 import com.cloud.api.commands.ListCfgsByCmd;
 import com.cloud.api.commands.ListClustersCmd;
-import org.apache.cloudstack.api.user.disk.command.ListDiskOfferingsCmd;
 import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
 import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;
 import com.cloud.api.commands.ListHostsCmd;
diff --git a/api/src/org/apache/cloudstack/api/user/disk/command/ListDiskOfferingsCmd.java b/api/src/org/apache/cloudstack/api/user/offering/command/ListDiskOfferingsCmd.java
similarity index 98%
rename from api/src/org/apache/cloudstack/api/user/disk/command/ListDiskOfferingsCmd.java
rename to api/src/org/apache/cloudstack/api/user/offering/command/ListDiskOfferingsCmd.java
index ec8f884fa69..85d42496bdb 100644
--- a/api/src/org/apache/cloudstack/api/user/disk/command/ListDiskOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/offering/command/ListDiskOfferingsCmd.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.disk.command;
+package org.apache.cloudstack.api.user.offering.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index b97650f4f12..7101155c6ca 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -116,7 +116,7 @@ listServiceOfferings=org.apache.cloudstack.api.user.serviceoffering.command.List
 createDiskOffering=com.cloud.api.commands.CreateDiskOfferingCmd;1
 updateDiskOffering=com.cloud.api.commands.UpdateDiskOfferingCmd;1
 deleteDiskOffering=com.cloud.api.commands.DeleteDiskOfferingCmd;1
-listDiskOfferings=org.apache.cloudstack.api.user.disk.command.ListDiskOfferingsCmd;15
+listDiskOfferings=org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;15
 
 #### vlan commands
 createVlanIpRange=com.cloud.api.commands.CreateVlanIpRangeCmd;1
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index fef59bfd276..eb14d46b16d 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -46,6 +46,7 @@ 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;
 import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;
+import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;
 import org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd;
 import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;
 import org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd;
@@ -77,7 +78,6 @@ import org.apache.cloudstack.api.user.configuration.command.ListCapabilitiesCmd;
 import com.cloud.api.commands.ListCapacityCmd;
 import com.cloud.api.commands.ListCfgsByCmd;
 import com.cloud.api.commands.ListClustersCmd;
-import org.apache.cloudstack.api.user.disk.command.ListDiskOfferingsCmd;
 import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
 import com.cloud.api.commands.ListHostsCmd;
 import com.cloud.api.commands.ListPodsByCmd;