diff --git a/src/main/java/io/mifos/dev/ApplicationBuilder.java b/src/main/java/org/apache/fineract/cn/dev/ApplicationBuilder.java
similarity index 96%
rename from src/main/java/io/mifos/dev/ApplicationBuilder.java
rename to src/main/java/org/apache/fineract/cn/dev/ApplicationBuilder.java
index 5bf65ee..aa8570b 100644
--- a/src/main/java/io/mifos/dev/ApplicationBuilder.java
+++ b/src/main/java/org/apache/fineract/cn/dev/ApplicationBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev;
+package org.apache.fineract.cn.dev;
 
 import org.apache.fineract.cn.provisioner.api.v1.domain.Application;
 
diff --git a/src/main/java/io/mifos/dev/DemoServer.java b/src/main/java/org/apache/fineract/cn/dev/DemoServer.java
similarity index 90%
rename from src/main/java/io/mifos/dev/DemoServer.java
rename to src/main/java/org/apache/fineract/cn/dev/DemoServer.java
index a322493..ba5d4de 100644
--- a/src/main/java/io/mifos/dev/DemoServer.java
+++ b/src/main/java/org/apache/fineract/cn/dev/DemoServer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev;
+package org.apache.fineract.cn.dev;
 
 import org.junit.runner.JUnitCore;
 
@@ -27,6 +27,6 @@
   }
 
   public static void main(String[] args) {
-    JUnitCore.main("io.mifos.dev.ServiceRunner");
+    JUnitCore.main("org.apache.fineract.cn.dev.ServiceRunner");
   }
 }
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
similarity index 99%
rename from src/main/java/io/mifos/dev/ServiceRunner.java
rename to src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
index 1ae7709..8995a2b 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/org/apache/fineract/cn/dev/ServiceRunner.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev;
+package org.apache.fineract.cn.dev;
 
 import ch.vorburger.mariadb4j.DB;
 import ch.vorburger.mariadb4j.DBConfigurationBuilder;
@@ -121,7 +121,7 @@
   @ActiveMQForTest.EnableActiveMQListen
   @EnableApiFactory
   @EnableEventRecording(maxWait = 60_000)
-  @ComponentScan("io.mifos.dev.listener")
+  @ComponentScan("org.apache.fineract.cn.dev.listener")
   public static class TestConfiguration {
     public TestConfiguration() {
       super();
diff --git a/src/main/java/io/mifos/dev/TenantBuilder.java b/src/main/java/org/apache/fineract/cn/dev/TenantBuilder.java
similarity index 98%
rename from src/main/java/io/mifos/dev/TenantBuilder.java
rename to src/main/java/org/apache/fineract/cn/dev/TenantBuilder.java
index b6a2351..a934053 100644
--- a/src/main/java/io/mifos/dev/TenantBuilder.java
+++ b/src/main/java/org/apache/fineract/cn/dev/TenantBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev;
+package org.apache.fineract.cn.dev;
 
 import org.apache.fineract.cn.cassandra.util.CassandraConnectorConstants;
 import org.apache.fineract.cn.mariadb.util.MariaDBConstants;
diff --git a/src/main/java/io/mifos/dev/listener/AccountingListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/AccountingListener.java
similarity index 98%
rename from src/main/java/io/mifos/dev/listener/AccountingListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/AccountingListener.java
index 20c698a..8a8b7ba 100644
--- a/src/main/java/io/mifos/dev/listener/AccountingListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/AccountingListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.accounting.api.v1.EventConstants;
 import org.apache.fineract.cn.test.listener.EventRecorder;
diff --git a/src/main/java/io/mifos/dev/listener/ChequesListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/ChequesListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/ChequesListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/ChequesListener.java
index 773d35c..afada30 100644
--- a/src/main/java/io/mifos/dev/listener/ChequesListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/ChequesListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.cheque.api.v1.EventConstants;
 import org.apache.fineract.cn.test.listener.EventRecorder;
diff --git a/src/main/java/io/mifos/dev/listener/CustomerListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/CustomerListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/CustomerListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/CustomerListener.java
index 1129bae..a5c731d 100644
--- a/src/main/java/io/mifos/dev/listener/CustomerListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/CustomerListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.customer.api.v1.CustomerEventConstants;
diff --git a/src/main/java/io/mifos/dev/listener/DepositAccountManagementListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/DepositAccountManagementListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/DepositAccountManagementListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/DepositAccountManagementListener.java
index 249037a..0ae155b 100644
--- a/src/main/java/io/mifos/dev/listener/DepositAccountManagementListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/DepositAccountManagementListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.deposit.api.v1.EventConstants;
diff --git a/src/main/java/io/mifos/dev/listener/GroupListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/GroupListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/GroupListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/GroupListener.java
index 18516bd..92ead56 100644
--- a/src/main/java/io/mifos/dev/listener/GroupListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/GroupListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.group.api.v1.EventConstants;
 import org.apache.fineract.cn.test.listener.EventRecorder;
diff --git a/src/main/java/io/mifos/dev/listener/IdentityListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/IdentityListener.java
similarity index 98%
rename from src/main/java/io/mifos/dev/listener/IdentityListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/IdentityListener.java
index f170453..793038e 100644
--- a/src/main/java/io/mifos/dev/listener/IdentityListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/IdentityListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.identity.api.v1.events.ApplicationPermissionEvent;
diff --git a/src/main/java/io/mifos/dev/listener/OrganizationListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/OrganizationListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/OrganizationListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/OrganizationListener.java
index 174e03a..e760627 100644
--- a/src/main/java/io/mifos/dev/listener/OrganizationListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/OrganizationListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.office.api.v1.EventConstants;
diff --git a/src/main/java/io/mifos/dev/listener/PayrollListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/PayrollListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/PayrollListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/PayrollListener.java
index 5f24372..32c2601 100644
--- a/src/main/java/io/mifos/dev/listener/PayrollListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/PayrollListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.payroll.api.v1.EventConstants;
diff --git a/src/main/java/io/mifos/dev/listener/PortfolioListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/PortfolioListener.java
similarity index 98%
rename from src/main/java/io/mifos/dev/listener/PortfolioListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/PortfolioListener.java
index bdf5e73..673c435 100644
--- a/src/main/java/io/mifos/dev/listener/PortfolioListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/PortfolioListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.portfolio.api.v1.events.EventConstants;
diff --git a/src/main/java/io/mifos/dev/listener/ReportingListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/ReportingListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/ReportingListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/ReportingListener.java
index 5891eab..f74454a 100644
--- a/src/main/java/io/mifos/dev/listener/ReportingListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/ReportingListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.reporting.api.v1.EventConstants;
diff --git a/src/main/java/io/mifos/dev/listener/RhythmListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/RhythmListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/RhythmListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/RhythmListener.java
index 35a4541..9dacb88 100644
--- a/src/main/java/io/mifos/dev/listener/RhythmListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/RhythmListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.rhythm.api.v1.events.BeatEvent;
diff --git a/src/main/java/io/mifos/dev/listener/TellerListener.java b/src/main/java/org/apache/fineract/cn/dev/listener/TellerListener.java
similarity index 97%
rename from src/main/java/io/mifos/dev/listener/TellerListener.java
rename to src/main/java/org/apache/fineract/cn/dev/listener/TellerListener.java
index 274d1d8..e236318 100644
--- a/src/main/java/io/mifos/dev/listener/TellerListener.java
+++ b/src/main/java/org/apache/fineract/cn/dev/listener/TellerListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.dev.listener;
+package org.apache.fineract.cn.dev.listener;
 
 import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.apache.fineract.cn.teller.api.v1.EventConstants;