diff --git a/api/src/com/cloud/api/commands/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/admin/template/command/PrepareTemplateCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/PrepareTemplateCmd.java
rename to api/src/org/apache/cloudstack/api/admin/template/command/PrepareTemplateCmd.java
index 97686a8f169..910169b96c3 100644
--- a/api/src/com/cloud/api/commands/PrepareTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/template/command/PrepareTemplateCmd.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.template.command;
 
 import java.util.List;
 
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 98687108988..ca7321c7673 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -88,7 +88,7 @@ listTemplates=org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;1
 updateTemplatePermissions=org.apache.cloudstack.api.user.template.command.UpdateTemplatePermissionsCmd;15
 listTemplatePermissions=org.apache.cloudstack.api.user.template.command.ListTemplatePermissionsCmd;15
 extractTemplate=org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd;15
-prepareTemplate=com.cloud.api.commands.PrepareTemplateCmd;1
+prepareTemplate=org.apache.cloudstack.api.admin.template.command.PrepareTemplateCmd;1
 
 #### iso commands
 attachIso=org.apache.cloudstack.api.user.iso.command.AttachIsoCmd;15