diff --git a/.gitignore b/.gitignore
index 9511e9ede2f..c419174ab88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@ tools/cli/build/
 awsapi/modules/*
 !.gitignore
 .classpath
-.project
 .settings.xml
 .settings/
 db.properties.override
diff --git a/.project b/.project
deleted file mode 100644
index 721ca4132ed..00000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloudstack</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/agent/.project b/agent/.project
deleted file mode 100644
index 89d6e69069e..00000000000
--- a/agent/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-agent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/api/.project b/api/.project
deleted file mode 100644
index e6d78e9002a..00000000000
--- a/api/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-api</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/awsapi/.project b/awsapi/.project
deleted file mode 100644
index 27dbc00f4a8..00000000000
--- a/awsapi/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-awsapi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/client/.project b/client/.project
deleted file mode 100644
index 57c696eb867..00000000000
--- a/client/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-client-ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/console-proxy/.project b/console-proxy/.project
deleted file mode 100755
index 5756d4109e0..00000000000
--- a/console-proxy/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-console-proxy</name>
-	<comment>CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>cloud-core</project>
-		<project>cloud-api</project>
-		<project>cloud-utils</project>
-		<project>xapi</project>
-		<project>cloud-agent</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 929eb005808..25265031258 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -53,7 +53,6 @@
       <version>${project.version}</version>
       <type>pom</type>
     </dependency>
-    -->
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/core/.project b/core/.project
deleted file mode 100644
index c9801002497..00000000000
--- a/core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/deps/XenServerJava/.project b/deps/XenServerJava/.project
deleted file mode 100644
index b265757a915..00000000000
--- a/deps/XenServerJava/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>xapi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/framework/ipc/.project b/framework/ipc/.project
deleted file mode 100755
index 4da8c665add..00000000000
--- a/framework/ipc/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>framework-ipc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index 1f5de3dbcba..6afd1c49ef2 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -14,9 +14,9 @@
   <artifactId>cloud-framework-ipc</artifactId>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-engine</artifactId>
+    <artifactId>cloudstack-framework</artifactId>
     <version>4.1.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>
     <!-- <dependency> <groupId>org.hornetq</groupId> <artifactId>hornetq-core-client</artifactId> 
diff --git a/parent/.project b/parent/.project
deleted file mode 100644
index a53d39cec5a..00000000000
--- a/parent/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-parent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/.project b/plugins/.project
deleted file mode 100644
index a09e93ad174..00000000000
--- a/plugins/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugins</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/deployment-planners/user-concentrated-pod/.project b/plugins/deployment-planners/user-concentrated-pod/.project
deleted file mode 100644
index ec07c51ef0c..00000000000
--- a/plugins/deployment-planners/user-concentrated-pod/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-planner-user-concentrated-pod</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/deployment-planners/user-dispersing/.project b/plugins/deployment-planners/user-dispersing/.project
deleted file mode 100644
index 8f60473cde8..00000000000
--- a/plugins/deployment-planners/user-dispersing/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-planner-user-dispersing</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/file-systems/netapp/.project b/plugins/file-systems/netapp/.project
deleted file mode 100644
index 83c6e8819fc..00000000000
--- a/plugins/file-systems/netapp/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-netapp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/host-allocators/random/.project b/plugins/host-allocators/random/.project
deleted file mode 100644
index b4aa1d2da49..00000000000
--- a/plugins/host-allocators/random/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-host-allocator-random</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/hypervisors/kvm/.project b/plugins/hypervisors/kvm/.project
deleted file mode 100644
index d29721871fd..00000000000
--- a/plugins/hypervisors/kvm/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-hypervisor-kvm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/hypervisors/ovm/.project b/plugins/hypervisors/ovm/.project
deleted file mode 100644
index 0d25b01c2fb..00000000000
--- a/plugins/hypervisors/ovm/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-hypervisor-ovm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/hypervisors/vmware/.project b/plugins/hypervisors/vmware/.project
deleted file mode 100644
index c8be07610f4..00000000000
--- a/plugins/hypervisors/vmware/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-hypervisor-vmware</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/hypervisors/xen/.project b/plugins/hypervisors/xen/.project
deleted file mode 100644
index 70a80b98242..00000000000
--- a/plugins/hypervisors/xen/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-hypervisor-xen</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/elastic-loadbalancer/.project b/plugins/network-elements/elastic-loadbalancer/.project
deleted file mode 100644
index 6efc4bf8148..00000000000
--- a/plugins/network-elements/elastic-loadbalancer/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-elb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/f5/.project b/plugins/network-elements/f5/.project
deleted file mode 100644
index 3c968b9bedd..00000000000
--- a/plugins/network-elements/f5/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-f5</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/juniper-srx/.project b/plugins/network-elements/juniper-srx/.project
deleted file mode 100644
index f0d13da5a70..00000000000
--- a/plugins/network-elements/juniper-srx/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-srx</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/midokura-midonet/.project b/plugins/network-elements/midokura-midonet/.project
deleted file mode 100644
index 81dcf009771..00000000000
--- a/plugins/network-elements/midokura-midonet/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-midonet</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/netscaler/.project b/plugins/network-elements/netscaler/.project
deleted file mode 100644
index a732b5cb698..00000000000
--- a/plugins/network-elements/netscaler/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-netscaler</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/nicira-nvp/.project b/plugins/network-elements/nicira-nvp/.project
deleted file mode 100644
index 99c226f0589..00000000000
--- a/plugins/network-elements/nicira-nvp/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-nvp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/network-elements/ovs/.project b/plugins/network-elements/ovs/.project
deleted file mode 100644
index b0b03c66551..00000000000
--- a/plugins/network-elements/ovs/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-network-ovs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/parent/.project b/plugins/parent/.project
deleted file mode 100644
index 33e3c0b7706..00000000000
--- a/plugins/parent/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-parent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/storage-allocators/random/.project b/plugins/storage-allocators/random/.project
deleted file mode 100644
index c7e4c7e046d..00000000000
--- a/plugins/storage-allocators/random/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-storage-allocator-random</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/user-authenticators/ldap/.project b/plugins/user-authenticators/ldap/.project
deleted file mode 100644
index 7b32db2637e..00000000000
--- a/plugins/user-authenticators/ldap/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-user-authenticator-ldap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/user-authenticators/md5/.project b/plugins/user-authenticators/md5/.project
deleted file mode 100644
index 5226ac5ac4c..00000000000
--- a/plugins/user-authenticators/md5/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-user-authenticator-md5</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/user-authenticators/plain-text/.project b/plugins/user-authenticators/plain-text/.project
deleted file mode 100644
index f035a014ab3..00000000000
--- a/plugins/user-authenticators/plain-text/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-plugin-user-authenticator-plaintext</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/pom.xml b/pom.xml
index 1417996630b..0a1f36a3465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,11 +81,13 @@
     <cs.servlet.version>2.4</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>
     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
+    <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
     <cs.vmware.api.version>4.1</cs.vmware.api.version>
     <cs.mockito.version>1.9.5</cs.mockito.version>
     <cs.aws.sdk.version>1.3.21.1</cs.aws.sdk.version>
     <cs.lang.version>2.6</cs.lang.version>
     <cs.commons-io.version>1.4</cs.commons-io.version>
+    <skipTests>true</skipTests>
   </properties>
 
   <distributionManagement>
@@ -184,12 +186,108 @@
       <artifactId>junit</artifactId>
       <version>${cs.junit.version}</version>
       <scope>test</scope>
-    </dependency>
+	</dependency>
+    
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-core</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+  	  <groupId>org.springframework</groupId>
+  	  <artifactId>spring-expression</artifactId>
+  	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-beans</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-aop</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-context</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-context-support</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-tx</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-jdbc</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-orm</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-oxm</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-web</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-webmvc</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
     <dependency>
     	<groupId>org.mockito</groupId>
     	<artifactId>mockito-all</artifactId>
     	<version>1.9.5</version>
         <scope>test</scope>
+    </dependency>
+
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-test</artifactId>
+	  <version>${org.springframework.version}</version>
+	  <scope>test</scope>
+	</dependency>
+
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.7.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
+      <version>1.7.1</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
     </dependency>
   </dependencies>
 
diff --git a/server/.project b/server/.project
deleted file mode 100644
index eb596100aa3..00000000000
--- a/server/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-server</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/usage/.project b/usage/.project
deleted file mode 100644
index 6958c229114..00000000000
--- a/usage/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-usage</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/utils/.project b/utils/.project
deleted file mode 100644
index 16e84b19826..00000000000
--- a/utils/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-utils</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/utils/pom.xml b/utils/pom.xml
index c91688812f0..ab598603423 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,6 +24,7 @@
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
     <version>4.1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/utils/src/com/cloud/utils/component/ComponentLocator.java b/utils/src/com/cloud/utils/component/ComponentLocator.java
index d94771fc4ad..90118b65520 100644
--- a/utils/src/com/cloud/utils/component/ComponentLocator.java
+++ b/utils/src/com/cloud/utils/component/ComponentLocator.java
@@ -17,381 +17,10 @@
 package com.cloud.utils.component;
 
 import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.stereotype.Component;
 
 import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.mgmt.JmxUtil;
-import com.cloud.utils.mgmt.ManagementBean;
-
-/**
- * ComponentLocator ties together several different concepts.  First, it 
- * deals with how a system should be put together.  It manages different 
- * types of components:
- *   - Manager: Singleton implementation of a certain process.
- *   - Adapter: Different singleton implementations for the same functions.
- *   - SystemIntegrityChecker: Singletons that are called at the load time.
- *   - Dao: Data Access Objects.
- *   
- * These components can be declared in several ways:
- *   - ComponentLibrary - A Java class that declares the above components.  The
- *     advantage of declaring components here is they change automatically
- *     with any refactoring.
- *   - components specification - An xml file that overrides the 
- *     ComponentLibrary.  The advantage of declaring components here is 
- *     they can change by hand on every deployment.
- * 
- * The two are NOT mutually exclusive.  ComponentLocator basically locates 
- * the components specification, which specifies the ComponentLibrary within.  
- * Components found in the ComponentLibrary are overridden by components 
- * found in components specification.
- * 
- * Components specification can also be nested.  One components specification
- * can point to another components specification and, therefore, "inherits"
- * those components but still override one or more components.  ComponentLocator 
- * reads the child components specification first and follow the chain up.  
- * the child's components overrides the ones in the parent. 
- * 
- * ComponentLocator looks for the components specification as follows:
- *   1. By following the path specified by "cloud-stack-components-specification"
- *      within the environment.properties file.
- *   2. Look for components.xml in the class path.
- *   
- * ComponentLocator also ties in component injection.  Components can specify 
- * an @Inject annotation to components ComponentLocator knows.  When 
- * instantiating components, ComponentLocator attempts to inject these 
- * components.
- * 
- **/
-@SuppressWarnings("unchecked")
-public class ComponentLocator implements ComponentLocatorMBean {
-    protected static final Logger                      s_logger     = Logger.getLogger(ComponentLocator.class);
-
-    protected static final ThreadLocal<ComponentLocator> s_tl = new ThreadLocal<ComponentLocator>();
-    protected static final ConcurrentHashMap<Class<?>, Singleton> s_singletons = new ConcurrentHashMap<Class<?>, Singleton>(111);
-    protected static final HashMap<String, ComponentLocator> s_locators = new HashMap<String, ComponentLocator>();
-    protected static final HashMap<Class<?>, InjectInfo> s_factories = new HashMap<Class<?>, InjectInfo>();
-    protected static Boolean s_once = false;
-    protected static Boolean _hasCheckerRun = false;
-    protected static Callback[] s_callbacks = new Callback[] { NoOp.INSTANCE, new DatabaseCallback()};
-    protected static CallbackFilter s_callbackFilter = new DatabaseCallbackFilter();
-    protected static final List<AnnotationInterceptor<?>> s_interceptors = new ArrayList<AnnotationInterceptor<?>>();
-    protected static CleanupThread s_janitor = null;
-
-    protected HashMap<String, Adapters<? extends Adapter>>              _adapterMap;
-    protected HashMap<String, ComponentInfo<Manager>>                   _managerMap;
-    protected LinkedHashMap<String, ComponentInfo<SystemIntegrityChecker>>     _checkerMap;
-    protected LinkedHashMap<String, ComponentInfo<GenericDao<?, ? extends Serializable>>>    _daoMap;
-    protected String                                                    _serverName;
-    protected Object                                                    _component;
-    protected HashMap<Class<?>, Class<?>>                               _factories;
-    protected HashMap<String, ComponentInfo<PluggableService>>          _pluginsMap;
-
-    static {
-        if (s_janitor == null) {
-            s_janitor = new CleanupThread();
-            Runtime.getRuntime().addShutdownHook(new CleanupThread());
-        }
-    }
-
-    public ComponentLocator(String server) {
-        _serverName = server;
-        if (s_janitor == null) {
-            s_janitor = new CleanupThread();
-            Runtime.getRuntime().addShutdownHook(new CleanupThread());
-        }
-    }
-
-    public String getLocatorName() {
-        return _serverName;
-    }
-
-    @Override
-    public String getName() {
-        return getLocatorName();
-    }
-
-    protected Pair<XmlHandler, HashMap<String, List<ComponentInfo<Adapter>>>> parse2(String filename) {
-        try {
-            SAXParserFactory spfactory = SAXParserFactory.newInstance();
-            SAXParser saxParser = spfactory.newSAXParser();
-            _daoMap = new LinkedHashMap<String, ComponentInfo<GenericDao<?, ? extends Serializable>>>();
-            _managerMap = new LinkedHashMap<String, ComponentInfo<Manager>>();
-            _checkerMap = new LinkedHashMap<String, ComponentInfo<SystemIntegrityChecker>>();
-            _adapterMap = new HashMap<String, Adapters<? extends Adapter>>();
-            _factories = new HashMap<Class<?>, Class<?>>();
-            _pluginsMap = new LinkedHashMap<String, ComponentInfo<PluggableService>>();
-            File file = PropertiesUtil.findConfigFile(filename);
-            if (file == null) {
-                s_logger.info("Unable to find " + filename);
-                return null;
-            }
-            s_logger.info("Config file found at " + file.getAbsolutePath() + ".  Configuring " + _serverName);
-            XmlHandler handler = new XmlHandler(_serverName);
-            saxParser.parse(file, handler);
-
-            HashMap<String, List<ComponentInfo<Adapter>>> adapters = new HashMap<String, List<ComponentInfo<Adapter>>>();
-            if (handler.parent != null) {
-                String[] tokens = handler.parent.split(":");
-                String parentFile = filename;
-                String parentName = handler.parent;
-                if (tokens.length > 1) {
-                    parentFile = tokens[0];
-                    parentName = tokens[1];
-                }
-                ComponentLocator parentLocator = new ComponentLocator(parentName);
-                adapters.putAll(parentLocator.parse2(parentFile).second());
-                _daoMap.putAll(parentLocator._daoMap);
-                _managerMap.putAll(parentLocator._managerMap);
-                _factories.putAll(parentLocator._factories);
-                _pluginsMap.putAll(parentLocator._pluginsMap);
-            }
-
-            ComponentLibrary library = null;
-            if (handler.library != null) {
-                Class<?> clazz = Class.forName(handler.library);
-                library = (ComponentLibrary)clazz.newInstance();
-                _daoMap.putAll(library.getDaos());
-                _managerMap.putAll(library.getManagers());
-                _factories.putAll(library.getFactories());
-                _pluginsMap.putAll(library.getPluggableServices());
-                
-                 for (Entry<String, List<ComponentInfo<Adapter>>> e : library.getAdapters().entrySet()) {
-                	 if (adapters.containsKey(e.getKey())) {
-                 		s_logger.debug("Merge needed for " + e.getKey());
-                 		adapters.get(e.getKey()).addAll(e.getValue());
-                 	}
-                 	else {
-                 		adapters.put(e.getKey(), e.getValue());
-                 	}
-                 }
-                // putAll overwrites existing keys, so merge instead
-                for (Entry<String, List<ComponentInfo<Adapter>>> e : handler.adapters.entrySet()) {
-                	if (adapters.containsKey(e.getKey())) {
-                		s_logger.debug("Merge needed for " + e.getKey());
-                		adapters.get(e.getKey()).addAll(e.getValue());
-                	}
-                	else {
-                		adapters.put(e.getKey(), e.getValue());
-                	}
-                }
-            }
-
-            _daoMap.putAll(handler.daos);
-            _managerMap.putAll(handler.managers);
-            _checkerMap.putAll(handler.checkers);
-            _pluginsMap.putAll(handler.pluggableServices);
-            
-            // putAll overwrites existing keys, so merge instead
-            for (Entry<String, List<ComponentInfo<Adapter>>> e : handler.adapters.entrySet()) {
-            	if (adapters.containsKey(e.getKey())) {
-            		s_logger.debug("Merge needed for " + e.getKey());
-            		adapters.get(e.getKey()).addAll(e.getValue());
-            	}
-            	else {
-            		adapters.put(e.getKey(), e.getValue());
-            	}
-            }
-            
-            
-            return new Pair<XmlHandler, HashMap<String, List<ComponentInfo<Adapter>>>>(handler, adapters);
-        } catch (ParserConfigurationException e) {
-            s_logger.error("Unable to load " + _serverName + " due to errors while parsing " + filename, e);
-            System.exit(1);
-        } catch (SAXException e) {
-            s_logger.error("Unable to load " + _serverName + " due to errors while parsing " + filename, e);
-            System.exit(1);
-        } catch (IOException e) {
-            s_logger.error("Unable to load " + _serverName + " due to errors while reading from " + filename, e);
-            System.exit(1);
-        } catch (CloudRuntimeException e) {
-            s_logger.error("Unable to load configuration for " + _serverName + " from " + filename, e);
-            System.exit(1);
-        } catch (Exception e) {
-            s_logger.error("Unable to load configuration for " + _serverName + " from " + filename, e);
-            System.exit(1);
-        }
-        return null;
-    }
-
-    protected void parse(String filename) {
-        Pair<XmlHandler, HashMap<String, List<ComponentInfo<Adapter>>>> result = parse2(filename);
-        if (result == null) {
-            s_logger.info("Skipping configuration using " + filename);
-            return;
-        }
-
-        instantiatePluggableServices();
-
-        XmlHandler handler = result.first();
-        HashMap<String, List<ComponentInfo<Adapter>>> adapters = result.second();
-        try {
-            runCheckers();
-            startDaos();    // daos should not be using managers and adapters.
-            instantiateAdapters(adapters);
-            instantiateManagers();
-            if (handler.componentClass != null) {
-                _component = createInstance(handler.componentClass, true, true);
-            }
-            configureManagers();
-            configureAdapters();
-            startManagers();
-            startAdapters();
-            //TODO do we need to follow the instantiate -> inject -> configure -> start -> stop flow of singletons like managers/adapters?
-            //TODO do we need to expose pluggableServices to MBean (provide getNames?)
-        } catch (CloudRuntimeException e) {
-            s_logger.error("Unable to load configuration for " + _serverName + " from " + filename, e);
-            System.exit(1);
-        } catch (Exception e) {
-            s_logger.error("Unable to load configuration for " + _serverName + " from " + filename, e);
-            System.exit(1);
-        }
-    }
-
-    protected void runCheckers() {
-        Set<Map.Entry<String, ComponentInfo<SystemIntegrityChecker>>> entries = _checkerMap.entrySet();
-        for (Map.Entry<String, ComponentInfo<SystemIntegrityChecker>> entry : entries) {
-            ComponentInfo<SystemIntegrityChecker> info = entry.getValue();
-            try {
-                info.instance = (SystemIntegrityChecker)createInstance(info.clazz, false, info.singleton);
-                info.instance.check();
-            } catch (Exception e) {
-                s_logger.error("Problems with running checker:" + info.name, e);
-                System.exit(1);
-            }
-        }
-    }
-    /**
-     * Daos should not refer to any other components so it is safe to start them
-     * here.
-     */
-    protected void startDaos()  {
-        Set<Map.Entry<String, ComponentInfo<GenericDao<?, ? extends Serializable>>>> entries = _daoMap.entrySet();
-
-        for (Map.Entry<String, ComponentInfo<GenericDao<?, ?>>> entry : entries) {
-            ComponentInfo<GenericDao<?, ?>> info = entry.getValue();
-            try {
-                info.instance = (GenericDao<?, ?>)createInstance(info.clazz, true, info.singleton);
-                if (info.singleton) {
-                    s_logger.info("Starting singleton DAO: " + info.name);
-                    Singleton singleton = s_singletons.get(info.clazz);
-                    if (singleton.state == Singleton.State.Instantiated) {
-                        inject(info.clazz, info.instance);
-                        singleton.state = Singleton.State.Injected;
-                    }
-                    if (singleton.state == Singleton.State.Injected) {
-                        if (!info.instance.configure(info.name, info.params)) {
-                            s_logger.error("Unable to configure DAO: " + info.name);
-                            System.exit(1);
-                        }
-                        singleton.state = Singleton.State.Started;
-                    }
-                } else {
-                    s_logger.info("Starting DAO: " + info.name);
-                    inject(info.clazz, info.instance);
-                    if (!info.instance.configure(info.name, info.params)) {
-                        s_logger.error("Unable to configure DAO: " + info.name);
-                        System.exit(1);
-                    }
-                }
-            } catch (ConfigurationException e) {
-                s_logger.error("Unable to configure DAO: " + info.name, e);
-                System.exit(1);
-            } catch (Exception e) {
-                s_logger.error("Problems while configuring DAO: " + info.name, e);
-                System.exit(1);
-            }
-            if (info.instance instanceof ManagementBean) {
-                registerMBean((ManagementBean) info.instance);
-            }
-        }
-    }
-
-    private static Object createInstance(Class<?> clazz, boolean inject, boolean singleton, Object... args) {
-        Factory factory = null;
-        Singleton entity = null;
-        synchronized(s_factories) {
-            if (singleton) {
-                entity = s_singletons.get(clazz);
-                if (entity != null) {
-                    s_logger.debug("Found singleton instantiation for " + clazz.toString());
-                    return entity.singleton;
-                }
-            }
-            InjectInfo info = s_factories.get(clazz);
-            if (info == null) {
-                Enhancer enhancer = new Enhancer();
-                enhancer.setSuperclass(clazz);
-                enhancer.setCallbackFilter(s_callbackFilter);
-                enhancer.setCallbacks(s_callbacks);
-                factory = (Factory)enhancer.create();
-                info = new InjectInfo(enhancer, factory);
-                s_factories.put(clazz, info);
-            } else {
-                factory = info.factory;
-            }
-        }
-
-
-        Class<?>[] argTypes = null;
-        if (args != null && args.length > 0) {
-            Constructor<?>[] constructors = clazz.getConstructors();
-            for (Constructor<?> constructor : constructors) {
-                Class<?>[] paramTypes = constructor.getParameterTypes();
-                if (paramTypes.length == args.length) {
-                    boolean found = true;
-                    for (int i = 0; i < paramTypes.length; i++) {
-                        if (!paramTypes[i].isAssignableFrom(args[i].getClass()) && !paramTypes[i].isPrimitive()) {
-                            found = false;
-                            break;
-                        }
-                    }
-                    if (found) {
-                        argTypes = paramTypes;
-                        break;
-                    }
-                }
-            }
-
-            if (argTypes == null) {
-                throw new CloudRuntimeException("Unable to find constructor to match parameters given: " + clazz.getName());
-            }
-
-            entity = new Singleton(factory.newInstance(argTypes, args, s_callbacks));
-        } else {
-            entity = new Singleton(factory.newInstance(s_callbacks));
-        }
-
-        if (inject) {
-            inject(clazz, entity.singleton);
-            entity.state = Singleton.State.Injected;
-        }
-
-        if (singleton) {
-            synchronized(s_factories) {
-                s_singletons.put(clazz, entity);
-            }
-        }
-
-        return entity.singleton;
-    }
 
 @Component
 public class ComponentLocator {
@@ -427,5 +56,4 @@ public class ComponentLocator {
     public static <T> T inject(Class<T> clazz) {
     	return ComponentContext.inject(clazz);
     }
-    
 }
diff --git a/utils/test/com/cloud/utils/db/QueryBuilderTest.java b/utils/test/com/cloud/utils/db/QueryBuilderTest.java
deleted file mode 100644
index f39e1980266..00000000000
--- a/utils/test/com/cloud/utils/db/QueryBuilderTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// the License.  You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.utils.db;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import junit.framework.TestCase;
-
-import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.exception.CloudRuntimeException;
-
-
-public class QueryBuilderTest extends TestCase {
-    @Entity
-    @Table(name="test")
-    public static class TestVO {
-        @Id
-        @GeneratedValue(strategy=GenerationType.IDENTITY)
-        long id;
-        
-        @Column(name="int")
-        int fieldInt;
-        
-        @Column(name="long")
-        Long fieldLong;
-        
-        @Column(name="string")
-        String fieldString;
-        
-        public String getFieldString() {
-            return fieldString;
-        }
-        
-        public int getFieldInt() {
-            return fieldInt;
-        }
-        
-        public long getFieldLong() {
-            return fieldLong;
-        }
-        
-        public TestVO() {
-        }
-    }
-    
-    public static class TestDao extends GenericDaoBase<TestVO, Long> implements GenericDao<TestVO, Long> {
-        protected TestDao() {
-        }
-    }
-    
-    public void setup() {
-        Connection conn = null;
-        PreparedStatement pstmt = null;
-        try {
-            conn = Transaction.getStandaloneConnection();
-            
-            pstmt = conn.prepareStatement("CREATE TABLE `cloud`.`test` (" +
-                    "`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT," +
-                    "`int` int unsigned," +
-                    "`long` bigint unsigned," +
-                    "`string` varchar(255)," +
-                    "PRIMARY KEY (`id`)" +
-                    ") ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-            
-            pstmt.execute();
-            
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Problem with sql", e);
-        } finally {
-            if (pstmt != null) {
-                try {
-                    pstmt.close();
-                } catch (SQLException e) {
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException e) {
-                }
-            }
-        }
-    }
-    
-    public void teardown() {
-        Connection conn = null;
-        PreparedStatement pstmt = null;
-        try {
-            conn = Transaction.getStandaloneConnection();
-            
-            pstmt = conn.prepareStatement("DROP TABLE IF EXISTS `cloud`.`test`");
-            pstmt.execute();
-            
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Problem with sql", e);
-        } finally {
-            if (pstmt != null) {
-                try {
-                    pstmt.close();
-                } catch (SQLException e) {
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException e) {
-                }
-            }
-        }
-    }
-    
-    public void testSimpleQueryBuilder() {
-        TestDao dao = ComponentLocator.inject(TestDao.class);
-        SimpleQueryBuilder<TestVO> qb = new QueryBuilder<TestVO, TestVO>(TestVO.class, TestVO.class);
-        qb.selectFields(qb.entity().getFieldLong()).where().field(qb.entity().getFieldInt()).eq("abc");
-        
-    }
-
-}
diff --git a/utils/test/com/cloud/utils/db/TransactionTest.java b/utils/test/com/cloud/utils/db/TransactionTest.java
index 2c79c587f3d..96d31b40597 100644
--- a/utils/test/com/cloud/utils/db/TransactionTest.java
+++ b/utils/test/com/cloud/utils/db/TransactionTest.java
@@ -27,8 +27,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.db.QueryBuilderTest.TestDao;
-import com.cloud.utils.db.QueryBuilderTest.TestVO;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 /**
@@ -43,7 +41,7 @@ public class TransactionTest {
     @BeforeClass
     public static void oneTimeSetup() {
         Connection conn = null;
-        PreparedStatement pstmt = null;
+        PreparedStatement pstmt = null; 
         try {
             conn = Transaction.getStandaloneConnection();
 
@@ -156,7 +154,7 @@ public class TransactionTest {
             }
         }
     }
-    
+
     @After
     /**
      * Delete all records after each test, but table is still kept
@@ -187,7 +185,7 @@ public class TransactionTest {
             }
         }
     }
-    
+
     @AfterClass
     public static void oneTimeTearDown() {
         Connection conn = null;
diff --git a/vmware-base/.project b/vmware-base/.project
deleted file mode 100644
index b15bfa4c9c9..00000000000
--- a/vmware-base/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cloud-vmware-base</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>