diff --git a/utils/pom.xml b/utils/pom.xml
index 937dc08f7e0..d01f6ffa125 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -18,7 +18,8 @@
     under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-utils</artifactId>
   <name>Apache CloudStack Utils</name>
@@ -96,8 +97,8 @@
       <artifactId>ejb-api</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.googlecode.java-ipv6</groupId>
-        <artifactId>java-ipv6</artifactId>
+      <groupId>com.googlecode.java-ipv6</groupId>
+      <artifactId>java-ipv6</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>
@@ -115,10 +116,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <scope>provided</scope>
-        <version>${cs.commons-io.version}</version>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>provided</scope>
+      <version>${cs.commons-io.version}</version>
     </dependency>
     <dependency>
       <groupId>org.reflections</groupId>
@@ -154,9 +155,9 @@
       <version>${cs.opensaml.version}</version>
     </dependency>
     <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>3.3</version>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.3</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -169,6 +170,20 @@
     </dependency>
   </dependencies>
   <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
+    <outputDirectory>target/classes</outputDirectory>
+    <testOutputDirectory>target/test-classes</testOutputDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -191,15 +206,9 @@
             <exclude>com/cloud/utils/testcase/NioTest.java</exclude>
           </excludes>
         </configuration>
-      </plugin>      
+      </plugin>
     </plugins>
-    <resources>
-       <resource>
-          <directory>certs</directory>
-       </resource>
-    </resources>
   </build>
-
   <profiles>
     <profile>
       <id>integration</id>
@@ -221,5 +230,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java b/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java
deleted file mode 100644
index b102dc44a2c..00000000000
--- a/utils/src/com/cloud/utils/log/CglibThrowableRenderer.java
+++ /dev/null
@@ -1,84 +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
-// with 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.log;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-
-import org.apache.log4j.spi.ThrowableRenderer;
-
-/**
- * This renderer removes all the Cglib generated methods from the call
- *
- * Unfortunately, I had to copy out the EnhancedThrowableRenderer from
- * the apach libraries because EnhancedThrowableRenderer is a final class.
- * simply override doRender. Not sure what the developers are thinking there
- * making it final.
- *
- * <throwableRenderer class="com.cloud.utils.log.CglibThrowableRenderer"/>
- * into log4j.xml.
- *
- */
-public class CglibThrowableRenderer implements ThrowableRenderer {
-    /**
-     * Construct new instance.
-     */
-    public CglibThrowableRenderer() {
-        super();
-    }
-
-    @Override
-    public String[] doRender(final Throwable th) {
-        try {
-            ArrayList<String> lines = new ArrayList<String>();
-            Throwable throwable = th;
-            lines.add(throwable.toString());
-            int start = 0;
-            do {
-                StackTraceElement[] elements = throwable.getStackTrace();
-                for (int i = 0; i < elements.length - start; i++) {
-                    StackTraceElement element = elements[i];
-                    String filename = element.getFileName();
-                    String method = element.getMethodName();
-                    if ((filename != null && filename.equals("<generated>")) || (method != null && method.equals("invokeSuper"))) {
-                        continue;
-                    }
-                    lines.add("\tat " + element.toString());
-                }
-                if (start != 0) {
-                    lines.add("\t... " + start + " more");
-                }
-                throwable = throwable.getCause();
-                if (throwable != null) {
-                    lines.add("Caused by: " + throwable.toString());
-                    start = elements.length - 1;
-                }
-            } while (throwable != null);
-            return lines.toArray(new String[lines.size()]);
-        } catch (Exception ex) {
-            PrintWriter pw = new PrintWriter(System.err);
-            ex.printStackTrace(pw);
-            pw = new PrintWriter(System.out);
-            ex.printStackTrace(pw);
-            ex.printStackTrace();
-            return null;
-        }
-    }
-}
diff --git a/utils/src/com/cloud/maint/Version.java b/utils/src/main/java/com/cloud/maint/Version.java
similarity index 100%
rename from utils/src/com/cloud/maint/Version.java
rename to utils/src/main/java/com/cloud/maint/Version.java
diff --git a/utils/src/com/cloud/utils/ActionDelegate.java b/utils/src/main/java/com/cloud/utils/ActionDelegate.java
similarity index 100%
rename from utils/src/com/cloud/utils/ActionDelegate.java
rename to utils/src/main/java/com/cloud/utils/ActionDelegate.java
diff --git a/utils/src/com/cloud/utils/AutoCloseableUtil.java b/utils/src/main/java/com/cloud/utils/AutoCloseableUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/AutoCloseableUtil.java
rename to utils/src/main/java/com/cloud/utils/AutoCloseableUtil.java
diff --git a/utils/src/com/cloud/utils/CloudResourceBundle.java b/utils/src/main/java/com/cloud/utils/CloudResourceBundle.java
similarity index 100%
rename from utils/src/com/cloud/utils/CloudResourceBundle.java
rename to utils/src/main/java/com/cloud/utils/CloudResourceBundle.java
diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java b/utils/src/main/java/com/cloud/utils/ConstantTimeComparator.java
similarity index 100%
rename from utils/src/com/cloud/utils/ConstantTimeComparator.java
rename to utils/src/main/java/com/cloud/utils/ConstantTimeComparator.java
diff --git a/utils/src/com/cloud/utils/DateUtil.java b/utils/src/main/java/com/cloud/utils/DateUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/DateUtil.java
rename to utils/src/main/java/com/cloud/utils/DateUtil.java
diff --git a/utils/src/com/cloud/utils/EncryptionUtil.java b/utils/src/main/java/com/cloud/utils/EncryptionUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/EncryptionUtil.java
rename to utils/src/main/java/com/cloud/utils/EncryptionUtil.java
diff --git a/utils/src/com/cloud/utils/EnumUtils.java b/utils/src/main/java/com/cloud/utils/EnumUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/EnumUtils.java
rename to utils/src/main/java/com/cloud/utils/EnumUtils.java
diff --git a/utils/src/com/cloud/utils/ExecutionResult.java b/utils/src/main/java/com/cloud/utils/ExecutionResult.java
similarity index 100%
rename from utils/src/com/cloud/utils/ExecutionResult.java
rename to utils/src/main/java/com/cloud/utils/ExecutionResult.java
diff --git a/utils/src/com/cloud/utils/FileUtil.java b/utils/src/main/java/com/cloud/utils/FileUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/FileUtil.java
rename to utils/src/main/java/com/cloud/utils/FileUtil.java
diff --git a/utils/src/com/cloud/utils/HttpUtils.java b/utils/src/main/java/com/cloud/utils/HttpUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/HttpUtils.java
rename to utils/src/main/java/com/cloud/utils/HttpUtils.java
diff --git a/utils/src/com/cloud/utils/IteratorUtil.java b/utils/src/main/java/com/cloud/utils/IteratorUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/IteratorUtil.java
rename to utils/src/main/java/com/cloud/utils/IteratorUtil.java
diff --git a/utils/src/com/cloud/utils/Journal.java b/utils/src/main/java/com/cloud/utils/Journal.java
similarity index 100%
rename from utils/src/com/cloud/utils/Journal.java
rename to utils/src/main/java/com/cloud/utils/Journal.java
diff --git a/utils/src/com/cloud/utils/LogUtils.java b/utils/src/main/java/com/cloud/utils/LogUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/LogUtils.java
rename to utils/src/main/java/com/cloud/utils/LogUtils.java
diff --git a/utils/src/com/cloud/utils/MethodCapturer.java b/utils/src/main/java/com/cloud/utils/MethodCapturer.java
similarity index 100%
rename from utils/src/com/cloud/utils/MethodCapturer.java
rename to utils/src/main/java/com/cloud/utils/MethodCapturer.java
diff --git a/utils/src/com/cloud/utils/NumbersUtil.java b/utils/src/main/java/com/cloud/utils/NumbersUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/NumbersUtil.java
rename to utils/src/main/java/com/cloud/utils/NumbersUtil.java
diff --git a/utils/src/com/cloud/utils/Pair.java b/utils/src/main/java/com/cloud/utils/Pair.java
similarity index 100%
rename from utils/src/com/cloud/utils/Pair.java
rename to utils/src/main/java/com/cloud/utils/Pair.java
diff --git a/utils/src/com/cloud/utils/PasswordGenerator.java b/utils/src/main/java/com/cloud/utils/PasswordGenerator.java
similarity index 100%
rename from utils/src/com/cloud/utils/PasswordGenerator.java
rename to utils/src/main/java/com/cloud/utils/PasswordGenerator.java
diff --git a/utils/src/com/cloud/utils/Predicate.java b/utils/src/main/java/com/cloud/utils/Predicate.java
similarity index 100%
rename from utils/src/com/cloud/utils/Predicate.java
rename to utils/src/main/java/com/cloud/utils/Predicate.java
diff --git a/utils/src/com/cloud/utils/ProcessUtil.java b/utils/src/main/java/com/cloud/utils/ProcessUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/ProcessUtil.java
rename to utils/src/main/java/com/cloud/utils/ProcessUtil.java
diff --git a/utils/src/com/cloud/utils/Profiler.java b/utils/src/main/java/com/cloud/utils/Profiler.java
similarity index 100%
rename from utils/src/com/cloud/utils/Profiler.java
rename to utils/src/main/java/com/cloud/utils/Profiler.java
diff --git a/utils/src/com/cloud/utils/PropertiesUtil.java b/utils/src/main/java/com/cloud/utils/PropertiesUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/PropertiesUtil.java
rename to utils/src/main/java/com/cloud/utils/PropertiesUtil.java
diff --git a/utils/src/com/cloud/utils/ReflectUtil.java b/utils/src/main/java/com/cloud/utils/ReflectUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/ReflectUtil.java
rename to utils/src/main/java/com/cloud/utils/ReflectUtil.java
diff --git a/utils/src/com/cloud/utils/ReflectionUse.java b/utils/src/main/java/com/cloud/utils/ReflectionUse.java
similarity index 100%
rename from utils/src/com/cloud/utils/ReflectionUse.java
rename to utils/src/main/java/com/cloud/utils/ReflectionUse.java
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/main/java/com/cloud/utils/S3Utils.java
similarity index 100%
rename from utils/src/com/cloud/utils/S3Utils.java
rename to utils/src/main/java/com/cloud/utils/S3Utils.java
diff --git a/utils/src/com/cloud/utils/SerialVersionUID.java b/utils/src/main/java/com/cloud/utils/SerialVersionUID.java
similarity index 100%
rename from utils/src/com/cloud/utils/SerialVersionUID.java
rename to utils/src/main/java/com/cloud/utils/SerialVersionUID.java
diff --git a/utils/src/com/cloud/utils/StringUtils.java b/utils/src/main/java/com/cloud/utils/StringUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/StringUtils.java
rename to utils/src/main/java/com/cloud/utils/StringUtils.java
diff --git a/utils/src/com/cloud/utils/SwiftUtil.java b/utils/src/main/java/com/cloud/utils/SwiftUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/SwiftUtil.java
rename to utils/src/main/java/com/cloud/utils/SwiftUtil.java
diff --git a/utils/src/com/cloud/utils/Ternary.java b/utils/src/main/java/com/cloud/utils/Ternary.java
similarity index 100%
rename from utils/src/com/cloud/utils/Ternary.java
rename to utils/src/main/java/com/cloud/utils/Ternary.java
diff --git a/utils/src/com/cloud/utils/UriUtils.java b/utils/src/main/java/com/cloud/utils/UriUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/UriUtils.java
rename to utils/src/main/java/com/cloud/utils/UriUtils.java
diff --git a/utils/src/com/cloud/utils/UsernamePasswordValidator.java b/utils/src/main/java/com/cloud/utils/UsernamePasswordValidator.java
similarity index 100%
rename from utils/src/com/cloud/utils/UsernamePasswordValidator.java
rename to utils/src/main/java/com/cloud/utils/UsernamePasswordValidator.java
diff --git a/utils/src/com/cloud/utils/UuidUtils.java b/utils/src/main/java/com/cloud/utils/UuidUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/UuidUtils.java
rename to utils/src/main/java/com/cloud/utils/UuidUtils.java
diff --git a/utils/src/com/cloud/utils/backoff/BackoffAlgorithm.java b/utils/src/main/java/com/cloud/utils/backoff/BackoffAlgorithm.java
similarity index 100%
rename from utils/src/com/cloud/utils/backoff/BackoffAlgorithm.java
rename to utils/src/main/java/com/cloud/utils/backoff/BackoffAlgorithm.java
diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java b/utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
similarity index 100%
rename from utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
rename to utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java b/utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java
similarity index 100%
rename from utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java
rename to utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/PolicyMap.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/PolicyMap.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/PolicyMap.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/PolicyMap.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/PortProfile.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/PortProfile.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/PortProfile.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/PortProfile.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmOkResponse.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmOkResponse.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmOkResponse.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmOkResponse.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmPolicyMapResponse.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmPolicyMapResponse.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmPolicyMapResponse.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmPolicyMapResponse.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmPortProfileResponse.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmPortProfileResponse.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmPortProfileResponse.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmPortProfileResponse.java
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmResponse.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmResponse.java
similarity index 100%
rename from utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmResponse.java
rename to utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmResponse.java
diff --git a/utils/src/com/cloud/utils/component/Adapter.java b/utils/src/main/java/com/cloud/utils/component/Adapter.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/Adapter.java
rename to utils/src/main/java/com/cloud/utils/component/Adapter.java
diff --git a/utils/src/com/cloud/utils/component/AdapterBase.java b/utils/src/main/java/com/cloud/utils/component/AdapterBase.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/AdapterBase.java
rename to utils/src/main/java/com/cloud/utils/component/AdapterBase.java
diff --git a/utils/src/com/cloud/utils/component/AdapterList.java b/utils/src/main/java/com/cloud/utils/component/AdapterList.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/AdapterList.java
rename to utils/src/main/java/com/cloud/utils/component/AdapterList.java
diff --git a/utils/src/com/cloud/utils/component/ComponentContext.java b/utils/src/main/java/com/cloud/utils/component/ComponentContext.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentContext.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentContext.java
diff --git a/utils/src/com/cloud/utils/component/ComponentInstantiationPostProcessor.java b/utils/src/main/java/com/cloud/utils/component/ComponentInstantiationPostProcessor.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentInstantiationPostProcessor.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentInstantiationPostProcessor.java
diff --git a/utils/src/com/cloud/utils/component/ComponentLifecycle.java b/utils/src/main/java/com/cloud/utils/component/ComponentLifecycle.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentLifecycle.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentLifecycle.java
diff --git a/utils/src/com/cloud/utils/component/ComponentLifecycleBase.java b/utils/src/main/java/com/cloud/utils/component/ComponentLifecycleBase.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentLifecycleBase.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentLifecycleBase.java
diff --git a/utils/src/com/cloud/utils/component/ComponentMethodInterceptable.java b/utils/src/main/java/com/cloud/utils/component/ComponentMethodInterceptable.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentMethodInterceptable.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentMethodInterceptable.java
diff --git a/utils/src/com/cloud/utils/component/ComponentMethodInterceptor.java b/utils/src/main/java/com/cloud/utils/component/ComponentMethodInterceptor.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentMethodInterceptor.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentMethodInterceptor.java
diff --git a/utils/src/com/cloud/utils/component/ComponentNamingPolicy.java b/utils/src/main/java/com/cloud/utils/component/ComponentNamingPolicy.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ComponentNamingPolicy.java
rename to utils/src/main/java/com/cloud/utils/component/ComponentNamingPolicy.java
diff --git a/utils/src/com/cloud/utils/component/Manager.java b/utils/src/main/java/com/cloud/utils/component/Manager.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/Manager.java
rename to utils/src/main/java/com/cloud/utils/component/Manager.java
diff --git a/utils/src/com/cloud/utils/component/ManagerBase.java b/utils/src/main/java/com/cloud/utils/component/ManagerBase.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/ManagerBase.java
rename to utils/src/main/java/com/cloud/utils/component/ManagerBase.java
diff --git a/utils/src/com/cloud/utils/component/Named.java b/utils/src/main/java/com/cloud/utils/component/Named.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/Named.java
rename to utils/src/main/java/com/cloud/utils/component/Named.java
diff --git a/utils/src/com/cloud/utils/component/PluggableService.java b/utils/src/main/java/com/cloud/utils/component/PluggableService.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/PluggableService.java
rename to utils/src/main/java/com/cloud/utils/component/PluggableService.java
diff --git a/utils/src/com/cloud/utils/component/Registry.java b/utils/src/main/java/com/cloud/utils/component/Registry.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/Registry.java
rename to utils/src/main/java/com/cloud/utils/component/Registry.java
diff --git a/utils/src/com/cloud/utils/component/SystemIntegrityChecker.java b/utils/src/main/java/com/cloud/utils/component/SystemIntegrityChecker.java
similarity index 100%
rename from utils/src/com/cloud/utils/component/SystemIntegrityChecker.java
rename to utils/src/main/java/com/cloud/utils/component/SystemIntegrityChecker.java
diff --git a/utils/src/com/cloud/utils/concurrency/NamedThreadFactory.java b/utils/src/main/java/com/cloud/utils/concurrency/NamedThreadFactory.java
similarity index 100%
rename from utils/src/com/cloud/utils/concurrency/NamedThreadFactory.java
rename to utils/src/main/java/com/cloud/utils/concurrency/NamedThreadFactory.java
diff --git a/utils/src/com/cloud/utils/concurrency/Scheduler.java b/utils/src/main/java/com/cloud/utils/concurrency/Scheduler.java
similarity index 100%
rename from utils/src/com/cloud/utils/concurrency/Scheduler.java
rename to utils/src/main/java/com/cloud/utils/concurrency/Scheduler.java
diff --git a/utils/src/com/cloud/utils/concurrency/SynchronizationEvent.java b/utils/src/main/java/com/cloud/utils/concurrency/SynchronizationEvent.java
similarity index 100%
rename from utils/src/com/cloud/utils/concurrency/SynchronizationEvent.java
rename to utils/src/main/java/com/cloud/utils/concurrency/SynchronizationEvent.java
diff --git a/utils/src/com/cloud/utils/concurrency/TestClock.java b/utils/src/main/java/com/cloud/utils/concurrency/TestClock.java
similarity index 100%
rename from utils/src/com/cloud/utils/concurrency/TestClock.java
rename to utils/src/main/java/com/cloud/utils/concurrency/TestClock.java
diff --git a/utils/src/com/cloud/utils/crypt/DBEncryptionUtil.java b/utils/src/main/java/com/cloud/utils/crypt/DBEncryptionUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/crypt/DBEncryptionUtil.java
rename to utils/src/main/java/com/cloud/utils/crypt/DBEncryptionUtil.java
diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
similarity index 100%
rename from utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
rename to utils/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeySender.java b/utils/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeySender.java
similarity index 100%
rename from utils/src/com/cloud/utils/crypt/EncryptionSecretKeySender.java
rename to utils/src/main/java/com/cloud/utils/crypt/EncryptionSecretKeySender.java
diff --git a/utils/src/com/cloud/utils/crypt/RSAHelper.java b/utils/src/main/java/com/cloud/utils/crypt/RSAHelper.java
similarity index 100%
rename from utils/src/com/cloud/utils/crypt/RSAHelper.java
rename to utils/src/main/java/com/cloud/utils/crypt/RSAHelper.java
diff --git a/utils/src/com/cloud/utils/db/DbProperties.java b/utils/src/main/java/com/cloud/utils/db/DbProperties.java
similarity index 100%
rename from utils/src/com/cloud/utils/db/DbProperties.java
rename to utils/src/main/java/com/cloud/utils/db/DbProperties.java
diff --git a/utils/src/com/cloud/utils/db/EntityManager.java b/utils/src/main/java/com/cloud/utils/db/EntityManager.java
similarity index 100%
rename from utils/src/com/cloud/utils/db/EntityManager.java
rename to utils/src/main/java/com/cloud/utils/db/EntityManager.java
diff --git a/utils/src/com/cloud/utils/db/UUIDManager.java b/utils/src/main/java/com/cloud/utils/db/UUIDManager.java
similarity index 100%
rename from utils/src/com/cloud/utils/db/UUIDManager.java
rename to utils/src/main/java/com/cloud/utils/db/UUIDManager.java
diff --git a/utils/src/com/cloud/utils/encoding/URLEncoder.java b/utils/src/main/java/com/cloud/utils/encoding/URLEncoder.java
similarity index 100%
rename from utils/src/com/cloud/utils/encoding/URLEncoder.java
rename to utils/src/main/java/com/cloud/utils/encoding/URLEncoder.java
diff --git a/utils/src/com/cloud/utils/events/EventArgs.java b/utils/src/main/java/com/cloud/utils/events/EventArgs.java
similarity index 100%
rename from utils/src/com/cloud/utils/events/EventArgs.java
rename to utils/src/main/java/com/cloud/utils/events/EventArgs.java
diff --git a/utils/src/com/cloud/utils/events/SubscriptionMgr.java b/utils/src/main/java/com/cloud/utils/events/SubscriptionMgr.java
similarity index 100%
rename from utils/src/com/cloud/utils/events/SubscriptionMgr.java
rename to utils/src/main/java/com/cloud/utils/events/SubscriptionMgr.java
diff --git a/utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java b/utils/src/main/java/com/cloud/utils/exception/CSExceptionErrorCode.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java
rename to utils/src/main/java/com/cloud/utils/exception/CSExceptionErrorCode.java
diff --git a/utils/src/com/cloud/utils/exception/CloudRuntimeException.java b/utils/src/main/java/com/cloud/utils/exception/CloudRuntimeException.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/CloudRuntimeException.java
rename to utils/src/main/java/com/cloud/utils/exception/CloudRuntimeException.java
diff --git a/utils/src/com/cloud/utils/exception/ErrorContext.java b/utils/src/main/java/com/cloud/utils/exception/ErrorContext.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/ErrorContext.java
rename to utils/src/main/java/com/cloud/utils/exception/ErrorContext.java
diff --git a/utils/src/com/cloud/utils/exception/ExceptionProxyObject.java b/utils/src/main/java/com/cloud/utils/exception/ExceptionProxyObject.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/ExceptionProxyObject.java
rename to utils/src/main/java/com/cloud/utils/exception/ExceptionProxyObject.java
diff --git a/utils/src/com/cloud/utils/exception/ExceptionUtil.java b/utils/src/main/java/com/cloud/utils/exception/ExceptionUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/ExceptionUtil.java
rename to utils/src/main/java/com/cloud/utils/exception/ExceptionUtil.java
diff --git a/utils/src/com/cloud/utils/exception/ExecutionException.java b/utils/src/main/java/com/cloud/utils/exception/ExecutionException.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/ExecutionException.java
rename to utils/src/main/java/com/cloud/utils/exception/ExecutionException.java
diff --git a/utils/src/com/cloud/utils/exception/HypervisorVersionChangedException.java b/utils/src/main/java/com/cloud/utils/exception/HypervisorVersionChangedException.java
similarity index 100%
rename from utils/src/com/cloud/utils/exception/HypervisorVersionChangedException.java
rename to utils/src/main/java/com/cloud/utils/exception/HypervisorVersionChangedException.java
diff --git a/utils/src/com/cloud/utils/fsm/ChangeEvent.java b/utils/src/main/java/com/cloud/utils/fsm/ChangeEvent.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/ChangeEvent.java
rename to utils/src/main/java/com/cloud/utils/fsm/ChangeEvent.java
diff --git a/utils/src/com/cloud/utils/fsm/FiniteState.java b/utils/src/main/java/com/cloud/utils/fsm/FiniteState.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/FiniteState.java
rename to utils/src/main/java/com/cloud/utils/fsm/FiniteState.java
diff --git a/utils/src/com/cloud/utils/fsm/FiniteState2.java b/utils/src/main/java/com/cloud/utils/fsm/FiniteState2.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/FiniteState2.java
rename to utils/src/main/java/com/cloud/utils/fsm/FiniteState2.java
diff --git a/utils/src/com/cloud/utils/fsm/FiniteStateObject.java b/utils/src/main/java/com/cloud/utils/fsm/FiniteStateObject.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/FiniteStateObject.java
rename to utils/src/main/java/com/cloud/utils/fsm/FiniteStateObject.java
diff --git a/utils/src/com/cloud/utils/fsm/NoTransitionException.java b/utils/src/main/java/com/cloud/utils/fsm/NoTransitionException.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/NoTransitionException.java
rename to utils/src/main/java/com/cloud/utils/fsm/NoTransitionException.java
diff --git a/utils/src/com/cloud/utils/fsm/State.java b/utils/src/main/java/com/cloud/utils/fsm/State.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/State.java
rename to utils/src/main/java/com/cloud/utils/fsm/State.java
diff --git a/utils/src/com/cloud/utils/fsm/StateDao.java b/utils/src/main/java/com/cloud/utils/fsm/StateDao.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/StateDao.java
rename to utils/src/main/java/com/cloud/utils/fsm/StateDao.java
diff --git a/utils/src/com/cloud/utils/fsm/StateListener.java b/utils/src/main/java/com/cloud/utils/fsm/StateListener.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/StateListener.java
rename to utils/src/main/java/com/cloud/utils/fsm/StateListener.java
diff --git a/utils/src/com/cloud/utils/fsm/StateMachine.java b/utils/src/main/java/com/cloud/utils/fsm/StateMachine.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/StateMachine.java
rename to utils/src/main/java/com/cloud/utils/fsm/StateMachine.java
diff --git a/utils/src/com/cloud/utils/fsm/StateMachine2.java b/utils/src/main/java/com/cloud/utils/fsm/StateMachine2.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/StateMachine2.java
rename to utils/src/main/java/com/cloud/utils/fsm/StateMachine2.java
diff --git a/utils/src/com/cloud/utils/fsm/StateObject.java b/utils/src/main/java/com/cloud/utils/fsm/StateObject.java
similarity index 100%
rename from utils/src/com/cloud/utils/fsm/StateObject.java
rename to utils/src/main/java/com/cloud/utils/fsm/StateObject.java
diff --git a/utils/src/com/cloud/utils/mgmt/JmxUtil.java b/utils/src/main/java/com/cloud/utils/mgmt/JmxUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/mgmt/JmxUtil.java
rename to utils/src/main/java/com/cloud/utils/mgmt/JmxUtil.java
diff --git a/utils/src/com/cloud/utils/mgmt/ManagementBean.java b/utils/src/main/java/com/cloud/utils/mgmt/ManagementBean.java
similarity index 100%
rename from utils/src/com/cloud/utils/mgmt/ManagementBean.java
rename to utils/src/main/java/com/cloud/utils/mgmt/ManagementBean.java
diff --git a/utils/src/com/cloud/utils/mgmt/PropertyMapDynamicBean.java b/utils/src/main/java/com/cloud/utils/mgmt/PropertyMapDynamicBean.java
similarity index 100%
rename from utils/src/com/cloud/utils/mgmt/PropertyMapDynamicBean.java
rename to utils/src/main/java/com/cloud/utils/mgmt/PropertyMapDynamicBean.java
diff --git a/utils/src/com/cloud/utils/net/Ip.java b/utils/src/main/java/com/cloud/utils/net/Ip.java
similarity index 100%
rename from utils/src/com/cloud/utils/net/Ip.java
rename to utils/src/main/java/com/cloud/utils/net/Ip.java
diff --git a/utils/src/com/cloud/utils/net/Ip4Address.java b/utils/src/main/java/com/cloud/utils/net/Ip4Address.java
similarity index 100%
rename from utils/src/com/cloud/utils/net/Ip4Address.java
rename to utils/src/main/java/com/cloud/utils/net/Ip4Address.java
diff --git a/utils/src/com/cloud/utils/net/MacAddress.java b/utils/src/main/java/com/cloud/utils/net/MacAddress.java
similarity index 100%
rename from utils/src/com/cloud/utils/net/MacAddress.java
rename to utils/src/main/java/com/cloud/utils/net/MacAddress.java
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/net/NetUtils.java
rename to utils/src/main/java/com/cloud/utils/net/NetUtils.java
diff --git a/utils/src/com/cloud/utils/net/NfsUtils.java b/utils/src/main/java/com/cloud/utils/net/NfsUtils.java
similarity index 100%
rename from utils/src/com/cloud/utils/net/NfsUtils.java
rename to utils/src/main/java/com/cloud/utils/net/NfsUtils.java
diff --git a/utils/src/com/cloud/utils/net/UrlUtil.java b/utils/src/main/java/com/cloud/utils/net/UrlUtil.java
similarity index 100%
rename from utils/src/com/cloud/utils/net/UrlUtil.java
rename to utils/src/main/java/com/cloud/utils/net/UrlUtil.java
diff --git a/utils/src/com/cloud/utils/nio/HandlerFactory.java b/utils/src/main/java/com/cloud/utils/nio/HandlerFactory.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/HandlerFactory.java
rename to utils/src/main/java/com/cloud/utils/nio/HandlerFactory.java
diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/main/java/com/cloud/utils/nio/Link.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/Link.java
rename to utils/src/main/java/com/cloud/utils/nio/Link.java
diff --git a/utils/src/com/cloud/utils/nio/NioClient.java b/utils/src/main/java/com/cloud/utils/nio/NioClient.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/NioClient.java
rename to utils/src/main/java/com/cloud/utils/nio/NioClient.java
diff --git a/utils/src/com/cloud/utils/nio/NioConnection.java b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/NioConnection.java
rename to utils/src/main/java/com/cloud/utils/nio/NioConnection.java
diff --git a/utils/src/com/cloud/utils/nio/NioServer.java b/utils/src/main/java/com/cloud/utils/nio/NioServer.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/NioServer.java
rename to utils/src/main/java/com/cloud/utils/nio/NioServer.java
diff --git a/utils/src/com/cloud/utils/nio/Task.java b/utils/src/main/java/com/cloud/utils/nio/Task.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/Task.java
rename to utils/src/main/java/com/cloud/utils/nio/Task.java
diff --git a/utils/src/com/cloud/utils/nio/TrustAllManager.java b/utils/src/main/java/com/cloud/utils/nio/TrustAllManager.java
similarity index 100%
rename from utils/src/com/cloud/utils/nio/TrustAllManager.java
rename to utils/src/main/java/com/cloud/utils/nio/TrustAllManager.java
diff --git a/utils/src/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java b/utils/src/main/java/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java
similarity index 100%
rename from utils/src/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java
rename to utils/src/main/java/com/cloud/utils/rest/BasicEncodedRESTValidationStrategy.java
diff --git a/utils/src/com/cloud/utils/rest/CloudstackRESTException.java b/utils/src/main/java/com/cloud/utils/rest/CloudstackRESTException.java
similarity index 100%
rename from utils/src/com/cloud/utils/rest/CloudstackRESTException.java
rename to utils/src/main/java/com/cloud/utils/rest/CloudstackRESTException.java
diff --git a/utils/src/com/cloud/utils/rest/RESTServiceConnector.java b/utils/src/main/java/com/cloud/utils/rest/RESTServiceConnector.java
similarity index 100%
rename from utils/src/com/cloud/utils/rest/RESTServiceConnector.java
rename to utils/src/main/java/com/cloud/utils/rest/RESTServiceConnector.java
diff --git a/utils/src/com/cloud/utils/rest/RESTValidationStrategy.java b/utils/src/main/java/com/cloud/utils/rest/RESTValidationStrategy.java
similarity index 100%
rename from utils/src/com/cloud/utils/rest/RESTValidationStrategy.java
rename to utils/src/main/java/com/cloud/utils/rest/RESTValidationStrategy.java
diff --git a/utils/src/com/cloud/utils/script/OutputInterpreter.java b/utils/src/main/java/com/cloud/utils/script/OutputInterpreter.java
similarity index 100%
rename from utils/src/com/cloud/utils/script/OutputInterpreter.java
rename to utils/src/main/java/com/cloud/utils/script/OutputInterpreter.java
diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java
similarity index 100%
rename from utils/src/com/cloud/utils/script/Script.java
rename to utils/src/main/java/com/cloud/utils/script/Script.java
diff --git a/utils/src/com/cloud/utils/script/Script2.java b/utils/src/main/java/com/cloud/utils/script/Script2.java
similarity index 100%
rename from utils/src/com/cloud/utils/script/Script2.java
rename to utils/src/main/java/com/cloud/utils/script/Script2.java
diff --git a/utils/src/com/cloud/utils/security/CertificateHelper.java b/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java
similarity index 100%
rename from utils/src/com/cloud/utils/security/CertificateHelper.java
rename to utils/src/main/java/com/cloud/utils/security/CertificateHelper.java
diff --git a/utils/src/com/cloud/utils/ssh/SSHCmdHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java
similarity index 100%
rename from utils/src/com/cloud/utils/ssh/SSHCmdHelper.java
rename to utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java
diff --git a/utils/src/com/cloud/utils/ssh/SSHKeysHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java
similarity index 100%
rename from utils/src/com/cloud/utils/ssh/SSHKeysHelper.java
rename to utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java
diff --git a/utils/src/com/cloud/utils/ssh/SshException.java b/utils/src/main/java/com/cloud/utils/ssh/SshException.java
similarity index 100%
rename from utils/src/com/cloud/utils/ssh/SshException.java
rename to utils/src/main/java/com/cloud/utils/ssh/SshException.java
diff --git a/utils/src/com/cloud/utils/ssh/SshHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
similarity index 100%
rename from utils/src/com/cloud/utils/ssh/SshHelper.java
rename to utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
diff --git a/utils/src/com/cloud/utils/storage/encoding/DecodedDataObject.java b/utils/src/main/java/com/cloud/utils/storage/encoding/DecodedDataObject.java
similarity index 100%
rename from utils/src/com/cloud/utils/storage/encoding/DecodedDataObject.java
rename to utils/src/main/java/com/cloud/utils/storage/encoding/DecodedDataObject.java
diff --git a/utils/src/com/cloud/utils/storage/encoding/DecodedDataStore.java b/utils/src/main/java/com/cloud/utils/storage/encoding/DecodedDataStore.java
similarity index 100%
rename from utils/src/com/cloud/utils/storage/encoding/DecodedDataStore.java
rename to utils/src/main/java/com/cloud/utils/storage/encoding/DecodedDataStore.java
diff --git a/utils/src/com/cloud/utils/storage/encoding/Decoder.java b/utils/src/main/java/com/cloud/utils/storage/encoding/Decoder.java
similarity index 100%
rename from utils/src/com/cloud/utils/storage/encoding/Decoder.java
rename to utils/src/main/java/com/cloud/utils/storage/encoding/Decoder.java
diff --git a/utils/src/com/cloud/utils/storage/encoding/EncodingType.java b/utils/src/main/java/com/cloud/utils/storage/encoding/EncodingType.java
similarity index 100%
rename from utils/src/com/cloud/utils/storage/encoding/EncodingType.java
rename to utils/src/main/java/com/cloud/utils/storage/encoding/EncodingType.java
diff --git a/utils/src/com/cloud/utils/time/InaccurateClock.java b/utils/src/main/java/com/cloud/utils/time/InaccurateClock.java
similarity index 100%
rename from utils/src/com/cloud/utils/time/InaccurateClock.java
rename to utils/src/main/java/com/cloud/utils/time/InaccurateClock.java
diff --git a/utils/src/com/cloud/utils/time/InaccurateClockMBean.java b/utils/src/main/java/com/cloud/utils/time/InaccurateClockMBean.java
similarity index 100%
rename from utils/src/com/cloud/utils/time/InaccurateClockMBean.java
rename to utils/src/main/java/com/cloud/utils/time/InaccurateClockMBean.java
diff --git a/utils/src/com/cloud/utils/xmlobject/XmlObject.java b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java
similarity index 100%
rename from utils/src/com/cloud/utils/xmlobject/XmlObject.java
rename to utils/src/main/java/com/cloud/utils/xmlobject/XmlObject.java
diff --git a/utils/src/com/cloud/utils/xmlobject/XmlObjectParser.java b/utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java
similarity index 100%
rename from utils/src/com/cloud/utils/xmlobject/XmlObjectParser.java
rename to utils/src/main/java/com/cloud/utils/xmlobject/XmlObjectParser.java
diff --git a/utils/src/org/apache/cloudstack/utils/baremetal/BaremetalUtils.java b/utils/src/main/java/org/apache/cloudstack/utils/baremetal/BaremetalUtils.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/baremetal/BaremetalUtils.java
rename to utils/src/main/java/org/apache/cloudstack/utils/baremetal/BaremetalUtils.java
diff --git a/utils/src/org/apache/cloudstack/utils/graphite/GraphiteClient.java b/utils/src/main/java/org/apache/cloudstack/utils/graphite/GraphiteClient.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/graphite/GraphiteClient.java
rename to utils/src/main/java/org/apache/cloudstack/utils/graphite/GraphiteClient.java
diff --git a/utils/src/org/apache/cloudstack/utils/graphite/GraphiteException.java b/utils/src/main/java/org/apache/cloudstack/utils/graphite/GraphiteException.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/graphite/GraphiteException.java
rename to utils/src/main/java/org/apache/cloudstack/utils/graphite/GraphiteException.java
diff --git a/utils/src/org/apache/cloudstack/utils/identity/ManagementServerNode.java b/utils/src/main/java/org/apache/cloudstack/utils/identity/ManagementServerNode.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/identity/ManagementServerNode.java
rename to utils/src/main/java/org/apache/cloudstack/utils/identity/ManagementServerNode.java
diff --git a/utils/src/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
rename to utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
diff --git a/utils/src/org/apache/cloudstack/utils/security/SSLUtils.java b/utils/src/main/java/org/apache/cloudstack/utils/security/SSLUtils.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/security/SSLUtils.java
rename to utils/src/main/java/org/apache/cloudstack/utils/security/SSLUtils.java
diff --git a/utils/src/org/apache/cloudstack/utils/security/SecureSSLSocketFactory.java b/utils/src/main/java/org/apache/cloudstack/utils/security/SecureSSLSocketFactory.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/security/SecureSSLSocketFactory.java
rename to utils/src/main/java/org/apache/cloudstack/utils/security/SecureSSLSocketFactory.java
diff --git a/utils/src/org/apache/cloudstack/utils/usage/UsageUtils.java b/utils/src/main/java/org/apache/cloudstack/utils/usage/UsageUtils.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/utils/usage/UsageUtils.java
rename to utils/src/main/java/org/apache/cloudstack/utils/usage/UsageUtils.java
diff --git a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java b/utils/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
similarity index 100%
rename from utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
rename to utils/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
diff --git a/utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java b/utils/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
similarity index 100%
rename from utils/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
rename to utils/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
diff --git a/utils/certs/cloud.keystore b/utils/src/main/resources/cloud.keystore
similarity index 100%
rename from utils/certs/cloud.keystore
rename to utils/src/main/resources/cloud.keystore
diff --git a/utils/test/com/cloud/utils/DateUtilTest.java b/utils/src/test/java/com/cloud/utils/DateUtilTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/DateUtilTest.java
rename to utils/src/test/java/com/cloud/utils/DateUtilTest.java
diff --git a/utils/test/com/cloud/utils/DummyImpl.java b/utils/src/test/java/com/cloud/utils/DummyImpl.java
similarity index 100%
rename from utils/test/com/cloud/utils/DummyImpl.java
rename to utils/src/test/java/com/cloud/utils/DummyImpl.java
diff --git a/utils/test/com/cloud/utils/DummyInterface.java b/utils/src/test/java/com/cloud/utils/DummyInterface.java
similarity index 100%
rename from utils/test/com/cloud/utils/DummyInterface.java
rename to utils/src/test/java/com/cloud/utils/DummyInterface.java
diff --git a/utils/test/com/cloud/utils/DummyPremiumImpl.java b/utils/src/test/java/com/cloud/utils/DummyPremiumImpl.java
similarity index 100%
rename from utils/test/com/cloud/utils/DummyPremiumImpl.java
rename to utils/src/test/java/com/cloud/utils/DummyPremiumImpl.java
diff --git a/utils/test/com/cloud/utils/HttpUtilsTest.java b/utils/src/test/java/com/cloud/utils/HttpUtilsTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/HttpUtilsTest.java
rename to utils/src/test/java/com/cloud/utils/HttpUtilsTest.java
diff --git a/utils/test/com/cloud/utils/NumbersUtilTest.java b/utils/src/test/java/com/cloud/utils/NumbersUtilTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/NumbersUtilTest.java
rename to utils/src/test/java/com/cloud/utils/NumbersUtilTest.java
diff --git a/utils/test/com/cloud/utils/PasswordGeneratorTest.java b/utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/PasswordGeneratorTest.java
rename to utils/src/test/java/com/cloud/utils/PasswordGeneratorTest.java
diff --git a/utils/test/com/cloud/utils/ProcessUtilTest.java b/utils/src/test/java/com/cloud/utils/ProcessUtilTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/ProcessUtilTest.java
rename to utils/src/test/java/com/cloud/utils/ProcessUtilTest.java
diff --git a/utils/test/com/cloud/utils/PropertiesUtilsTest.java b/utils/src/test/java/com/cloud/utils/PropertiesUtilsTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/PropertiesUtilsTest.java
rename to utils/src/test/java/com/cloud/utils/PropertiesUtilsTest.java
diff --git a/utils/test/com/cloud/utils/ReflectUtilTest.java b/utils/src/test/java/com/cloud/utils/ReflectUtilTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/ReflectUtilTest.java
rename to utils/src/test/java/com/cloud/utils/ReflectUtilTest.java
diff --git a/utils/test/com/cloud/utils/ScriptTest.java b/utils/src/test/java/com/cloud/utils/ScriptTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/ScriptTest.java
rename to utils/src/test/java/com/cloud/utils/ScriptTest.java
diff --git a/utils/test/com/cloud/utils/StringUtilsTest.java b/utils/src/test/java/com/cloud/utils/StringUtilsTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/StringUtilsTest.java
rename to utils/src/test/java/com/cloud/utils/StringUtilsTest.java
diff --git a/utils/test/com/cloud/utils/TernaryTest.java b/utils/src/test/java/com/cloud/utils/TernaryTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/TernaryTest.java
rename to utils/src/test/java/com/cloud/utils/TernaryTest.java
diff --git a/utils/test/com/cloud/utils/TestProfiler.java b/utils/src/test/java/com/cloud/utils/TestProfiler.java
similarity index 100%
rename from utils/test/com/cloud/utils/TestProfiler.java
rename to utils/src/test/java/com/cloud/utils/TestProfiler.java
diff --git a/utils/test/com/cloud/utils/UriUtilsTest.java b/utils/src/test/java/com/cloud/utils/UriUtilsTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/UriUtilsTest.java
rename to utils/src/test/java/com/cloud/utils/UriUtilsTest.java
diff --git a/utils/test/com/cloud/utils/UuidUtilsTest.java b/utils/src/test/java/com/cloud/utils/UuidUtilsTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/UuidUtilsTest.java
rename to utils/src/test/java/com/cloud/utils/UuidUtilsTest.java
diff --git a/utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java b/utils/src/test/java/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
rename to utils/src/test/java/com/cloud/utils/backoff/impl/ConstantTimeBackoffTest.java
diff --git a/utils/test/com/cloud/utils/crypto/EncryptionSecretKeyCheckerTest.java b/utils/src/test/java/com/cloud/utils/crypto/EncryptionSecretKeyCheckerTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/crypto/EncryptionSecretKeyCheckerTest.java
rename to utils/src/test/java/com/cloud/utils/crypto/EncryptionSecretKeyCheckerTest.java
diff --git a/utils/test/com/cloud/utils/crypto/RSAHelperTest.java b/utils/src/test/java/com/cloud/utils/crypto/RSAHelperTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/crypto/RSAHelperTest.java
rename to utils/src/test/java/com/cloud/utils/crypto/RSAHelperTest.java
diff --git a/utils/test/com/cloud/utils/encoding/UrlEncoderTest.java b/utils/src/test/java/com/cloud/utils/encoding/UrlEncoderTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/encoding/UrlEncoderTest.java
rename to utils/src/test/java/com/cloud/utils/encoding/UrlEncoderTest.java
diff --git a/utils/test/com/cloud/utils/exception/ExceptionUtilTest.java b/utils/src/test/java/com/cloud/utils/exception/ExceptionUtilTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/exception/ExceptionUtilTest.java
rename to utils/src/test/java/com/cloud/utils/exception/ExceptionUtilTest.java
diff --git a/utils/test/com/cloud/utils/net/Ip4AddressTest.java b/utils/src/test/java/com/cloud/utils/net/Ip4AddressTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/net/Ip4AddressTest.java
rename to utils/src/test/java/com/cloud/utils/net/Ip4AddressTest.java
diff --git a/utils/test/com/cloud/utils/net/IpTest.java b/utils/src/test/java/com/cloud/utils/net/IpTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/net/IpTest.java
rename to utils/src/test/java/com/cloud/utils/net/IpTest.java
diff --git a/utils/test/com/cloud/utils/net/MacAddressTest.java b/utils/src/test/java/com/cloud/utils/net/MacAddressTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/net/MacAddressTest.java
rename to utils/src/test/java/com/cloud/utils/net/MacAddressTest.java
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/net/NetUtilsTest.java
rename to utils/src/test/java/com/cloud/utils/net/NetUtilsTest.java
diff --git a/utils/test/com/cloud/utils/rest/RESTServiceConnectorTest.java b/utils/src/test/java/com/cloud/utils/rest/RESTServiceConnectorTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/rest/RESTServiceConnectorTest.java
rename to utils/src/test/java/com/cloud/utils/rest/RESTServiceConnectorTest.java
diff --git a/utils/test/com/cloud/utils/ssh/SSHKeysHelperTest.java b/utils/src/test/java/com/cloud/utils/ssh/SSHKeysHelperTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/ssh/SSHKeysHelperTest.java
rename to utils/src/test/java/com/cloud/utils/ssh/SSHKeysHelperTest.java
diff --git a/utils/test/com/cloud/utils/testcase/Log4jEnabledTestCase.java b/utils/src/test/java/com/cloud/utils/testcase/Log4jEnabledTestCase.java
similarity index 100%
rename from utils/test/com/cloud/utils/testcase/Log4jEnabledTestCase.java
rename to utils/src/test/java/com/cloud/utils/testcase/Log4jEnabledTestCase.java
diff --git a/utils/test/com/cloud/utils/testcase/NioTest.java b/utils/src/test/java/com/cloud/utils/testcase/NioTest.java
similarity index 100%
rename from utils/test/com/cloud/utils/testcase/NioTest.java
rename to utils/src/test/java/com/cloud/utils/testcase/NioTest.java
diff --git a/utils/test/com/cloud/utils/xmlobject/TestXmlObject.java b/utils/src/test/java/com/cloud/utils/xmlobject/TestXmlObject.java
similarity index 100%
rename from utils/test/com/cloud/utils/xmlobject/TestXmlObject.java
rename to utils/src/test/java/com/cloud/utils/xmlobject/TestXmlObject.java
diff --git a/utils/test/com/cloud/utils/xmlobject/TestXmlObject2.java b/utils/src/test/java/com/cloud/utils/xmlobject/TestXmlObject2.java
similarity index 100%
rename from utils/test/com/cloud/utils/xmlobject/TestXmlObject2.java
rename to utils/src/test/java/com/cloud/utils/xmlobject/TestXmlObject2.java
diff --git a/utils/test/org/apache/cloudstack/utils/imagestore/ImageStoreUtilTest.java b/utils/src/test/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtilTest.java
similarity index 100%
rename from utils/test/org/apache/cloudstack/utils/imagestore/ImageStoreUtilTest.java
rename to utils/src/test/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtilTest.java
diff --git a/utils/test/resources/com/cloud/utils/QualifierTestContext.xml b/utils/src/test/resources/com/cloud/utils/QualifierTestContext.xml
similarity index 100%
rename from utils/test/resources/com/cloud/utils/QualifierTestContext.xml
rename to utils/src/test/resources/com/cloud/utils/QualifierTestContext.xml
diff --git a/utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml b/utils/src/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
similarity index 100%
rename from utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
rename to utils/src/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
diff --git a/utils/test/resources/log4j.xml b/utils/src/test/resources/log4j.xml
similarity index 100%
rename from utils/test/resources/log4j.xml
rename to utils/src/test/resources/log4j.xml
diff --git a/utils/test/resources/testContext.xml b/utils/src/test/resources/testContext.xml
similarity index 100%
rename from utils/test/resources/testContext.xml
rename to utils/src/test/resources/testContext.xml