diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java
index ccb1efa010a..e2ab658aa92 100755
--- a/api/src/com/cloud/server/ManagementService.java
+++ b/api/src/com/cloud/server/ManagementService.java
@@ -38,7 +38,7 @@ import com.cloud.api.commands.ListCapacityCmd;
 import com.cloud.api.commands.ListCfgsByCmd;
 import com.cloud.api.commands.ListClustersCmd;
 import com.cloud.api.commands.ListDiskOfferingsCmd;
-import com.cloud.api.commands.ListEventsCmd;
+import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
 import com.cloud.api.commands.ListGuestOsCategoriesCmd;
 import com.cloud.api.commands.ListGuestOsCmd;
 import com.cloud.api.commands.ListHostsCmd;
diff --git a/api/src/com/cloud/api/commands/ListEventTypesCmd.java b/api/src/org/apache/cloudstack/api/user/event/command/ListEventTypesCmd.java
similarity index 97%
rename from api/src/com/cloud/api/commands/ListEventTypesCmd.java
rename to api/src/org/apache/cloudstack/api/user/event/command/ListEventTypesCmd.java
index 8d6f21f0575..6cb385ab283 100644
--- a/api/src/com/cloud/api/commands/ListEventTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/event/command/ListEventTypesCmd.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.event.command;
 
 import java.util.ArrayList;
 
diff --git a/api/src/com/cloud/api/commands/ListEventsCmd.java b/api/src/org/apache/cloudstack/api/user/event/command/ListEventsCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListEventsCmd.java
rename to api/src/org/apache/cloudstack/api/user/event/command/ListEventsCmd.java
index d0e09e1ffe0..56f162662fa 100755
--- a/api/src/com/cloud/api/commands/ListEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/event/command/ListEventsCmd.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.event.command;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 05f949e318c..3a549f51e20 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -214,8 +214,8 @@ deleteZone=com.cloud.api.commands.DeleteZoneCmd;1
 listZones=com.cloud.api.commands.ListZonesByCmd;15
 
 #### events commands
-listEvents=com.cloud.api.commands.ListEventsCmd;15
-listEventTypes=com.cloud.api.commands.ListEventTypesCmd;15
+listEvents=org.apache.cloudstack.api.user.event.command.ListEventsCmd;15
+listEventTypes=org.apache.cloudstack.api.user.event.command.ListEventTypesCmd;15
 
 #### alerts commands
 listAlerts=com.cloud.api.commands.ListAlertsCmd;3
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 184a071e490..40847ea7e9d 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
 import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.Role;
 import org.apache.cloudstack.api.BaseCmd.CommandType;
-import com.cloud.api.commands.ListEventsCmd;
+import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
 import com.cloud.async.AsyncCommandQueued;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.configuration.Config;
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 92a4fbcac91..e4c357c7e28 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -75,7 +75,7 @@ import com.cloud.api.commands.ListCapacityCmd;
 import com.cloud.api.commands.ListCfgsByCmd;
 import com.cloud.api.commands.ListClustersCmd;
 import com.cloud.api.commands.ListDiskOfferingsCmd;
-import com.cloud.api.commands.ListEventsCmd;
+import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
 import com.cloud.api.commands.ListGuestOsCategoriesCmd;
 import com.cloud.api.commands.ListGuestOsCmd;
 import com.cloud.api.commands.ListHostsCmd;