myrle-krantz closed pull request #5: Updating package names.
URL: https://github.com/apache/fineract-cn-rhythm/pull/5
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/README.md b/README.md
index 4403160..74b868a 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # Apache Fineract CN Rhythm
 
-[![Join the chat at 
https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-This project provides a heart beatPublish for other microservices which need 
to start jobs to be executed once and only once at a defined time.
+This project provides a heart beatPublish for other services which need to 
start jobs to be executed once and only once at a defined time.
 
 ## Abstract
 Apache Fineract CN is an application framework for digital financial services, 
a system to support nationwide and cross-national financial transactions and 
help to level and speed the creation of an inclusive, interconnected digital 
economy for every nation in the world.
diff --git a/api/src/main/java/io/mifos/rhythm/api/v1/client/RhythmManager.java 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
similarity index 93%
rename from api/src/main/java/io/mifos/rhythm/api/v1/client/RhythmManager.java
rename to 
api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
index 13b2bbb..cf2218a 100644
--- a/api/src/main/java/io/mifos/rhythm/api/v1/client/RhythmManager.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/client/RhythmManager.java
@@ -16,19 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.client;
+package org.apache.fineract.cn.rhythm.api.v1.client;
 
-import io.mifos.core.api.util.CustomFeignClientsConfiguration;
-import io.mifos.rhythm.api.v1.domain.Beat;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import java.util.List;
+import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import java.util.List;
-
 /**
  * @author Myrle Krantz
  */
diff --git a/api/src/main/java/io/mifos/rhythm/api/v1/domain/Beat.java 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/domain/Beat.java
similarity index 95%
rename from api/src/main/java/io/mifos/rhythm/api/v1/domain/Beat.java
rename to 
api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/domain/Beat.java
index 46339fa..1290fd2 100644
--- a/api/src/main/java/io/mifos/rhythm/api/v1/domain/Beat.java
+++ b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/domain/Beat.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.domain;
+package org.apache.fineract.cn.rhythm.api.v1.domain;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 import org.hibernate.validator.constraints.Range;
 
 /**
diff --git a/api/src/main/java/io/mifos/rhythm/api/v1/domain/ClockOffset.java 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/domain/ClockOffset.java
similarity index 97%
rename from api/src/main/java/io/mifos/rhythm/api/v1/domain/ClockOffset.java
rename to 
api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/domain/ClockOffset.java
index c597b53..ebcb29c 100644
--- a/api/src/main/java/io/mifos/rhythm/api/v1/domain/ClockOffset.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/domain/ClockOffset.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.domain;
+package org.apache.fineract.cn.rhythm.api.v1.domain;
 
 import org.hibernate.validator.constraints.Range;
 
diff --git a/api/src/main/java/io/mifos/rhythm/api/v1/events/BeatEvent.java 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/events/BeatEvent.java
similarity index 97%
rename from api/src/main/java/io/mifos/rhythm/api/v1/events/BeatEvent.java
rename to 
api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/events/BeatEvent.java
index bec851a..6a3905b 100644
--- a/api/src/main/java/io/mifos/rhythm/api/v1/events/BeatEvent.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/events/BeatEvent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.events;
+package org.apache.fineract.cn.rhythm.api.v1.events;
 
 import java.util.Objects;
 
diff --git 
a/api/src/main/java/io/mifos/rhythm/api/v1/events/EventConstants.java 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/events/EventConstants.java
similarity index 96%
rename from api/src/main/java/io/mifos/rhythm/api/v1/events/EventConstants.java
rename to 
api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/events/EventConstants.java
index 4a1cf0d..a65835c 100644
--- a/api/src/main/java/io/mifos/rhythm/api/v1/events/EventConstants.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/rhythm/api/v1/events/EventConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.events;
+package org.apache.fineract.cn.rhythm.api.v1.events;
 
 /**
  * @author Myrle Krantz
diff --git a/api/src/test/java/io/mifos/rhythm/api/v1/domain/BeatTest.java 
b/api/src/test/java/org/apache/fineract/cn/rhythm/api/v1/domain/BeatTest.java
similarity index 90%
rename from api/src/test/java/io/mifos/rhythm/api/v1/domain/BeatTest.java
rename to 
api/src/test/java/org/apache/fineract/cn/rhythm/api/v1/domain/BeatTest.java
index b24e475..2a6cb52 100644
--- a/api/src/test/java/io/mifos/rhythm/api/v1/domain/BeatTest.java
+++ 
b/api/src/test/java/org/apache/fineract/cn/rhythm/api/v1/domain/BeatTest.java
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.domain;
-
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
+package org.apache.fineract.cn.rhythm.api.v1.domain;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
 
 /**
  * @author Myrle Krantz
diff --git 
a/api/src/test/java/io/mifos/rhythm/api/v1/domain/ClockOffsetTest.java 
b/api/src/test/java/org/apache/fineract/cn/rhythm/api/v1/domain/ClockOffsetTest.java
similarity index 93%
rename from api/src/test/java/io/mifos/rhythm/api/v1/domain/ClockOffsetTest.java
rename to 
api/src/test/java/org/apache/fineract/cn/rhythm/api/v1/domain/ClockOffsetTest.java
index a3f928b..d080bec 100644
--- a/api/src/test/java/io/mifos/rhythm/api/v1/domain/ClockOffsetTest.java
+++ 
b/api/src/test/java/org/apache/fineract/cn/rhythm/api/v1/domain/ClockOffsetTest.java
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.api.v1.domain;
-
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
+package org.apache.fineract.cn.rhythm.api.v1.domain;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
 
 /**
  * @author Myrle Krantz
diff --git 
a/component-test/src/main/java/io/mifos/rhythm/AbstractRhythmTest.java 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
similarity index 85%
rename from component-test/src/main/java/io/mifos/rhythm/AbstractRhythmTest.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
index cc6d3c9..370e7e5 100644
--- a/component-test/src/main/java/io/mifos/rhythm/AbstractRhythmTest.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/AbstractRhythmTest.java
@@ -16,25 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm;
-
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.TenantDataStoreContextTestRule;
-import io.mifos.core.test.fixture.cassandra.CassandraInitializer;
-import io.mifos.core.test.fixture.mariadb.MariaDBInitializer;
-import io.mifos.core.test.listener.EnableEventRecording;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.rhythm.api.v1.client.RhythmManager;
-import io.mifos.rhythm.api.v1.domain.Beat;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.api.v1.events.BeatEvent;
-import io.mifos.rhythm.api.v1.events.EventConstants;
-import io.mifos.rhythm.service.config.RhythmConfiguration;
-import io.mifos.rhythm.service.internal.service.BeatPublisherService;
-import io.mifos.rhythm.spi.v1.PermittableGroupIds;
-import org.junit.*;
+package org.apache.fineract.cn.rhythm;
+
+import java.security.interfaces.RSAPrivateKey;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import 
org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.rhythm.api.v1.client.RhythmManager;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.events.BeatEvent;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.service.config.RhythmConfiguration;
+import 
org.apache.fineract.cn.rhythm.service.internal.service.BeatPublisherService;
+import org.apache.fineract.cn.rhythm.spi.v1.PermittableGroupIds;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule;
+import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer;
+import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer;
+import org.apache.fineract.cn.test.listener.EnableEventRecording;
+import org.apache.fineract.cn.test.listener.EventRecorder;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
@@ -58,13 +68,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.security.interfaces.RSAPrivateKey;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Myrle Krantz
  */
@@ -81,10 +84,10 @@
 
   @Configuration
   @EnableEventRecording
-  @EnableFeignClients(basePackages = {"io.mifos.rhythm.api.v1.client"})
+  @EnableFeignClients(basePackages = 
{"org.apache.fineract.cn.rhythm.api.v1.client"})
   @RibbonClient(name = APP_NAME)
   @Import({RhythmConfiguration.class})
-  @ComponentScan("io.mifos.rhythm.listener")
+  @ComponentScan("org.apache.fineract.cn.rhythm.listener")
   public static class TestConfiguration {
     public TestConfiguration() {
       super();
diff --git a/component-test/src/main/java/io/mifos/rhythm/TestBeats.java 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/TestBeats.java
similarity index 94%
rename from component-test/src/main/java/io/mifos/rhythm/TestBeats.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/rhythm/TestBeats.java
index 37e9ede..d1582ce 100644
--- a/component-test/src/main/java/io/mifos/rhythm/TestBeats.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/rhythm/TestBeats.java
@@ -16,23 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm;
-
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.rhythm.api.v1.domain.Beat;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.api.v1.events.BeatEvent;
-import io.mifos.rhythm.api.v1.events.EventConstants;
-import io.mifos.rhythm.service.internal.repository.BeatEntity;
-import io.mifos.rhythm.service.internal.repository.BeatRepository;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-import org.mockito.internal.stubbing.answers.Returns;
-import org.springframework.beans.factory.annotation.Autowired;
+package org.apache.fineract.cn.rhythm;
 
-import javax.transaction.Transactional;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -41,6 +26,20 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import javax.transaction.Transactional;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.events.BeatEvent;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.service.internal.repository.BeatEntity;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.BeatRepository;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.mockito.internal.stubbing.answers.Returns;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Myrle Krantz
diff --git 
a/component-test/src/main/java/io/mifos/rhythm/listener/ApplicationEventListener.java
 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/ApplicationEventListener.java
similarity index 88%
rename from 
component-test/src/main/java/io/mifos/rhythm/listener/ApplicationEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/ApplicationEventListener.java
index 8e92a34..104ca4e 100644
--- 
a/component-test/src/main/java/io/mifos/rhythm/listener/ApplicationEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/ApplicationEventListener.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.listener;
+package org.apache.fineract.cn.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;
diff --git 
a/component-test/src/main/java/io/mifos/rhythm/listener/BeatEventListener.java 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/BeatEventListener.java
similarity index 88%
rename from 
component-test/src/main/java/io/mifos/rhythm/listener/BeatEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/BeatEventListener.java
index 1988cf6..b0a3bfc 100644
--- 
a/component-test/src/main/java/io/mifos/rhythm/listener/BeatEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/BeatEventListener.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.listener;
+package org.apache.fineract.cn.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.rhythm.api.v1.events.BeatEvent;
-import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.api.v1.events.BeatEvent;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;
diff --git 
a/component-test/src/main/java/io/mifos/rhythm/listener/ClockOffsetEventListener.java
 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/ClockOffsetEventListener.java
similarity index 85%
rename from 
component-test/src/main/java/io/mifos/rhythm/listener/ClockOffsetEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/ClockOffsetEventListener.java
index 77b3ac1..927efd9 100644
--- 
a/component-test/src/main/java/io/mifos/rhythm/listener/ClockOffsetEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/ClockOffsetEventListener.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.listener;
+package org.apache.fineract.cn.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;
diff --git 
a/component-test/src/main/java/io/mifos/rhythm/listener/MigrationEventListener.java
 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/MigrationEventListener.java
similarity index 88%
rename from 
component-test/src/main/java/io/mifos/rhythm/listener/MigrationEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/MigrationEventListener.java
index 1009d46..d0e4fce 100644
--- 
a/component-test/src/main/java/io/mifos/rhythm/listener/MigrationEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/rhythm/listener/MigrationEventListener.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.listener;
+package org.apache.fineract.cn.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;
diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index 400f155..eadb743 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and 
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 2888922..0378e08 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Fri Mar 17 17:54:20 CET 2017
+#Fri Apr 13 17:03:25 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/RhythmApplication.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/RhythmApplication.java
similarity index 90%
rename from service/src/main/java/io/mifos/rhythm/service/RhythmApplication.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/RhythmApplication.java
index c40388c..2060633 100644
--- a/service/src/main/java/io/mifos/rhythm/service/RhythmApplication.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/RhythmApplication.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service;
+package org.apache.fineract.cn.rhythm.service;
 
-import io.mifos.rhythm.service.config.RhythmConfiguration;
+import org.apache.fineract.cn.rhythm.service.config.RhythmConfiguration;
 import org.springframework.boot.SpringApplication;
 
 /**
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/ServiceConstants.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/ServiceConstants.java
similarity index 95%
rename from service/src/main/java/io/mifos/rhythm/service/ServiceConstants.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/ServiceConstants.java
index a90c64e..48bd4f4 100644
--- a/service/src/main/java/io/mifos/rhythm/service/ServiceConstants.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/ServiceConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service;
+package org.apache.fineract.cn.rhythm.service;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/config/RhythmConfiguration.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmConfiguration.java
similarity index 67%
rename from 
service/src/main/java/io/mifos/rhythm/service/config/RhythmConfiguration.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmConfiguration.java
index 7dd6be7..7e2e514 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/config/RhythmConfiguration.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmConfiguration.java
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.config;
+package org.apache.fineract.cn.rhythm.service.config;
 
-import io.mifos.anubis.config.EnableAnubis;
-import io.mifos.core.api.config.EnableApiFactory;
-import io.mifos.core.async.config.EnableAsync;
-import io.mifos.core.cassandra.config.EnableCassandra;
-import io.mifos.core.command.config.EnableCommandProcessing;
-import io.mifos.core.lang.config.EnableApplicationName;
-import io.mifos.core.lang.config.EnableServiceException;
-import io.mifos.core.lang.config.EnableTenantContext;
-import io.mifos.core.mariadb.config.EnableMariaDB;
-import 
io.mifos.permittedfeignclient.config.EnablePermissionRequestingFeignClient;
-import io.mifos.rhythm.service.ServiceConstants;
-import 
io.mifos.rhythm.service.internal.identity.ApplicationPermissionRequestCreator;
+import org.apache.fineract.cn.anubis.config.EnableAnubis;
+import org.apache.fineract.cn.api.config.EnableApiFactory;
+import org.apache.fineract.cn.async.config.EnableAsync;
+import org.apache.fineract.cn.cassandra.config.EnableCassandra;
+import org.apache.fineract.cn.command.config.EnableCommandProcessing;
+import org.apache.fineract.cn.lang.config.EnableApplicationName;
+import org.apache.fineract.cn.lang.config.EnableServiceException;
+import org.apache.fineract.cn.lang.config.EnableTenantContext;
+import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
+import 
org.apache.fineract.cn.permittedfeignclient.config.EnablePermissionRequestingFeignClient;
+import org.apache.fineract.cn.rhythm.service.ServiceConstants;
+import 
org.apache.fineract.cn.rhythm.service.internal.identity.ApplicationPermissionRequestCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -65,14 +65,14 @@
 @EnableApplicationName
 @EnableFeignClients(clients = {ApplicationPermissionRequestCreator.class})
 @ComponentScan({
-    "io.mifos.rhythm.service.rest",
-    "io.mifos.rhythm.service.config",
-    "io.mifos.rhythm.service.internal.service",
-    "io.mifos.rhythm.service.internal.repository",
-    "io.mifos.rhythm.service.internal.command.handler"
+    "org.apache.fineract.cn.rhythm.service.rest",
+    "org.apache.fineract.cn.rhythm.service.config",
+    "org.apache.fineract.cn.rhythm.service.internal.service",
+    "org.apache.fineract.cn.rhythm.service.internal.repository",
+    "org.apache.fineract.cn.rhythm.service.internal.command.handler"
 })
 @EnableJpaRepositories({
-    "io.mifos.rhythm.service.internal.repository"
+    "org.apache.fineract.cn.rhythm.service.internal.repository"
 })
 public class RhythmConfiguration extends WebMvcConfigurerAdapter {
 
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/config/RhythmProperties.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmProperties.java
similarity index 92%
rename from 
service/src/main/java/io/mifos/rhythm/service/config/RhythmProperties.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmProperties.java
index e558a66..b8038ad 100644
--- a/service/src/main/java/io/mifos/rhythm/service/config/RhythmProperties.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/config/RhythmProperties.java
@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.config;
+package org.apache.fineract.cn.rhythm.service.config;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import java.util.concurrent.TimeUnit;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Myrle Krantz
  */
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/ChangeClockOffsetCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/ChangeClockOffsetCommand.java
similarity index 91%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/ChangeClockOffsetCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/ChangeClockOffsetCommand.java
index a81850c..2e727cc 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/ChangeClockOffsetCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/ChangeClockOffsetCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command;
+package org.apache.fineract.cn.rhythm.service.internal.command;
 
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/CreateBeatCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/CreateBeatCommand.java
similarity index 93%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/CreateBeatCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/CreateBeatCommand.java
index ddecce5..caa28ab 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/CreateBeatCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/CreateBeatCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command;
+package org.apache.fineract.cn.rhythm.service.internal.command;
 
-import io.mifos.rhythm.api.v1.domain.Beat;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/DeleteApplicationCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/DeleteApplicationCommand.java
similarity index 96%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/DeleteApplicationCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/DeleteApplicationCommand.java
index b84d37f..e569f86 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/DeleteApplicationCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/DeleteApplicationCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command;
+package org.apache.fineract.cn.rhythm.service.internal.command;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/DeleteBeatCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/DeleteBeatCommand.java
similarity index 96%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/DeleteBeatCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/DeleteBeatCommand.java
index a191e41..9b88cee 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/DeleteBeatCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/DeleteBeatCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command;
+package org.apache.fineract.cn.rhythm.service.internal.command;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/InitializeServiceCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/InitializeServiceCommand.java
similarity index 94%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/InitializeServiceCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/InitializeServiceCommand.java
index f4e45e7..41ecd76 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/InitializeServiceCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/InitializeServiceCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command;
+package org.apache.fineract.cn.rhythm.service.internal.command;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ApplicationCommandHandler.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/ApplicationCommandHandler.java
similarity index 79%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ApplicationCommandHandler.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/ApplicationCommandHandler.java
index e7a19aa..a4a6dfe 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ApplicationCommandHandler.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/ApplicationCommandHandler.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command.handler;
+package org.apache.fineract.cn.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.rhythm.api.v1.events.EventConstants;
-import io.mifos.rhythm.service.internal.command.DeleteApplicationCommand;
-import io.mifos.rhythm.service.internal.repository.ApplicationRepository;
-import io.mifos.rhythm.service.internal.repository.BeatRepository;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.DeleteApplicationCommand;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ApplicationRepository;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.BeatRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/BeatCommandHandler.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/BeatCommandHandler.java
similarity index 79%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/handler/BeatCommandHandler.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/BeatCommandHandler.java
index f5ce4db..a05c061 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/BeatCommandHandler.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/BeatCommandHandler.java
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command.handler;
+package org.apache.fineract.cn.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.api.v1.events.BeatEvent;
-import io.mifos.rhythm.api.v1.events.EventConstants;
-import io.mifos.rhythm.service.ServiceConstants;
-import io.mifos.rhythm.service.internal.command.CreateBeatCommand;
-import io.mifos.rhythm.service.internal.command.DeleteBeatCommand;
-import io.mifos.rhythm.service.internal.mapper.BeatMapper;
-import io.mifos.rhythm.service.internal.repository.BeatEntity;
-import io.mifos.rhythm.service.internal.repository.BeatRepository;
-import io.mifos.rhythm.service.internal.service.ClockOffsetService;
-import 
io.mifos.rhythm.service.internal.service.IdentityPermittableGroupService;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.events.BeatEvent;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.service.ServiceConstants;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.CreateBeatCommand;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.DeleteBeatCommand;
+import org.apache.fineract.cn.rhythm.service.internal.mapper.BeatMapper;
+import org.apache.fineract.cn.rhythm.service.internal.repository.BeatEntity;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.BeatRepository;
+import 
org.apache.fineract.cn.rhythm.service.internal.service.ClockOffsetService;
+import 
org.apache.fineract.cn.rhythm.service.internal.service.IdentityPermittableGroupService;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java
similarity index 77%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java
index e8c14c9..1f86980 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java
@@ -16,25 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command.handler;
+package org.apache.fineract.cn.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.rhythm.api.v1.events.EventConstants;
-import io.mifos.rhythm.service.ServiceConstants;
-import io.mifos.rhythm.service.internal.command.ChangeClockOffsetCommand;
-import io.mifos.rhythm.service.internal.mapper.ClockOffsetMapper;
-import io.mifos.rhythm.service.internal.repository.ClockOffsetEntity;
-import io.mifos.rhythm.service.internal.repository.ClockOffsetRepository;
-import io.mifos.rhythm.service.internal.service.Drummer;
+import java.util.Optional;
+import javax.transaction.Transactional;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.service.ServiceConstants;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.ChangeClockOffsetCommand;
+import org.apache.fineract.cn.rhythm.service.internal.mapper.ClockOffsetMapper;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ClockOffsetEntity;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ClockOffsetRepository;
+import org.apache.fineract.cn.rhythm.service.internal.service.Drummer;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-import javax.transaction.Transactional;
-import java.util.Optional;
-
 /**
  * @author Myrle Krantz
  */
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/EventHelper.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/EventHelper.java
similarity index 87%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/handler/EventHelper.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/EventHelper.java
index a1eb3c9..8201809 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/EventHelper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/EventHelper.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command.handler;
+package org.apache.fineract.cn.rhythm.service.internal.command.handler;
 
 import com.google.gson.Gson;
-import io.mifos.core.command.util.CommandConstants;
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.command.util.CommandConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Component;
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/InitializeCommandHandler.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/InitializeCommandHandler.java
similarity index 77%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/command/handler/InitializeCommandHandler.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/InitializeCommandHandler.java
index 39b094e..1bea5c6 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/command/handler/InitializeCommandHandler.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/command/handler/InitializeCommandHandler.java
@@ -16,20 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.command.handler;
+package org.apache.fineract.cn.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.mariadb.domain.FlywayFactoryBean;
-import io.mifos.rhythm.api.v1.events.EventConstants;
-import io.mifos.rhythm.service.internal.command.InitializeServiceCommand;
+import javax.sql.DataSource;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
+import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean;
+import org.apache.fineract.cn.rhythm.api.v1.events.EventConstants;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.InitializeServiceCommand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.sql.DataSource;
-
 /**
  * @author Myrle Krantz
  */
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
similarity index 75%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
index 07847f2..3791e98 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.identity;
+package org.apache.fineract.cn.rhythm.service.internal.identity;
 
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.api.annotation.ThrowsException;
-import 
io.mifos.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
-import io.mifos.identity.api.v1.domain.Permission;
-import io.mifos.permittedfeignclient.annotation.EndpointSet;
-import 
io.mifos.permittedfeignclient.annotation.PermittedFeignClientsConfiguration;
+import javax.validation.Valid;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
+import 
org.apache.fineract.cn.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.domain.Permission;
+import org.apache.fineract.cn.permittedfeignclient.annotation.EndpointSet;
+import 
org.apache.fineract.cn.permittedfeignclient.annotation.PermittedFeignClientsConfiguration;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -32,8 +33,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.validation.Valid;
-
 /**
  * @author Myrle Krantz
  */
@@ -45,7 +44,7 @@
           consumes = {MediaType.APPLICATION_JSON_VALUE},
           produces = {MediaType.ALL_VALUE})
   @ThrowsException(status = HttpStatus.CONFLICT, exception = 
ApplicationPermissionAlreadyExistsException.class)
-  @Permittable(groupId = 
io.mifos.identity.api.v1.PermittableGroupIds.APPLICATION_SELF_MANAGEMENT)
+  @Permittable(groupId = 
org.apache.fineract.cn.identity.api.v1.PermittableGroupIds.APPLICATION_SELF_MANAGEMENT)
   void createApplicationPermission(@PathVariable("applicationidentifier") 
String applicationIdentifier,
                                    @RequestBody @Valid Permission permission);
 }
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/mapper/BeatMapper.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/mapper/BeatMapper.java
similarity index 89%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/mapper/BeatMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/mapper/BeatMapper.java
index c9b94e3..fd29670 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/mapper/BeatMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/mapper/BeatMapper.java
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.mapper;
+package org.apache.fineract.cn.rhythm.service.internal.mapper;
 
-import io.mifos.rhythm.api.v1.domain.Beat;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.service.internal.repository.BeatEntity;
-import io.mifos.rhythm.service.internal.repository.ClockOffsetEntity;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
@@ -29,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.fineract.cn.rhythm.service.internal.repository.BeatEntity;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ClockOffsetEntity;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/mapper/ClockOffsetMapper.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/mapper/ClockOffsetMapper.java
similarity index 88%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/mapper/ClockOffsetMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/mapper/ClockOffsetMapper.java
index a1db84d..ff8591b 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/mapper/ClockOffsetMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/mapper/ClockOffsetMapper.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.mapper;
-
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.service.internal.repository.ClockOffsetEntity;
+package org.apache.fineract.cn.rhythm.service.internal.mapper;
 
 import java.util.Optional;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ClockOffsetEntity;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ApplicationEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ApplicationEntity.java
similarity index 98%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/repository/ApplicationEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ApplicationEntity.java
index a185b20..fcf8fea 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ApplicationEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ApplicationEntity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.repository;
+package org.apache.fineract.cn.rhythm.service.internal.repository;
 
 import javax.persistence.*;
 import java.util.Objects;
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ApplicationRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ApplicationRepository.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/repository/ApplicationRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ApplicationRepository.java
index de1535e..945b739 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ApplicationRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ApplicationRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.repository;
+package org.apache.fineract.cn.rhythm.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/BeatEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/BeatEntity.java
similarity index 90%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/repository/BeatEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/BeatEntity.java
index f8bb829..a0ffb25 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/BeatEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/BeatEntity.java
@@ -16,13 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.repository;
+package org.apache.fineract.cn.rhythm.service.internal.repository;
 
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
-
-import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/BeatRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/BeatRepository.java
similarity index 96%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/repository/BeatRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/BeatRepository.java
index 90b0cf0..a377c47 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/BeatRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/BeatRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.repository;
+package org.apache.fineract.cn.rhythm.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ClockOffsetEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ClockOffsetEntity.java
similarity index 96%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/repository/ClockOffsetEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ClockOffsetEntity.java
index a0958a3..6a26900 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ClockOffsetEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ClockOffsetEntity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.repository;
+package org.apache.fineract.cn.rhythm.service.internal.repository;
 
 import javax.persistence.*;
 
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ClockOffsetRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ClockOffsetRepository.java
similarity index 94%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/repository/ClockOffsetRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ClockOffsetRepository.java
index 877427f..69085ef 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/repository/ClockOffsetRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/repository/ClockOffsetRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.repository;
+package org.apache.fineract.cn.rhythm.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/BeatPublisherService.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/BeatPublisherService.java
similarity index 86%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/service/BeatPublisherService.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/BeatPublisherService.java
index f732b99..34ce124 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/BeatPublisherService.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/BeatPublisherService.java
@@ -16,23 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.service;
+package org.apache.fineract.cn.rhythm.service.internal.service;
 
-import io.mifos.anubis.api.v1.domain.AllowedOperation;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.api.util.ApiFactory;
-import io.mifos.core.api.util.InvalidTokenException;
-import io.mifos.core.lang.ApplicationName;
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.DateConverter;
-import 
io.mifos.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
-import io.mifos.identity.api.v1.domain.Permission;
-import io.mifos.permittedfeignclient.service.ApplicationAccessTokenService;
-import io.mifos.rhythm.service.config.RhythmProperties;
-import 
io.mifos.rhythm.service.internal.identity.ApplicationPermissionRequestCreator;
-import io.mifos.rhythm.spi.v1.PermittableGroupIds;
-import io.mifos.rhythm.spi.v1.client.BeatListener;
-import io.mifos.rhythm.spi.v1.domain.BeatPublish;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.util.ApiFactory;
+import org.apache.fineract.cn.api.util.InvalidTokenException;
+import 
org.apache.fineract.cn.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.domain.Permission;
+import org.apache.fineract.cn.lang.ApplicationName;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+import org.apache.fineract.cn.lang.DateConverter;
+import 
org.apache.fineract.cn.permittedfeignclient.service.ApplicationAccessTokenService;
+import org.apache.fineract.cn.rhythm.service.ServiceConstants;
+import org.apache.fineract.cn.rhythm.service.config.RhythmProperties;
+import 
org.apache.fineract.cn.rhythm.service.internal.identity.ApplicationPermissionRequestCreator;
+import org.apache.fineract.cn.rhythm.spi.v1.PermittableGroupIds;
+import org.apache.fineract.cn.rhythm.spi.v1.client.BeatListener;
+import org.apache.fineract.cn.rhythm.spi.v1.domain.BeatPublish;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -40,13 +45,6 @@
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import static io.mifos.rhythm.service.ServiceConstants.LOGGER_NAME;
-
 /**
  * @author Myrle Krantz
  */
@@ -69,7 +67,7 @@ public BeatPublisherService(
           final ApplicationName rhythmApplicationName,
           final ApiFactory apiFactory,
           final RhythmProperties properties,
-          @Qualifier(LOGGER_NAME) final Logger logger) {
+          @Qualifier(ServiceConstants.LOGGER_NAME) final Logger logger) {
     this.discoveryClient = discoveryClient;
     this.applicationPermissionRequestCreator = 
applicationPermissionRequestCreator;
     this.applicationAccessTokenService = applicationAccessTokenService;
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/BeatService.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/BeatService.java
similarity index 86%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/service/BeatService.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/BeatService.java
index 5676bbb..7242cbb 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/BeatService.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/BeatService.java
@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.service;
-
-import io.mifos.rhythm.api.v1.domain.Beat;
-import io.mifos.rhythm.service.internal.mapper.BeatMapper;
-import io.mifos.rhythm.service.internal.repository.BeatRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+package org.apache.fineract.cn.rhythm.service.internal.service;
 
 import java.util.List;
 import java.util.Optional;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
+import org.apache.fineract.cn.rhythm.service.internal.mapper.BeatMapper;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.BeatRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/ClockOffsetService.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/ClockOffsetService.java
similarity index 83%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/service/ClockOffsetService.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/ClockOffsetService.java
index 06d1d5e..d957ba1 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/ClockOffsetService.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/ClockOffsetService.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.service;
+package org.apache.fineract.cn.rhythm.service.internal.service;
 
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.service.internal.mapper.ClockOffsetMapper;
-import io.mifos.rhythm.service.internal.repository.ClockOffsetRepository;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.service.internal.mapper.ClockOffsetMapper;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ClockOffsetRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/Drummer.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/Drummer.java
similarity index 92%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/service/Drummer.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/Drummer.java
index 29e61d0..e373bf2 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/Drummer.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/Drummer.java
@@ -16,14 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.service;
+package org.apache.fineract.cn.rhythm.service.internal.service;
 
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.service.ServiceConstants;
-import io.mifos.rhythm.service.internal.mapper.BeatMapper;
-import io.mifos.rhythm.service.internal.repository.BeatEntity;
-import io.mifos.rhythm.service.internal.repository.BeatRepository;
-import io.mifos.rhythm.service.internal.repository.ClockOffsetEntity;
+import java.time.Clock;
+import java.time.LocalDateTime;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.service.ServiceConstants;
+import org.apache.fineract.cn.rhythm.service.internal.mapper.BeatMapper;
+import org.apache.fineract.cn.rhythm.service.internal.repository.BeatEntity;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.BeatRepository;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ClockOffsetEntity;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,11 +36,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
 /**
  * @author Myrle Krantz
  */
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/IdentityPermittableGroupService.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/IdentityPermittableGroupService.java
similarity index 91%
rename from 
service/src/main/java/io/mifos/rhythm/service/internal/service/IdentityPermittableGroupService.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/IdentityPermittableGroupService.java
index 5d2208d..22e34ee 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/internal/service/IdentityPermittableGroupService.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/internal/service/IdentityPermittableGroupService.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.service;
+package org.apache.fineract.cn.rhythm.service.internal.service;
 
-import io.mifos.rhythm.service.ServiceConstants;
-import io.mifos.rhythm.service.internal.repository.ApplicationEntity;
-import io.mifos.rhythm.service.internal.repository.ApplicationRepository;
+import java.util.Optional;
+import org.apache.fineract.cn.rhythm.service.ServiceConstants;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ApplicationEntity;
+import 
org.apache.fineract.cn.rhythm.service.internal.repository.ApplicationRepository;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -29,8 +30,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 /**
  * @author Myrle Krantz
  */
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/rest/ApplicationRestController.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/ApplicationRestController.java
similarity index 71%
rename from 
service/src/main/java/io/mifos/rhythm/service/rest/ApplicationRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/ApplicationRestController.java
index 96273dd..6a52f41 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/rest/ApplicationRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/ApplicationRestController.java
@@ -16,18 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.rest;
+package org.apache.fineract.cn.rhythm.service.rest;
 
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.rhythm.service.internal.command.DeleteApplicationCommand;
+import static 
org.apache.fineract.cn.lang.config.TenantHeaderFilter.TENANT_HEADER;
+
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.DeleteApplicationCommand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import static io.mifos.core.lang.config.TenantHeaderFilter.TENANT_HEADER;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/rest/BeatRestController.java 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/BeatRestController.java
similarity index 77%
rename from 
service/src/main/java/io/mifos/rhythm/service/rest/BeatRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/BeatRestController.java
index e8821b9..cfa43a8 100644
--- a/service/src/main/java/io/mifos/rhythm/service/rest/BeatRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/BeatRestController.java
@@ -16,25 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.rest;
+package org.apache.fineract.cn.rhythm.service.rest;
 
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.rhythm.api.v1.domain.Beat;
-import io.mifos.rhythm.service.internal.command.CreateBeatCommand;
-import io.mifos.rhythm.service.internal.command.DeleteBeatCommand;
-import io.mifos.rhythm.service.internal.service.BeatService;
+import static 
org.apache.fineract.cn.lang.config.TenantHeaderFilter.TENANT_HEADER;
+
+import java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.apache.fineract.cn.rhythm.api.v1.domain.Beat;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.CreateBeatCommand;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.DeleteBeatCommand;
+import org.apache.fineract.cn.rhythm.service.internal.service.BeatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-import static io.mifos.core.lang.config.TenantHeaderFilter.TENANT_HEADER;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Myrle Krantz
@@ -84,7 +89,8 @@ public BeatRestController(final CommandGateway commandGateway,
           @PathVariable("beatidentifier") final String beatIdentifier) {
     return this.beatService.findByIdentifier(tenantIdentifier, 
applicationIdentifier, beatIdentifier)
             .map(ResponseEntity::ok)
-            .orElseThrow(() -> ServiceException.notFound("Instance with 
identifier ''" + applicationIdentifier + "'' doesn''t exist."));
+            .orElseThrow(() -> ServiceException
+                .notFound("Instance with identifier ''" + 
applicationIdentifier + "'' doesn''t exist."));
   }
 
   @Permittable(value = AcceptedTokenType.SYSTEM, permittedEndpoint = 
"/applications/{applicationidentifier}/beats", 
acceptTokenIntendedForForeignApplication = true) //Allow apps to use this 
endpoint in their provisioning code.
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/rest/ClockOffsetRestController.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/ClockOffsetRestController.java
similarity index 72%
rename from 
service/src/main/java/io/mifos/rhythm/service/rest/ClockOffsetRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/ClockOffsetRestController.java
index 645b767..be64fc6 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/rest/ClockOffsetRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/ClockOffsetRestController.java
@@ -16,22 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.rest;
+package org.apache.fineract.cn.rhythm.service.rest;
 
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
-import io.mifos.rhythm.service.internal.command.ChangeClockOffsetCommand;
-import io.mifos.rhythm.service.internal.service.ClockOffsetService;
+import static 
org.apache.fineract.cn.lang.config.TenantHeaderFilter.TENANT_HEADER;
+
+import javax.validation.Valid;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.ChangeClockOffsetCommand;
+import 
org.apache.fineract.cn.rhythm.service.internal.service.ClockOffsetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-import static io.mifos.core.lang.config.TenantHeaderFilter.TENANT_HEADER;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author Myrle Krantz
diff --git 
a/service/src/main/java/io/mifos/rhythm/service/rest/InitializeRestController.java
 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/InitializeRestController.java
similarity index 85%
rename from 
service/src/main/java/io/mifos/rhythm/service/rest/InitializeRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/InitializeRestController.java
index 6ec7de3..62a76c4 100644
--- 
a/service/src/main/java/io/mifos/rhythm/service/rest/InitializeRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/rhythm/service/rest/InitializeRestController.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.rest;
+package org.apache.fineract.cn.rhythm.service.rest;
 
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.rhythm.service.internal.command.InitializeServiceCommand;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import 
org.apache.fineract.cn.rhythm.service.internal.command.InitializeServiceCommand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git 
a/service/src/test/java/io/mifos/rhythm/service/internal/service/DrummerTest.java
 
b/service/src/test/java/org/apache/fineract/cn/rhythm/service/internal/service/DrummerTest.java
similarity index 98%
rename from 
service/src/test/java/io/mifos/rhythm/service/internal/service/DrummerTest.java
rename to 
service/src/test/java/org/apache/fineract/cn/rhythm/service/internal/service/DrummerTest.java
index d53b2a2..26c7ac5 100644
--- 
a/service/src/test/java/io/mifos/rhythm/service/internal/service/DrummerTest.java
+++ 
b/service/src/test/java/org/apache/fineract/cn/rhythm/service/internal/service/DrummerTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.service.internal.service;
+package org.apache.fineract.cn.rhythm.service.internal.service;
 
-import io.mifos.rhythm.api.v1.domain.ClockOffset;
+import org.apache.fineract.cn.rhythm.api.v1.domain.ClockOffset;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spi/src/main/java/io/mifos/rhythm/spi/v1/PermittableGroupIds.java 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/PermittableGroupIds.java
similarity index 95%
rename from spi/src/main/java/io/mifos/rhythm/spi/v1/PermittableGroupIds.java
rename to 
spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/PermittableGroupIds.java
index 3a77dbd..4ed752b 100644
--- a/spi/src/main/java/io/mifos/rhythm/spi/v1/PermittableGroupIds.java
+++ 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/PermittableGroupIds.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.spi.v1;
+package org.apache.fineract.cn.rhythm.spi.v1;
 
 /**
  * @author Myrle Krantz
diff --git a/spi/src/main/java/io/mifos/rhythm/spi/v1/client/BeatListener.java 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
similarity index 92%
rename from spi/src/main/java/io/mifos/rhythm/spi/v1/client/BeatListener.java
rename to 
spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
index 941b6ef..f0ce7ab 100644
--- a/spi/src/main/java/io/mifos/rhythm/spi/v1/client/BeatListener.java
+++ 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/client/BeatListener.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.spi.v1.client;
+package org.apache.fineract.cn.rhythm.spi.v1.client;
 
-import io.mifos.rhythm.spi.v1.domain.BeatPublish;
+import org.apache.fineract.cn.rhythm.spi.v1.domain.BeatPublish;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spi/src/main/java/io/mifos/rhythm/spi/v1/domain/BeatPublish.java 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/domain/BeatPublish.java
similarity index 90%
rename from spi/src/main/java/io/mifos/rhythm/spi/v1/domain/BeatPublish.java
rename to 
spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/domain/BeatPublish.java
index f815046..c98272c 100644
--- a/spi/src/main/java/io/mifos/rhythm/spi/v1/domain/BeatPublish.java
+++ 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/domain/BeatPublish.java
@@ -16,13 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.spi.v1.domain;
+package org.apache.fineract.cn.rhythm.spi.v1.domain;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-import io.mifos.core.lang.validation.constraints.ValidLocalDateTimeString;
-
-import javax.validation.constraints.NotNull;
 import java.util.Objects;
+import javax.validation.constraints.NotNull;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
+import 
org.apache.fineract.cn.lang.validation.constraints.ValidLocalDateTimeString;
 
 /**
  * @author Myrle Krantz
diff --git 
a/spi/src/main/java/io/mifos/rhythm/spi/v1/events/BeatPublishEvent.java 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/events/BeatPublishEvent.java
similarity index 97%
rename from 
spi/src/main/java/io/mifos/rhythm/spi/v1/events/BeatPublishEvent.java
rename to 
spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/events/BeatPublishEvent.java
index dda520e..cf78da4 100644
--- a/spi/src/main/java/io/mifos/rhythm/spi/v1/events/BeatPublishEvent.java
+++ 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/events/BeatPublishEvent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.spi.v1.events;
+package org.apache.fineract.cn.rhythm.spi.v1.events;
 
 import java.util.Objects;
 
diff --git 
a/spi/src/main/java/io/mifos/rhythm/spi/v1/events/EventConstants.java 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/events/EventConstants.java
similarity index 95%
rename from spi/src/main/java/io/mifos/rhythm/spi/v1/events/EventConstants.java
rename to 
spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/events/EventConstants.java
index b3083d0..43e069b 100644
--- a/spi/src/main/java/io/mifos/rhythm/spi/v1/events/EventConstants.java
+++ 
b/spi/src/main/java/org/apache/fineract/cn/rhythm/spi/v1/events/EventConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.spi.v1.events;
+package org.apache.fineract.cn.rhythm.spi.v1.events;
 
 /**
  * @author Myrle Krantz
diff --git 
a/spi/src/test/java/io/mifos/rhythm/spi/v1/domain/BeatPublishTest.java 
b/spi/src/test/java/org/apache/fineract/cn/rhythm/spi/v1/domain/BeatPublishTest.java
similarity index 90%
rename from spi/src/test/java/io/mifos/rhythm/spi/v1/domain/BeatPublishTest.java
rename to 
spi/src/test/java/org/apache/fineract/cn/rhythm/spi/v1/domain/BeatPublishTest.java
index 6121440..1540a5e 100644
--- a/spi/src/test/java/io/mifos/rhythm/spi/v1/domain/BeatPublishTest.java
+++ 
b/spi/src/test/java/org/apache/fineract/cn/rhythm/spi/v1/domain/BeatPublishTest.java
@@ -16,17 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.rhythm.spi.v1.domain;
-
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.apache.commons.lang.RandomStringUtils;
-import org.junit.runners.Parameterized;
+package org.apache.fineract.cn.rhythm.spi.v1.domain;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
 
 /**
  * @author Myrle Krantz


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to