diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 0cbb39000a1..f7f67c4ab50 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -61,9 +61,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-  </build>
 </project>
diff --git a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java
similarity index 100%
rename from server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java
rename to engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
similarity index 100%
rename from server/src/com/cloud/vm/VirtualMachineManagerImpl.java
rename to engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
diff --git a/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
similarity index 100%
rename from server/test/com/cloud/vm/VirtualMachineManagerImplTest.java
rename to engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java