diff --git a/core/src/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java b/core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java
similarity index 100%
rename from core/src/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java
rename to core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java
diff --git a/core/src/org/apache/cloudstack/agent/lb/SetupMSListCommand.java b/core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListCommand.java
similarity index 100%
rename from core/src/org/apache/cloudstack/agent/lb/SetupMSListCommand.java
rename to core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListCommand.java
diff --git a/framework/agent-lb/pom.xml b/framework/agent-lb/pom.xml
index 7d14a3a4a7e..8f16f2b085d 100644
--- a/framework/agent-lb/pom.xml
+++ b/framework/agent-lb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>cloudstack-framework</artifactId>
         <groupId>org.apache.cloudstack</groupId>
-        <version>4.11.1.0-SNAPSHOT</version>
+        <version>4.12.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLB.java b/framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLB.java
similarity index 100%
rename from framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLB.java
rename to framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLB.java
diff --git a/framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java b/framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java
similarity index 100%
rename from framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java
rename to framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java b/server/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java b/server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java b/server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java b/server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java