diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/com/cloud/server/TaggedResourceService.java
index d813b656ad1..c98b02b2091 100644
--- a/api/src/com/cloud/server/TaggedResourceService.java
+++ b/api/src/com/cloud/server/TaggedResourceService.java
@@ -19,7 +19,7 @@ package com.cloud.server;
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.api.commands.ListTagsCmd;
+import org.apache.cloudstack.api.user.tag.command.ListTagsCmd;
 import com.cloud.server.ResourceTag.TaggedResourceType;
 import com.cloud.utils.Pair;
 
diff --git a/api/src/com/cloud/api/commands/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/user/tag/command/CreateTagsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/CreateTagsCmd.java
rename to api/src/org/apache/cloudstack/api/user/tag/command/CreateTagsCmd.java
index 8e697dec662..99b51e9d205 100644
--- a/api/src/com/cloud/api/commands/CreateTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/tag/command/CreateTagsCmd.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.api.commands;
+package org.apache.cloudstack.api.user.tag.command;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/api/src/com/cloud/api/commands/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/user/tag/command/DeleteTagsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/DeleteTagsCmd.java
rename to api/src/org/apache/cloudstack/api/user/tag/command/DeleteTagsCmd.java
index 81a76e5ab8e..09d9a6900d3 100644
--- a/api/src/com/cloud/api/commands/DeleteTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/tag/command/DeleteTagsCmd.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.api.commands;
+package org.apache.cloudstack.api.user.tag.command;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/api/src/com/cloud/api/commands/ListTagsCmd.java b/api/src/org/apache/cloudstack/api/user/tag/command/ListTagsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListTagsCmd.java
rename to api/src/org/apache/cloudstack/api/user/tag/command/ListTagsCmd.java
index 8b61b666aca..ef95439618a 100644
--- a/api/src/com/cloud/api/commands/ListTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/tag/command/ListTagsCmd.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.api.commands;
+package org.apache.cloudstack.api.user.tag.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 0cd44383b88..83d56dad108 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -409,9 +409,9 @@ deleteStaticRoute=org.apache.cloudstack.api.user.vpc.command.DeleteStaticRouteCm
 listStaticRoutes=org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd;15
 
 #### Tags commands
-createTags=com.cloud.api.commands.CreateTagsCmd;15
-deleteTags=com.cloud.api.commands.DeleteTagsCmd;15
-listTags=com.cloud.api.commands.ListTagsCmd;15
+createTags=org.apache.cloudstack.api.user.tag.command.CreateTagsCmd;15
+deleteTags=org.apache.cloudstack.api.user.tag.command.DeleteTagsCmd;15
+listTags=org.apache.cloudstack.api.user.tag.command.ListTagsCmd;15
 
 ### Site-to-site VPN commands
 createVpnCustomerGateway=org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd;15
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index 237a6774675..fba3079241b 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -26,7 +26,7 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.api.commands.ListTagsCmd;
+import org.apache.cloudstack.api.user.tag.command.ListTagsCmd;
 import com.cloud.domain.Domain;
 import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;