diff --git a/sandbox/activemq-gbean/project.xml b/sandbox/activemq-gbean/project.xml
index aa78bcefe0..ba1ded4347 100755
--- a/sandbox/activemq-gbean/project.xml
+++ b/sandbox/activemq-gbean/project.xml
@@ -23,7 +23,7 @@
     <dependencies>
     
       <dependency>
-        <groupId>activemq</groupId>
+        <groupId>${pom.groupId}</groupId>
         <artifactId>activemq-core</artifactId>
         <version>${pom.currentVersion}</version>
         <properties>
@@ -31,7 +31,7 @@
         </properties>
       </dependency>
       <dependency>
-        <groupId>activemq</groupId>
+        <groupId>${pom.groupId}</groupId>
         <artifactId>activemq-gbean-management</artifactId>
         <version>${pom.currentVersion}</version>
         <properties>
@@ -39,7 +39,7 @@
         </properties>
       </dependency>
       <dependency> <!-- Used for unit tests -->
-        <groupId>activemq</groupId>
+        <groupId>${pom.groupId}</groupId>
         <artifactId>activemq-core-test</artifactId>
         <version>${pom.currentVersion}</version>
       </dependency>
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/gbean/ActiveMQConnectorGBean.java b/sandbox/activemq-gbean/src/main/java/org/activemq/gbean/ActiveMQConnectorGBean.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/gbean/ActiveMQConnectorGBean.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/gbean/ActiveMQConnectorGBean.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/gbean/ActiveMQContainer.java b/sandbox/activemq-gbean/src/main/java/org/activemq/gbean/ActiveMQContainer.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/gbean/ActiveMQContainer.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/gbean/ActiveMQContainer.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/gbean/ActiveMQContainerGBean.java b/sandbox/activemq-gbean/src/main/java/org/activemq/gbean/ActiveMQContainerGBean.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/gbean/ActiveMQContainerGBean.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/gbean/ActiveMQContainerGBean.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/gbean/management/ActiveMQManagerGBean.java b/sandbox/activemq-gbean/src/main/java/org/activemq/gbean/management/ActiveMQManagerGBean.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/gbean/management/ActiveMQManagerGBean.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/gbean/management/ActiveMQManagerGBean.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/gbean/package.html b/sandbox/activemq-gbean/src/main/java/org/activemq/gbean/package.html
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/gbean/package.html
rename to sandbox/activemq-gbean/src/main/java/org/activemq/gbean/package.html
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/store/cache/SimpleCachePersistenceAdapterGBean.java b/sandbox/activemq-gbean/src/main/java/org/activemq/store/cache/SimpleCachePersistenceAdapterGBean.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/store/cache/SimpleCachePersistenceAdapterGBean.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/store/cache/SimpleCachePersistenceAdapterGBean.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/store/jdbc/JDBCPersistenceAdapterGBean.java b/sandbox/activemq-gbean/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapterGBean.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/store/jdbc/JDBCPersistenceAdapterGBean.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapterGBean.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/store/jdbc/ResourceManager.java b/sandbox/activemq-gbean/src/main/java/org/activemq/store/jdbc/ResourceManager.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/store/jdbc/ResourceManager.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/store/jdbc/ResourceManager.java
diff --git a/sandbox/activemq-gbean/src/java/org/activemq/store/journal/JournalPersistenceAdapterGBean.java b/sandbox/activemq-gbean/src/main/java/org/activemq/store/journal/JournalPersistenceAdapterGBean.java
similarity index 100%
rename from sandbox/activemq-gbean/src/java/org/activemq/store/journal/JournalPersistenceAdapterGBean.java
rename to sandbox/activemq-gbean/src/main/java/org/activemq/store/journal/JournalPersistenceAdapterGBean.java
diff --git a/sandbox/activemq-gbean/src/test/org/activemq/gbean/ConnectorTest.java b/sandbox/activemq-gbean/src/test/java/org/activemq/gbean/ConnectorTest.java
similarity index 100%
rename from sandbox/activemq-gbean/src/test/org/activemq/gbean/ConnectorTest.java
rename to sandbox/activemq-gbean/src/test/java/org/activemq/gbean/ConnectorTest.java