diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index e773372d304..331b27660c4 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -24,8 +24,8 @@ import java.util.Set;
 
 import com.cloud.alert.Alert;
 import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.commands.CreateSSHKeyPairCmd;
-import com.cloud.api.commands.DeleteSSHKeyPairCmd;
+import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;
+import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;
 import com.cloud.api.commands.DestroySystemVmCmd;
 import com.cloud.api.commands.ExtractVolumeCmd;
 import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;
@@ -46,7 +46,7 @@ import org.apache.cloudstack.api.user.iso.command.ListIsosCmd;
 import com.cloud.api.commands.ListPodsByCmd;
 import com.cloud.api.commands.ListPublicIpAddressesCmd;
 import com.cloud.api.commands.ListRoutersCmd;
-import com.cloud.api.commands.ListSSHKeyPairsCmd;
+import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd;
 import com.cloud.api.commands.ListServiceOfferingsCmd;
 import com.cloud.api.commands.ListStoragePoolsCmd;
 import com.cloud.api.commands.ListSystemVMsCmd;
diff --git a/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/user/ssh/command/CreateSSHKeyPairCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
rename to api/src/org/apache/cloudstack/api/user/ssh/command/CreateSSHKeyPairCmd.java
index 6d22ade7433..10c57260e83 100644
--- a/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/ssh/command/CreateSSHKeyPairCmd.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.ssh.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/user/ssh/command/DeleteSSHKeyPairCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
rename to api/src/org/apache/cloudstack/api/user/ssh/command/DeleteSSHKeyPairCmd.java
index a39ceb18824..d074afa7c9a 100644
--- a/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/ssh/command/DeleteSSHKeyPairCmd.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.ssh.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java b/api/src/org/apache/cloudstack/api/user/ssh/command/ListSSHKeyPairsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
rename to api/src/org/apache/cloudstack/api/user/ssh/command/ListSSHKeyPairsCmd.java
index 710377772f3..109c66d0094 100644
--- a/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/ssh/command/ListSSHKeyPairsCmd.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.ssh.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 48cca46ba9b..0cd44383b88 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -317,9 +317,9 @@ updateNetwork=org.apache.cloudstack.api.user.network.command.UpdateNetworkCmd;15
 
 #### SSH key pair commands
 registerSSHKeyPair=com.cloud.api.commands.RegisterSSHKeyPairCmd;15
-createSSHKeyPair=com.cloud.api.commands.CreateSSHKeyPairCmd;15
-deleteSSHKeyPair=com.cloud.api.commands.DeleteSSHKeyPairCmd;15
-listSSHKeyPairs=com.cloud.api.commands.ListSSHKeyPairsCmd;15
+createSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;15
+deleteSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;15
+listSSHKeyPairs=org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd;15
 
 #### Projects commands
 createProject=org.apache.cloudstack.api.user.project.command.CreateProjectCmd;15
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 96d3997f029..4116d4c74a0 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -43,6 +43,7 @@ import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.cloudstack.api.user.iso.command.ListIsosCmd;
+import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;
 import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;
 import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd;
 import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;
@@ -62,8 +63,7 @@ import com.cloud.alert.AlertVO;
 import com.cloud.alert.dao.AlertDao;
 import org.apache.cloudstack.api.ApiConstants;
 import com.cloud.api.ApiDBUtils;
-import com.cloud.api.commands.CreateSSHKeyPairCmd;
-import com.cloud.api.commands.DeleteSSHKeyPairCmd;
+import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;
 import com.cloud.api.commands.DestroySystemVmCmd;
 import com.cloud.api.commands.ExtractVolumeCmd;
 import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
@@ -81,7 +81,7 @@ import com.cloud.api.commands.ListHostsCmd;
 import com.cloud.api.commands.ListPodsByCmd;
 import com.cloud.api.commands.ListPublicIpAddressesCmd;
 import com.cloud.api.commands.ListRoutersCmd;
-import com.cloud.api.commands.ListSSHKeyPairsCmd;
+import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd;
 import com.cloud.api.commands.ListServiceOfferingsCmd;
 import com.cloud.api.commands.ListStoragePoolsCmd;
 import com.cloud.api.commands.ListSystemVMsCmd;