diff --git a/api/src/com/cloud/api/commands/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/user/hypervisor/command/ListHypervisorsCmd.java
similarity index 96%
rename from api/src/com/cloud/api/commands/ListHypervisorsCmd.java
rename to api/src/org/apache/cloudstack/api/user/hypervisor/command/ListHypervisorsCmd.java
index ec460f377e9..abab7249e46 100644
--- a/api/src/com/cloud/api/commands/ListHypervisorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/hypervisor/command/ListHypervisorsCmd.java
@@ -14,11 +14,12 @@
 // 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.hypervisor.command;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.cloud.api.commands.UpgradeRouterCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 0e1ccc21f5b..ac748ab8600 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -290,7 +290,7 @@ listInstanceGroups=org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCm
 uploadCustomCertificate=com.cloud.api.commands.UploadCustomCertificateCmd;1
 
 ### other commands
-listHypervisors=com.cloud.api.commands.ListHypervisorsCmd;15
+listHypervisors=org.apache.cloudstack.api.user.hypervisor.command.ListHypervisorsCmd;15
 
 ### VPN
 createRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.CreateRemoteAccessVpnCmd;15