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

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 ac2600e..09c53cb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Apache Fineract CN Group Management
 
-[![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 Group management capabilities.
 
 ## Versioning
diff --git a/api/src/main/java/io/mifos/group/api/v1/EventConstants.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/EventConstants.java
similarity index 97%
rename from api/src/main/java/io/mifos/group/api/v1/EventConstants.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/EventConstants.java
index 7a33567..435ac6d 100644
--- a/api/src/main/java/io/mifos/group/api/v1/EventConstants.java
+++ b/api/src/main/java/org/apache/fineract/cn/group/api/v1/EventConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1;
+package org.apache.fineract.cn.group.api.v1;
 
 @SuppressWarnings("unused")
 public interface EventConstants {
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupAlreadyExists.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupAlreadyExists.java
similarity index 94%
rename from 
api/src/main/java/io/mifos/group/api/v1/client/GroupAlreadyExists.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupAlreadyExists.java
index fdf09d2..887d7a5 100644
--- a/api/src/main/java/io/mifos/group/api/v1/client/GroupAlreadyExists.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupAlreadyExists.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
+package org.apache.fineract.cn.group.api.v1.client;
 
 public class GroupAlreadyExists extends RuntimeException {
 }
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionAlreadyExists.java
 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionAlreadyExists.java
similarity index 94%
rename from 
api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionAlreadyExists.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionAlreadyExists.java
index e0f31f9..30430e8 100644
--- 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionAlreadyExists.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionAlreadyExists.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
+package org.apache.fineract.cn.group.api.v1.client;
 
 public class GroupDefinitionAlreadyExists extends RuntimeException {
 }
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionNotFound.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionNotFound.java
similarity index 94%
rename from 
api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionNotFound.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionNotFound.java
index 7b1c260..a56711e 100644
--- 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionNotFound.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionNotFound.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
+package org.apache.fineract.cn.group.api.v1.client;
 
 public class GroupDefinitionNotFound extends RuntimeException {
 }
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionValidation.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionValidation.java
similarity index 94%
rename from 
api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionValidation.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionValidation.java
index aa83065..2e0c0d0 100644
--- 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupDefinitionValidation.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupDefinitionValidation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
+package org.apache.fineract.cn.group.api.v1.client;
 
 public class GroupDefinitionValidation extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupManager.java
similarity index 90%
rename from api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupManager.java
index 9b5877e..b64b390 100644
--- a/api/src/main/java/io/mifos/group/api/v1/client/GroupManager.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupManager.java
@@ -16,18 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
-
-import io.mifos.core.api.annotation.ThrowsException;
-import io.mifos.core.api.annotation.ThrowsExceptions;
-import io.mifos.core.api.util.CustomFeignClientsConfiguration;
-import io.mifos.group.api.v1.domain.AssignedEmployeeHolder;
-import io.mifos.group.api.v1.domain.SignOffMeeting;
-import io.mifos.group.api.v1.domain.Group;
-import io.mifos.group.api.v1.domain.GroupCommand;
-import io.mifos.group.api.v1.domain.GroupDefinition;
-import io.mifos.group.api.v1.domain.GroupPage;
-import io.mifos.group.api.v1.domain.Meeting;
+package org.apache.fineract.cn.group.api.v1.client;
+
+import org.apache.fineract.cn.group.api.v1.domain.AssignedEmployeeHolder;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.GroupPage;
+import org.apache.fineract.cn.group.api.v1.domain.Meeting;
+import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting;
+import java.util.List;
+import java.util.Set;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
+import org.apache.fineract.cn.api.annotation.ThrowsExceptions;
+import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -38,9 +40,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.List;
-import java.util.Set;
-
 @SuppressWarnings("unused")
 @FeignClient(name="group-v1", path="/group/v1", 
configuration=CustomFeignClientsConfiguration.class)
 public interface GroupManager {
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupNotFoundException.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupNotFoundException.java
similarity index 94%
rename from 
api/src/main/java/io/mifos/group/api/v1/client/GroupNotFoundException.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupNotFoundException.java
index ee0999a..1b27678 100644
--- a/api/src/main/java/io/mifos/group/api/v1/client/GroupNotFoundException.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupNotFoundException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
+package org.apache.fineract.cn.group.api.v1.client;
 
 public class GroupNotFoundException extends RuntimeException {
 }
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupValidationException.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupValidationException.java
similarity index 94%
rename from 
api/src/main/java/io/mifos/group/api/v1/client/GroupValidationException.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupValidationException.java
index caa61f0..1bdc5e7 100644
--- 
a/api/src/main/java/io/mifos/group/api/v1/client/GroupValidationException.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/client/GroupValidationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.client;
+package org.apache.fineract.cn.group.api.v1.client;
 
 public class GroupValidationException extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/Address.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Address.java
similarity index 97%
rename from api/src/main/java/io/mifos/group/api/v1/domain/Address.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Address.java
index 16c76f0..7ba47bb 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/Address.java
+++ b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Address.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import org.hibernate.validator.constraints.NotBlank;
 
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/domain/AssignedEmployeeHolder.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/AssignedEmployeeHolder.java
similarity index 95%
rename from 
api/src/main/java/io/mifos/group/api/v1/domain/AssignedEmployeeHolder.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/AssignedEmployeeHolder.java
index 6871e5a..7897564 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/AssignedEmployeeHolder.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/AssignedEmployeeHolder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 public class AssignedEmployeeHolder {
 
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/Attendee.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Attendee.java
similarity index 96%
rename from api/src/main/java/io/mifos/group/api/v1/domain/Attendee.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Attendee.java
index e48a45f..3fc7a7a 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/Attendee.java
+++ b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Attendee.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import org.hibernate.validator.constraints.NotBlank;
 
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/Cycle.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Cycle.java
similarity index 97%
rename from api/src/main/java/io/mifos/group/api/v1/domain/Cycle.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Cycle.java
index 05a1c78..e249b48 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/Cycle.java
+++ b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Cycle.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/Group.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Group.java
similarity index 98%
rename from api/src/main/java/io/mifos/group/api/v1/domain/Group.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Group.java
index d51751d..4c21ffa 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/Group.java
+++ b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Group.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import org.hibernate.validator.constraints.NotBlank;
 
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/GroupCommand.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupCommand.java
similarity index 96%
rename from api/src/main/java/io/mifos/group/api/v1/domain/GroupCommand.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupCommand.java
index 9185d56..526e5b7 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/GroupCommand.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 public class GroupCommand {
 
diff --git 
a/api/src/main/java/io/mifos/group/api/v1/domain/GroupDefinition.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupDefinition.java
similarity index 98%
rename from api/src/main/java/io/mifos/group/api/v1/domain/GroupDefinition.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupDefinition.java
index 2083679..9a8d2f1 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/GroupDefinition.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupDefinition.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import org.hibernate.validator.constraints.NotBlank;
 
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/GroupPage.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupPage.java
similarity index 96%
rename from api/src/main/java/io/mifos/group/api/v1/domain/GroupPage.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupPage.java
index 04d3c32..ceae93a 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/GroupPage.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/GroupPage.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import java.util.List;
 
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/Meeting.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Meeting.java
similarity index 98%
rename from api/src/main/java/io/mifos/group/api/v1/domain/Meeting.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Meeting.java
index 78c14cf..f7ff2b5 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/Meeting.java
+++ b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/Meeting.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
diff --git a/api/src/main/java/io/mifos/group/api/v1/domain/SignOffMeeting.java 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/SignOffMeeting.java
similarity index 96%
rename from api/src/main/java/io/mifos/group/api/v1/domain/SignOffMeeting.java
rename to 
api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/SignOffMeeting.java
index 50c2b8f..1ea27e7 100644
--- a/api/src/main/java/io/mifos/group/api/v1/domain/SignOffMeeting.java
+++ 
b/api/src/main/java/org/apache/fineract/cn/group/api/v1/domain/SignOffMeeting.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.api.v1.domain;
+package org.apache.fineract.cn.group.api.v1.domain;
 
 import javax.validation.Valid;
 import java.util.Set;
diff --git a/component-test/src/main/java/io/mifos/group/TestGroup.java 
b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java
similarity index 88%
rename from component-test/src/main/java/io/mifos/group/TestGroup.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java
index 4e3edf6..1307d66 100644
--- a/component-test/src/main/java/io/mifos/group/TestGroup.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java
@@ -16,30 +16,40 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group;
-
-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.group.api.v1.EventConstants;
-import io.mifos.group.api.v1.client.GroupManager;
-import io.mifos.group.api.v1.domain.AssignedEmployeeHolder;
-import io.mifos.group.api.v1.domain.Attendee;
-import io.mifos.group.api.v1.domain.Group;
-import io.mifos.group.api.v1.domain.GroupCommand;
-import io.mifos.group.api.v1.domain.GroupDefinition;
-import io.mifos.group.api.v1.domain.Meeting;
-import io.mifos.group.api.v1.domain.SignOffMeeting;
-import io.mifos.group.service.GroupConfiguration;
-import io.mifos.group.util.GroupDefinitionGenerator;
-import io.mifos.group.util.GroupGenerator;
+package org.apache.fineract.cn.group;
+
+import org.apache.fineract.cn.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.api.v1.client.GroupManager;
+import org.apache.fineract.cn.group.api.v1.domain.AssignedEmployeeHolder;
+import org.apache.fineract.cn.group.api.v1.domain.Attendee;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.Meeting;
+import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting;
+import org.apache.fineract.cn.group.util.GroupDefinitionGenerator;
+import org.apache.fineract.cn.group.util.GroupGenerator;
+import java.time.Clock;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.*;
+import 
org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+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.Test;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
@@ -55,13 +65,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.time.Clock;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public class TestGroup {
@@ -261,10 +264,10 @@ public void shouldUpdateAssignedEmployee() throws 
Exception {
 
   @Configuration
   @EnableEventRecording
-  @EnableFeignClients(basePackages = {"io.mifos.group.api.v1.client"})
+  @EnableFeignClients(basePackages = 
{"org.apache.fineract.cn.group.api.v1.client"})
   @RibbonClient(name = APP_NAME)
   @Import({GroupConfiguration.class})
-  @ComponentScan("io.mifos.group.listener")
+  @ComponentScan("org.apache.fineract.cn.group.listener")
   public static class TestConfiguration {
     public TestConfiguration() {
       super();
diff --git 
a/component-test/src/main/java/io/mifos/group/TestGroupDefinition.java 
b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java
similarity index 81%
rename from component-test/src/main/java/io/mifos/group/TestGroupDefinition.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java
index d59a11f..608cf64 100644
--- a/component-test/src/main/java/io/mifos/group/TestGroupDefinition.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroupDefinition.java
@@ -16,23 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group;
-
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.lang.TenantContextHolder;
-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.group.api.v1.EventConstants;
-import io.mifos.group.api.v1.client.GroupManager;
-import io.mifos.group.api.v1.domain.GroupDefinition;
-import io.mifos.group.service.GroupConfiguration;
-import io.mifos.group.util.GroupDefinitionGenerator;
-import org.junit.*;
+package org.apache.fineract.cn.group;
+
+import org.apache.fineract.cn.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.api.v1.client.GroupManager;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.util.GroupDefinitionGenerator;
+import 
org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.lang.TenantContextHolder;
+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.Test;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
@@ -125,10 +129,10 @@ public void shouldCreateGroupDefinition() throws 
Exception {
 
   @Configuration
   @EnableEventRecording
-  @EnableFeignClients(basePackages = {"io.mifos.group.api.v1.client"})
+  @EnableFeignClients(basePackages = 
{"org.apache.fineract.cn.group.api.v1.client"})
   @RibbonClient(name = APP_NAME)
   @Import({GroupConfiguration.class})
-  @ComponentScan("io.mifos.group.listener")
+  @ComponentScan("org.apache.fineract.cn.group.listener")
   public static class TestConfiguration {
     public TestConfiguration() {
       super();
diff --git 
a/component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java
 
b/component-test/src/main/java/org/apache/fineract/cn/group/listener/GroupDefinitionEventListener.java
similarity index 88%
rename from 
component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/listener/GroupDefinitionEventListener.java
index be21011..13dad62 100644
--- 
a/component-test/src/main/java/io/mifos/group/listener/GroupDefinitionEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/group/listener/GroupDefinitionEventListener.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.listener;
+package org.apache.fineract.cn.group.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.api.v1.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/group/listener/GroupEventListener.java 
b/component-test/src/main/java/org/apache/fineract/cn/group/listener/GroupEventListener.java
similarity index 91%
rename from 
component-test/src/main/java/io/mifos/group/listener/GroupEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/listener/GroupEventListener.java
index 825947c..a453f68 100644
--- 
a/component-test/src/main/java/io/mifos/group/listener/GroupEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/group/listener/GroupEventListener.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.listener;
+package org.apache.fineract.cn.group.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.api.v1.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/group/listener/MigrationEventListener.java
 
b/component-test/src/main/java/org/apache/fineract/cn/group/listener/MigrationEventListener.java
similarity index 88%
rename from 
component-test/src/main/java/io/mifos/group/listener/MigrationEventListener.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/listener/MigrationEventListener.java
index 7b90c38..027688a 100644
--- 
a/component-test/src/main/java/io/mifos/group/listener/MigrationEventListener.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/group/listener/MigrationEventListener.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.listener;
+package org.apache.fineract.cn.group.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.api.v1.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/group/util/GroupDefinitionGenerator.java
 
b/component-test/src/main/java/org/apache/fineract/cn/group/util/GroupDefinitionGenerator.java
similarity index 90%
rename from 
component-test/src/main/java/io/mifos/group/util/GroupDefinitionGenerator.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/util/GroupDefinitionGenerator.java
index 051bd2b..1ecebe8 100644
--- 
a/component-test/src/main/java/io/mifos/group/util/GroupDefinitionGenerator.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/group/util/GroupDefinitionGenerator.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.util;
+package org.apache.fineract.cn.group.util;
 
-import io.mifos.group.api.v1.domain.Cycle;
-import io.mifos.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.Cycle;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
 import org.apache.commons.lang3.RandomStringUtils;
 
 public class GroupDefinitionGenerator {
diff --git 
a/component-test/src/main/java/io/mifos/group/util/GroupGenerator.java 
b/component-test/src/main/java/org/apache/fineract/cn/group/util/GroupGenerator.java
similarity index 94%
rename from component-test/src/main/java/io/mifos/group/util/GroupGenerator.java
rename to 
component-test/src/main/java/org/apache/fineract/cn/group/util/GroupGenerator.java
index 31ff0e3..4d63436 100644
--- a/component-test/src/main/java/io/mifos/group/util/GroupGenerator.java
+++ 
b/component-test/src/main/java/org/apache/fineract/cn/group/util/GroupGenerator.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.util;
+package org.apache.fineract.cn.group.util;
 
-import io.mifos.group.api.v1.domain.Address;
-import io.mifos.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.Address;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
 import org.apache.commons.lang3.RandomStringUtils;
 
 import java.util.Arrays;
diff --git a/service/src/main/java/io/mifos/group/service/GroupApplication.java 
b/service/src/main/java/org/apache/fineract/cn/group/GroupApplication.java
similarity index 96%
rename from service/src/main/java/io/mifos/group/service/GroupApplication.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/GroupApplication.java
index 10ead59..117e078 100644
--- a/service/src/main/java/io/mifos/group/service/GroupApplication.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/GroupApplication.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service;
+package org.apache.fineract.cn.group;
 
 import org.springframework.boot.SpringApplication;
 
diff --git 
a/service/src/main/java/io/mifos/group/service/GroupConfiguration.java 
b/service/src/main/java/org/apache/fineract/cn/group/GroupConfiguration.java
similarity index 73%
rename from service/src/main/java/io/mifos/group/service/GroupConfiguration.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/GroupConfiguration.java
index bb0d3c8..f2f0642 100644
--- a/service/src/main/java/io/mifos/group/service/GroupConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/GroupConfiguration.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service;
+package org.apache.fineract.cn.group;
 
-import io.mifos.anubis.config.EnableAnubis;
-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.EnableServiceException;
-import io.mifos.core.lang.config.EnableTenantContext;
-import io.mifos.core.mariadb.config.EnableMariaDB;
+import org.apache.fineract.cn.anubis.config.EnableAnubis;
+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.EnableServiceException;
+import org.apache.fineract.cn.lang.config.EnableTenantContext;
+import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -48,13 +48,13 @@
 @EnableAnubis
 @EnableServiceException
 @ComponentScan({
-    "io.mifos.group.service.rest",
-    "io.mifos.group.service.internal.service",
-    "io.mifos.group.service.internal.repository",
-    "io.mifos.group.service.internal.command.handler"
+    "org.apache.fineract.cn.group.rest",
+    "org.apache.fineract.cn.group.internal.service",
+    "org.apache.fineract.cn.group.internal.repository",
+    "org.apache.fineract.cn.group.internal.command.handler"
 })
 @EnableJpaRepositories({
-    "io.mifos.group.service.internal.repository"
+    "org.apache.fineract.cn.group.internal.repository"
 })
 public class GroupConfiguration extends WebMvcConfigurerAdapter {
 
diff --git a/service/src/main/java/io/mifos/group/service/ServiceConstants.java 
b/service/src/main/java/org/apache/fineract/cn/group/ServiceConstants.java
similarity index 95%
rename from service/src/main/java/io/mifos/group/service/ServiceConstants.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/ServiceConstants.java
index 3f7f49d..1da6c58 100644
--- a/service/src/main/java/io/mifos/group/service/ServiceConstants.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/ServiceConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service;
+package org.apache.fineract.cn.group;
 
 public interface ServiceConstants {
   String LOGGER_NAME = "group-logger";
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/ActivateGroupCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ActivateGroupCommand.java
similarity index 91%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/ActivateGroupCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/ActivateGroupCommand.java
index a36da1a..8d654b7 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/ActivateGroupCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ActivateGroupCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
-import io.mifos.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
 
 public class ActivateGroupCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/CloseGroupCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CloseGroupCommand.java
similarity index 91%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/CloseGroupCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/CloseGroupCommand.java
index 496f296..54cdab4 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/CloseGroupCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CloseGroupCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
-import io.mifos.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
 
 public class CloseGroupCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/CreateGroupCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupCommand.java
similarity index 90%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/CreateGroupCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupCommand.java
index 1f17643..f995bca 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/CreateGroupCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
-import io.mifos.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
 
 public class CreateGroupCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/CreateGroupDefinitionCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupDefinitionCommand.java
similarity index 90%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/CreateGroupDefinitionCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupDefinitionCommand.java
index 47561a8..98a13b1 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/CreateGroupDefinitionCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/CreateGroupDefinitionCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
-import io.mifos.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
 
 public class CreateGroupDefinitionCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/InitializeServiceCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/InitializeServiceCommand.java
similarity index 94%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/InitializeServiceCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/InitializeServiceCommand.java
index e513bfd..b67a546 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/InitializeServiceCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/InitializeServiceCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
 public class InitializeServiceCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/ReopenGroupCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ReopenGroupCommand.java
similarity index 91%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/ReopenGroupCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/ReopenGroupCommand.java
index 38a60ca..a96f239 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/ReopenGroupCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/ReopenGroupCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
-import io.mifos.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
 
 public class ReopenGroupCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/SignOffMeetingCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/SignOffMeetingCommand.java
similarity index 91%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/SignOffMeetingCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/SignOffMeetingCommand.java
index 91cae9c..da1ae48 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/SignOffMeetingCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/SignOffMeetingCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
-import io.mifos.group.api.v1.domain.SignOffMeeting;
+import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting;
 
 public class SignOffMeetingCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/UpdateAssignedEmployeeCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateAssignedEmployeeCommand.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/UpdateAssignedEmployeeCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateAssignedEmployeeCommand.java
index 41763ee..7168e27 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/UpdateAssignedEmployeeCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateAssignedEmployeeCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
 public class UpdateAssignedEmployeeCommand {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/UpdateLeadersCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateLeadersCommand.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/UpdateLeadersCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateLeadersCommand.java
index add55ed..3e0fcc7 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/UpdateLeadersCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateLeadersCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
 import java.util.Set;
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/UpdateMembersCommand.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateMembersCommand.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/UpdateMembersCommand.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateMembersCommand.java
index 5b09287..ffd5305 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/UpdateMembersCommand.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/UpdateMembersCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command;
+package org.apache.fineract.cn.group.internal.command;
 
 import java.util.Set;
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/handler/GroupAggregate.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java
similarity index 85%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/handler/GroupAggregate.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java
index 4c3bbae..2ddf42f 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/handler/GroupAggregate.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java
@@ -16,43 +16,38 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command.handler;
-
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.group.service.internal.command.ActivateGroupCommand;
-import io.mifos.group.service.internal.command.CloseGroupCommand;
-import io.mifos.group.service.internal.command.CreateGroupCommand;
-import io.mifos.group.service.internal.command.CreateGroupDefinitionCommand;
-import io.mifos.group.service.internal.command.ReopenGroupCommand;
-import io.mifos.group.service.internal.command.SignOffMeetingCommand;
-import io.mifos.group.service.internal.command.UpdateAssignedEmployeeCommand;
-import io.mifos.group.service.internal.command.UpdateLeadersCommand;
-import io.mifos.group.service.internal.command.UpdateMembersCommand;
-import io.mifos.group.service.internal.repository.AddressEntity;
-import io.mifos.group.service.internal.repository.AddressRepository;
-import io.mifos.group.service.internal.repository.AttendeeEntity;
-import io.mifos.group.service.internal.repository.AttendeeRepository;
-import io.mifos.group.service.internal.repository.GroupCommandEntity;
-import io.mifos.group.service.internal.repository.GroupCommandRepository;
-import io.mifos.group.service.internal.repository.GroupDefinitionEntity;
-import io.mifos.group.service.internal.repository.GroupDefinitionRepository;
-import io.mifos.group.service.internal.repository.GroupEntity;
-import io.mifos.group.service.internal.repository.GroupRepository;
-import io.mifos.group.service.internal.repository.MeetingEntity;
-import io.mifos.group.service.internal.repository.MeetingRepository;
-import io.mifos.group.api.v1.EventConstants;
-import io.mifos.group.api.v1.domain.*;
-import io.mifos.group.service.internal.mapper.AddressMapper;
-import io.mifos.group.service.internal.mapper.GroupCommandMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
+package org.apache.fineract.cn.group.internal.command.handler;
 
+import org.apache.fineract.cn.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.api.v1.domain.Attendee;
+import org.apache.fineract.cn.group.api.v1.domain.Cycle;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting;
+import org.apache.fineract.cn.group.internal.command.ActivateGroupCommand;
+import org.apache.fineract.cn.group.internal.command.CloseGroupCommand;
+import org.apache.fineract.cn.group.internal.command.CreateGroupCommand;
+import 
org.apache.fineract.cn.group.internal.command.CreateGroupDefinitionCommand;
+import org.apache.fineract.cn.group.internal.command.ReopenGroupCommand;
+import org.apache.fineract.cn.group.internal.command.SignOffMeetingCommand;
+import 
org.apache.fineract.cn.group.internal.command.UpdateAssignedEmployeeCommand;
+import org.apache.fineract.cn.group.internal.command.UpdateLeadersCommand;
+import org.apache.fineract.cn.group.internal.command.UpdateMembersCommand;
+import org.apache.fineract.cn.group.internal.mapper.AddressMapper;
+import org.apache.fineract.cn.group.internal.mapper.GroupCommandMapper;
+import org.apache.fineract.cn.group.internal.repository.AddressEntity;
+import org.apache.fineract.cn.group.internal.repository.AddressRepository;
+import org.apache.fineract.cn.group.internal.repository.AttendeeEntity;
+import org.apache.fineract.cn.group.internal.repository.AttendeeRepository;
+import org.apache.fineract.cn.group.internal.repository.GroupCommandEntity;
+import org.apache.fineract.cn.group.internal.repository.GroupCommandRepository;
+import org.apache.fineract.cn.group.internal.repository.GroupDefinitionEntity;
+import 
org.apache.fineract.cn.group.internal.repository.GroupDefinitionRepository;
+import org.apache.fineract.cn.group.internal.repository.GroupEntity;
+import org.apache.fineract.cn.group.internal.repository.GroupRepository;
+import org.apache.fineract.cn.group.internal.repository.MeetingEntity;
+import org.apache.fineract.cn.group.internal.repository.MeetingRepository;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -60,6 +55,15 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 @SuppressWarnings("unused")
 @Aggregate
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/MigrationAggregate.java
similarity index 79%
rename from 
service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/MigrationAggregate.java
index eed82d2..3ea23ff 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/command/handler/MigrationAggregate.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/MigrationAggregate.java
@@ -16,22 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command.handler;
+package org.apache.fineract.cn.group.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.mariadb.domain.FlywayFactoryBean;
-import io.mifos.group.api.v1.EventConstants;
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.command.InitializeServiceCommand;
+import org.apache.fineract.cn.group.api.v1.EventConstants;
+import org.apache.fineract.cn.group.ServiceConstants;
+import org.apache.fineract.cn.group.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.EventEmitter;
+import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.sql.DataSource;
-
 @SuppressWarnings("unused")
 @Aggregate
 public class MigrationAggregate {
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/mapper/AddressMapper.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AddressMapper.java
similarity index 90%
rename from 
service/src/main/java/io/mifos/group/service/internal/mapper/AddressMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AddressMapper.java
index c9661e9..995189f 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/mapper/AddressMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AddressMapper.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.mapper;
+package org.apache.fineract.cn.group.internal.mapper;
 
-import io.mifos.group.service.internal.repository.AddressEntity;
-import io.mifos.group.api.v1.domain.Address;
+import org.apache.fineract.cn.group.internal.repository.AddressEntity;
+import org.apache.fineract.cn.group.api.v1.domain.Address;
 
 public class AddressMapper {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/mapper/AttendeeMapper.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AttendeeMapper.java
similarity index 86%
rename from 
service/src/main/java/io/mifos/group/service/internal/mapper/AttendeeMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AttendeeMapper.java
index 3ebac1a..cee9d56 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/mapper/AttendeeMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/AttendeeMapper.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.mapper;
+package org.apache.fineract.cn.group.internal.mapper;
 
-import io.mifos.group.api.v1.domain.Attendee;
-import io.mifos.group.service.internal.repository.AttendeeEntity;
+import org.apache.fineract.cn.group.api.v1.domain.Attendee;
+import org.apache.fineract.cn.group.internal.repository.AttendeeEntity;
 
 public class AttendeeMapper {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupCommandMapper.java
similarity index 85%
rename from 
service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupCommandMapper.java
index bbfbf3a..301a0a0 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupCommandMapper.java
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.mapper;
-
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.group.service.internal.repository.GroupCommandEntity;
-import io.mifos.group.api.v1.domain.GroupCommand;
+package org.apache.fineract.cn.group.internal.mapper;
 
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.internal.repository.GroupCommandEntity;
 import java.time.Clock;
 import java.time.LocalDateTime;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class GroupCommandMapper {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupDefinitionMapper.java
similarity index 87%
rename from 
service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupDefinitionMapper.java
index 6de8f05..38b4a7e 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupDefinitionMapper.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.mapper;
+package org.apache.fineract.cn.group.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.group.service.internal.repository.GroupDefinitionEntity;
-import io.mifos.group.api.v1.domain.Cycle;
-import io.mifos.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.Cycle;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.internal.repository.GroupDefinitionEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class GroupDefinitionMapper {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupMapper.java
similarity index 89%
rename from 
service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupMapper.java
index 764a377..6195222 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/GroupMapper.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.mapper;
+package org.apache.fineract.cn.group.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.group.service.internal.repository.GroupEntity;
-import io.mifos.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.internal.repository.GroupEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 import org.springframework.util.StringUtils;
 
 public class GroupMapper {
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/MeetingMapper.java
similarity index 87%
rename from 
service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/mapper/MeetingMapper.java
index 6851cc3..1073155 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/mapper/MeetingMapper.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.mapper;
+package org.apache.fineract.cn.group.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.group.api.v1.domain.Meeting;
-import io.mifos.group.service.internal.repository.MeetingEntity;
+import org.apache.fineract.cn.group.api.v1.domain.Meeting;
+import org.apache.fineract.cn.group.internal.repository.MeetingEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class MeetingMapper {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/AddressEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressEntity.java
similarity index 97%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/AddressEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressEntity.java
index 10fb8dd..7474499 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/AddressEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressEntity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/AddressRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressRepository.java
similarity index 94%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/AddressRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressRepository.java
index a6fbcff..535ffae 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/AddressRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AddressRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/AttendeeEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeEntity.java
similarity index 97%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/AttendeeEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeEntity.java
index d0d525a..6252f47 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/AttendeeEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeEntity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/AttendeeRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeRepository.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/AttendeeRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeRepository.java
index 1f590e1..8b16819 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/AttendeeRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/AttendeeRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandEntity.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandEntity.java
index e7ae69a..67c8286 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandEntity.java
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.group.internal.repository;
 
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -30,7 +29,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "ptah_group_commands")
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandRepository.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandRepository.java
index bfc208f..f729204 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupCommandRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionEntity.java
similarity index 97%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionEntity.java
index 876973b..5b4c856 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionEntity.java
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.group.internal.repository;
 
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -27,7 +26,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "ptah_group_definitions")
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionRepository.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionRepository.java
index 9d78198..5bb130b 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupDefinitionRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupEntity.java
similarity index 97%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupEntity.java
index 6f8fbea..10e8a57 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupEntity.java
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.group.internal.repository;
 
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -31,7 +30,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "ptah_groups")
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupRepository.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/GroupRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupRepository.java
index d1e3d7e..d1cf609 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/GroupRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/GroupRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingEntity.java
similarity index 95%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingEntity.java
index a6e4b6b..dc9fef9 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingEntity.java
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateConverter;
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.group.internal.repository;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -31,8 +30,8 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateConverter;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "ptah_meetings")
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingRepository.java
similarity index 93%
rename from 
service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingRepository.java
index 16a2349..c094de0 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/repository/MeetingRepository.java
@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.repository;
+package org.apache.fineract.cn.group.internal.repository;
 
-import io.mifos.core.mariadb.util.LocalDateConverter;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import javax.persistence.Convert;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
+import javax.persistence.Convert;
+import org.apache.fineract.cn.mariadb.util.LocalDateConverter;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 @Repository
 public interface MeetingRepository extends JpaRepository<MeetingEntity, Long> {
diff --git 
a/service/src/main/java/io/mifos/group/service/internal/service/GroupDefinitionService.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupDefinitionService.java
similarity index 85%
rename from 
service/src/main/java/io/mifos/group/service/internal/service/GroupDefinitionService.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupDefinitionService.java
index c691ae8..6d34e81 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/service/GroupDefinitionService.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupDefinitionService.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.service;
+package org.apache.fineract.cn.group.internal.service;
 
-import io.mifos.group.api.v1.domain.GroupDefinition;
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.mapper.GroupDefinitionMapper;
-import io.mifos.group.service.internal.repository.GroupDefinitionRepository;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.ServiceConstants;
+import org.apache.fineract.cn.group.internal.mapper.GroupDefinitionMapper;
+import 
org.apache.fineract.cn.group.internal.repository.GroupDefinitionRepository;
 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/group/service/internal/service/GroupService.java
 
b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupService.java
similarity index 80%
rename from 
service/src/main/java/io/mifos/group/service/internal/service/GroupService.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupService.java
index 8cfc35e..2b7909c 100644
--- 
a/service/src/main/java/io/mifos/group/service/internal/service/GroupService.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/internal/service/GroupService.java
@@ -16,25 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.service;
+package org.apache.fineract.cn.group.internal.service;
 
-import io.mifos.core.lang.ServiceException;
-import io.mifos.group.service.internal.repository.AttendeeRepository;
-import io.mifos.group.service.internal.repository.GroupRepository;
-import io.mifos.group.api.v1.domain.Group;
-import io.mifos.group.api.v1.domain.GroupCommand;
-import io.mifos.group.api.v1.domain.GroupPage;
-import io.mifos.group.api.v1.domain.Meeting;
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.mapper.AddressMapper;
-import io.mifos.group.service.internal.mapper.AttendeeMapper;
-import io.mifos.group.service.internal.mapper.GroupCommandMapper;
-import io.mifos.group.service.internal.mapper.GroupMapper;
-import io.mifos.group.service.internal.mapper.MeetingMapper;
-import io.mifos.group.service.internal.repository.GroupCommandRepository;
-import io.mifos.group.service.internal.repository.GroupEntity;
-import io.mifos.group.service.internal.repository.MeetingEntity;
-import io.mifos.group.service.internal.repository.MeetingRepository;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupPage;
+import org.apache.fineract.cn.group.api.v1.domain.Meeting;
+import org.apache.fineract.cn.group.ServiceConstants;
+import org.apache.fineract.cn.group.internal.mapper.AddressMapper;
+import org.apache.fineract.cn.group.internal.mapper.AttendeeMapper;
+import org.apache.fineract.cn.group.internal.mapper.GroupCommandMapper;
+import org.apache.fineract.cn.group.internal.mapper.GroupMapper;
+import org.apache.fineract.cn.group.internal.mapper.MeetingMapper;
+import org.apache.fineract.cn.group.internal.repository.AttendeeRepository;
+import org.apache.fineract.cn.group.internal.repository.GroupCommandRepository;
+import org.apache.fineract.cn.group.internal.repository.GroupEntity;
+import org.apache.fineract.cn.group.internal.repository.GroupRepository;
+import org.apache.fineract.cn.group.internal.repository.MeetingEntity;
+import org.apache.fineract.cn.group.internal.repository.MeetingRepository;
+import java.time.Clock;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.apache.fineract.cn.lang.ServiceException;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -42,12 +47,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.time.Clock;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 @Service
 public class GroupService {
 
diff --git 
a/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java
 
b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java
similarity index 86%
rename from 
service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java
index 86588ba..a526450 100644
--- 
a/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java
@@ -16,16 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.rest;
+package org.apache.fineract.cn.group.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.group.service.ServiceConstants;
-import io.mifos.group.service.internal.command.CreateGroupDefinitionCommand;
-import io.mifos.group.service.internal.service.GroupDefinitionService;
-import io.mifos.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.ServiceConstants;
+import 
org.apache.fineract.cn.group.internal.command.CreateGroupDefinitionCommand;
+import org.apache.fineract.cn.group.internal.service.GroupDefinitionService;
+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.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -38,9 +40,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.util.List;
-
 @RestController
 @RequestMapping("/definitions")
 public class GroupDefinitionRestController {
diff --git 
a/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java 
b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupRestController.java
similarity index 87%
rename from 
service/src/main/java/io/mifos/group/service/rest/GroupRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/rest/GroupRestController.java
index 34a6780..c9edae9 100644
--- a/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupRestController.java
@@ -16,29 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.rest;
+package org.apache.fineract.cn.group.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.group.service.internal.command.SignOffMeetingCommand;
-import io.mifos.group.service.internal.command.UpdateLeadersCommand;
-import io.mifos.group.service.internal.command.UpdateMembersCommand;
-import io.mifos.group.service.internal.service.GroupDefinitionService;
-import io.mifos.group.service.internal.service.GroupService;
-import io.mifos.group.api.v1.domain.AssignedEmployeeHolder;
-import io.mifos.group.api.v1.domain.Group;
-import io.mifos.group.api.v1.domain.GroupCommand;
-import io.mifos.group.api.v1.domain.GroupPage;
-import io.mifos.group.api.v1.domain.Meeting;
-import io.mifos.group.api.v1.domain.SignOffMeeting;
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.command.ActivateGroupCommand;
-import io.mifos.group.service.internal.command.CloseGroupCommand;
-import io.mifos.group.service.internal.command.CreateGroupCommand;
-import io.mifos.group.service.internal.command.ReopenGroupCommand;
-import io.mifos.group.service.internal.command.UpdateAssignedEmployeeCommand;
+import org.apache.fineract.cn.group.api.v1.domain.AssignedEmployeeHolder;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.api.v1.domain.GroupPage;
+import org.apache.fineract.cn.group.api.v1.domain.Meeting;
+import org.apache.fineract.cn.group.api.v1.domain.SignOffMeeting;
+import org.apache.fineract.cn.group.ServiceConstants;
+import org.apache.fineract.cn.group.internal.command.ActivateGroupCommand;
+import org.apache.fineract.cn.group.internal.command.CloseGroupCommand;
+import org.apache.fineract.cn.group.internal.command.CreateGroupCommand;
+import org.apache.fineract.cn.group.internal.command.ReopenGroupCommand;
+import org.apache.fineract.cn.group.internal.command.SignOffMeetingCommand;
+import 
org.apache.fineract.cn.group.internal.command.UpdateAssignedEmployeeCommand;
+import org.apache.fineract.cn.group.internal.command.UpdateLeadersCommand;
+import org.apache.fineract.cn.group.internal.command.UpdateMembersCommand;
+import org.apache.fineract.cn.group.internal.service.GroupDefinitionService;
+import org.apache.fineract.cn.group.internal.service.GroupService;
+import java.util.List;
+import java.util.Set;
+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.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -55,10 +58,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Set;
-
 @RestController
 @RequestMapping("/groups")
 public class GroupRestController {
diff --git 
a/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java
 
b/service/src/main/java/org/apache/fineract/cn/group/rest/MigrationRestController.java
similarity index 85%
rename from 
service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java
rename to 
service/src/main/java/org/apache/fineract/cn/group/rest/MigrationRestController.java
index efc4886..9bc8f92 100644
--- 
a/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java
+++ 
b/service/src/main/java/org/apache/fineract/cn/group/rest/MigrationRestController.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.rest;
+package org.apache.fineract.cn.group.rest;
 
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.command.InitializeServiceCommand;
+import org.apache.fineract.cn.group.ServiceConstants;
+import org.apache.fineract.cn.group.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.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;


 

----------------------------------------------------------------
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