diff --git a/usage/pom.xml b/usage/pom.xml
index e72e77f8e13..0ce2ef64e70 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -27,18 +27,22 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-server</artifactId>
+      <artifactId>cloud-engine-schema</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-engine-schema</artifactId>
+      <artifactId>cloud-engine-components-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.dbunit</groupId>
       <artifactId>dbunit</artifactId>
@@ -80,6 +84,7 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -136,16 +141,6 @@
             <artifactId>exec-maven-plugin</artifactId>
             <version>1.2.1</version>
             <dependencies>
-              <dependency>
-                <groupId>org.apache.cloudstack</groupId>
-                <artifactId>cloud-utils</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.cloudstack</groupId>
-                <artifactId>cloud-server</artifactId>
-                <version>${project.version}</version>
-              </dependency>
               <dependency>
                 <groupId>org.apache.cloudstack</groupId>
                 <artifactId>cloud-usage</artifactId>
diff --git a/usage/resources/usageApplicationContext.xml b/usage/resources/usageApplicationContext.xml
index f39127b2dc2..85936c7651d 100644
--- a/usage/resources/usageApplicationContext.xml
+++ b/usage/resources/usageApplicationContext.xml
@@ -32,7 +32,6 @@
 
   <context:annotation-config />
   <context:component-scan base-package="com.cloud.usage, com.cloud.event.dao, com.cloud.user.dao, com.cloud.configuration.dao, com.cloud.alert.dao, com.cloud.domain.dao, org.apache.cloudstack.framework.config.dao">
-  	<context:exclude-filter type="assignable" expression="com.cloud.usage.UsageServiceImpl"/>
   </context:component-scan>
   
   <!--
diff --git a/server/src/com/cloud/usage/StorageTypes.java b/usage/src/com/cloud/usage/StorageTypes.java
similarity index 100%
rename from server/src/com/cloud/usage/StorageTypes.java
rename to usage/src/com/cloud/usage/StorageTypes.java