You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by aw...@apache.org on 2019/09/03 07:25:41 UTC

[fineract-cn-group] 15/46: Change package names from mifos to apache fineract.

This is an automated email from the ASF dual-hosted git repository.

awasum pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-group.git

commit a0988fc30c1f3592f496944619035e1c32dc8729
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Mon Apr 16 13:12:53 2018 +0200

    Change package names from mifos to apache fineract.
---
 .../fineract/cn}/group/api/v1/EventConstants.java  |  2 +-
 .../group/api/v1/client/GroupAlreadyExists.java    |  2 +-
 .../v1/client/GroupDefinitionAlreadyExists.java    |  2 +-
 .../api/v1/client/GroupDefinitionNotFound.java     |  2 +-
 .../api/v1/client/GroupDefinitionValidation.java   |  2 +-
 .../cn}/group/api/v1/client/GroupManager.java      | 16 +++---
 .../api/v1/client/GroupNotFoundException.java      |  2 +-
 .../api/v1/client/GroupValidationException.java    |  2 +-
 .../fineract/cn}/group/api/v1/domain/Address.java  |  2 +-
 .../api/v1/domain/AssignedEmployeeHolder.java      |  2 +-
 .../fineract/cn}/group/api/v1/domain/Attendee.java |  2 +-
 .../fineract/cn}/group/api/v1/domain/Cycle.java    |  2 +-
 .../fineract/cn}/group/api/v1/domain/Group.java    |  2 +-
 .../cn}/group/api/v1/domain/GroupCommand.java      |  2 +-
 .../cn}/group/api/v1/domain/GroupDefinition.java   |  2 +-
 .../cn}/group/api/v1/domain/GroupPage.java         |  2 +-
 .../fineract/cn}/group/api/v1/domain/Meeting.java  |  2 +-
 .../cn}/group/api/v1/domain/SignOffMeeting.java    |  2 +-
 .../apache/fineract/cn}/group/TestGroup.java       | 32 +++++------
 .../fineract/cn}/group/TestGroupDefinition.java    | 16 +++---
 .../listener/GroupDefinitionEventListener.java     |  4 +-
 .../cn}/group/listener/GroupEventListener.java     |  4 +-
 .../cn}/group/listener/MigrationEventListener.java |  4 +-
 .../cn}/group/util/GroupDefinitionGenerator.java   |  6 +--
 .../fineract/cn}/group/util/GroupGenerator.java    |  6 +--
 .../cn}/group/service/GroupApplication.java        |  2 +-
 .../cn}/group/service/GroupConfiguration.java      | 12 ++---
 .../cn}/group/service/ServiceConstants.java        |  2 +-
 .../internal/command/ActivateGroupCommand.java     |  4 +-
 .../internal/command/CloseGroupCommand.java        |  4 +-
 .../internal/command/CreateGroupCommand.java       |  4 +-
 .../command/CreateGroupDefinitionCommand.java      |  4 +-
 .../internal/command/InitializeServiceCommand.java |  2 +-
 .../internal/command/ReopenGroupCommand.java       |  4 +-
 .../internal/command/SignOffMeetingCommand.java    |  4 +-
 .../command/UpdateAssignedEmployeeCommand.java     |  2 +-
 .../internal/command/UpdateLeadersCommand.java     |  2 +-
 .../internal/command/UpdateMembersCommand.java     |  2 +-
 .../internal/command/handler/GroupAggregate.java   | 62 +++++++++++-----------
 .../command/handler/MigrationAggregate.java        |  8 +--
 .../service/internal/mapper/AddressMapper.java     |  6 +--
 .../service/internal/mapper/AttendeeMapper.java    |  6 +--
 .../internal/mapper/GroupCommandMapper.java        |  6 +--
 .../internal/mapper/GroupDefinitionMapper.java     |  8 +--
 .../group/service/internal/mapper/GroupMapper.java |  6 +--
 .../service/internal/mapper/MeetingMapper.java     |  6 +--
 .../service/internal/repository/AddressEntity.java |  2 +-
 .../internal/repository/AddressRepository.java     |  2 +-
 .../internal/repository/AttendeeEntity.java        |  2 +-
 .../internal/repository/AttendeeRepository.java    |  2 +-
 .../internal/repository/GroupCommandEntity.java    |  2 +-
 .../repository/GroupCommandRepository.java         |  2 +-
 .../internal/repository/GroupDefinitionEntity.java |  2 +-
 .../repository/GroupDefinitionRepository.java      |  2 +-
 .../service/internal/repository/GroupEntity.java   |  2 +-
 .../internal/repository/GroupRepository.java       |  2 +-
 .../service/internal/repository/MeetingEntity.java |  2 +-
 .../internal/repository/MeetingRepository.java     |  2 +-
 .../internal/service/GroupDefinitionService.java   | 10 ++--
 .../service/internal/service/GroupService.java     | 34 ++++++------
 .../rest/GroupDefinitionRestController.java        | 10 ++--
 .../group/service/rest/GroupRestController.java    | 36 ++++++-------
 .../service/rest/MigrationRestController.java      |  6 +--
 63 files changed, 199 insertions(+), 199 deletions(-)

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 93%
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 f393d58..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,15 +16,15 @@
  * 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;
 
-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.GroupDefinition;
-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 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;
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 93%
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 d918728..19df79c 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,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group;
-
-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.service.GroupConfiguration;
+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;
@@ -265,10 +265,10 @@ public class TestGroup {
 
   @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 92%
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 f78eb44..4af1087 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,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group;
+package org.apache.fineract.cn.group;
 
-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.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.service.GroupConfiguration;
+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;
@@ -130,10 +130,10 @@ public class TestGroupDefinition {
 
   @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 94%
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 3932eb8..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,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.listener;
+package org.apache.fineract.cn.group.listener;
 
-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;
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 96%
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 9020138..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,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.listener;
+package org.apache.fineract.cn.group.listener;
 
-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;
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 94%
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 c150fef..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,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.listener;
+package org.apache.fineract.cn.group.listener;
 
-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;
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/service/GroupApplication.java
similarity index 95%
rename from service/src/main/java/io/mifos/group/service/GroupApplication.java
rename to service/src/main/java/org/apache/fineract/cn/group/service/GroupApplication.java
index 10ead59..fc17f94 100644
--- a/service/src/main/java/io/mifos/group/service/GroupApplication.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service;
 
 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/service/GroupConfiguration.java
similarity index 87%
rename from service/src/main/java/io/mifos/group/service/GroupConfiguration.java
rename to service/src/main/java/org/apache/fineract/cn/group/service/GroupConfiguration.java
index 244716b..ee583e0 100644
--- a/service/src/main/java/io/mifos/group/service/GroupConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/GroupConfiguration.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.service;
 
 import org.apache.fineract.cn.anubis.config.EnableAnubis;
 import org.apache.fineract.cn.async.config.EnableAsync;
@@ -48,13 +48,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @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.service.rest",
+    "org.apache.fineract.cn.group.service.internal.service",
+    "org.apache.fineract.cn.group.service.internal.repository",
+    "org.apache.fineract.cn.group.service.internal.command.handler"
 })
 @EnableJpaRepositories({
-    "io.mifos.group.service.internal.repository"
+    "org.apache.fineract.cn.group.service.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/service/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/service/ServiceConstants.java
index 3f7f49d..de8f2ff 100644
--- a/service/src/main/java/io/mifos/group/service/ServiceConstants.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service;
 
 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/service/internal/command/ActivateGroupCommand.java
similarity index 90%
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/service/internal/command/ActivateGroupCommand.java
index a36da1a..1892d62 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/ActivateGroupCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/CloseGroupCommand.java
similarity index 90%
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/service/internal/command/CloseGroupCommand.java
index 496f296..43a6937 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/CloseGroupCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/CreateGroupCommand.java
similarity index 89%
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/service/internal/command/CreateGroupCommand.java
index 1f17643..a367a12 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/CreateGroupCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/CreateGroupDefinitionCommand.java
similarity index 89%
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/service/internal/command/CreateGroupDefinitionCommand.java
index 47561a8..c034284 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/CreateGroupDefinitionCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/InitializeServiceCommand.java
similarity index 93%
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/service/internal/command/InitializeServiceCommand.java
index e513bfd..8d65200 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/InitializeServiceCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/ReopenGroupCommand.java
similarity index 90%
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/service/internal/command/ReopenGroupCommand.java
index 38a60ca..f21e26a 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/ReopenGroupCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/SignOffMeetingCommand.java
similarity index 90%
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/service/internal/command/SignOffMeetingCommand.java
index 91cae9c..f67962d 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/SignOffMeetingCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/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/service/internal/command/UpdateAssignedEmployeeCommand.java
index 41763ee..f44d86b 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/UpdateAssignedEmployeeCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/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/service/internal/command/UpdateLeadersCommand.java
index add55ed..5a5fc72 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/UpdateLeadersCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/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/service/internal/command/UpdateMembersCommand.java
index 5b09287..dd4d86e 100644
--- a/service/src/main/java/io/mifos/group/service/internal/command/UpdateMembersCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/command/handler/GroupAggregate.java
similarity index 86%
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/service/internal/command/handler/GroupAggregate.java
index 5616337..3d99783 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/service/internal/command/handler/GroupAggregate.java
@@ -16,38 +16,38 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command.handler;
+package org.apache.fineract.cn.group.service.internal.command.handler;
 
-import io.mifos.group.api.v1.EventConstants;
-import io.mifos.group.api.v1.domain.Attendee;
-import io.mifos.group.api.v1.domain.Cycle;
-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.SignOffMeeting;
-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.mapper.AddressMapper;
-import io.mifos.group.service.internal.mapper.GroupCommandMapper;
-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 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.service.internal.command.ActivateGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.CloseGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.CreateGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.CreateGroupDefinitionCommand;
+import org.apache.fineract.cn.group.service.internal.command.ReopenGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.SignOffMeetingCommand;
+import org.apache.fineract.cn.group.service.internal.command.UpdateAssignedEmployeeCommand;
+import org.apache.fineract.cn.group.service.internal.command.UpdateLeadersCommand;
+import org.apache.fineract.cn.group.service.internal.command.UpdateMembersCommand;
+import org.apache.fineract.cn.group.service.internal.mapper.AddressMapper;
+import org.apache.fineract.cn.group.service.internal.mapper.GroupCommandMapper;
+import org.apache.fineract.cn.group.service.internal.repository.AddressEntity;
+import org.apache.fineract.cn.group.service.internal.repository.AddressRepository;
+import org.apache.fineract.cn.group.service.internal.repository.AttendeeEntity;
+import org.apache.fineract.cn.group.service.internal.repository.AttendeeRepository;
+import org.apache.fineract.cn.group.service.internal.repository.GroupCommandEntity;
+import org.apache.fineract.cn.group.service.internal.repository.GroupCommandRepository;
+import org.apache.fineract.cn.group.service.internal.repository.GroupDefinitionEntity;
+import org.apache.fineract.cn.group.service.internal.repository.GroupDefinitionRepository;
+import org.apache.fineract.cn.group.service.internal.repository.GroupEntity;
+import org.apache.fineract.cn.group.service.internal.repository.GroupRepository;
+import org.apache.fineract.cn.group.service.internal.repository.MeetingEntity;
+import org.apache.fineract.cn.group.service.internal.repository.MeetingRepository;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
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/service/internal/command/handler/MigrationAggregate.java
similarity index 88%
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/service/internal/command/handler/MigrationAggregate.java
index 64b546f..66fbd9e 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/service/internal/command/handler/MigrationAggregate.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.command.handler;
+package org.apache.fineract.cn.group.service.internal.command.handler;
 
-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.service.ServiceConstants;
+import org.apache.fineract.cn.group.service.internal.command.InitializeServiceCommand;
 import javax.sql.DataSource;
 import org.apache.fineract.cn.command.annotation.Aggregate;
 import org.apache.fineract.cn.command.annotation.CommandHandler;
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/service/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/service/internal/mapper/AddressMapper.java
index c9661e9..aad505e 100644
--- a/service/src/main/java/io/mifos/group/service/internal/mapper/AddressMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.internal.mapper;
 
-import io.mifos.group.service.internal.repository.AddressEntity;
-import io.mifos.group.api.v1.domain.Address;
+import org.apache.fineract.cn.group.service.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/service/internal/mapper/AttendeeMapper.java
similarity index 85%
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/service/internal/mapper/AttendeeMapper.java
index 3ebac1a..94be880 100644
--- a/service/src/main/java/io/mifos/group/service/internal/mapper/AttendeeMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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.service.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/service/internal/mapper/GroupCommandMapper.java
similarity index 90%
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/service/internal/mapper/GroupCommandMapper.java
index ec927c3..90b0027 100644
--- a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupCommandMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupCommandMapper.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.service.internal.mapper;
 
-import io.mifos.group.api.v1.domain.GroupCommand;
-import io.mifos.group.service.internal.repository.GroupCommandEntity;
+import org.apache.fineract.cn.group.api.v1.domain.GroupCommand;
+import org.apache.fineract.cn.group.service.internal.repository.GroupCommandEntity;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import org.apache.fineract.cn.api.util.UserContextHolder;
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/service/internal/mapper/GroupDefinitionMapper.java
similarity index 88%
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/service/internal/mapper/GroupDefinitionMapper.java
index 56126bc..2b33d43 100644
--- a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupDefinitionMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupDefinitionMapper.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.service.internal.mapper;
 
-import io.mifos.group.api.v1.domain.Cycle;
-import io.mifos.group.api.v1.domain.GroupDefinition;
-import io.mifos.group.service.internal.repository.GroupDefinitionEntity;
+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.service.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/service/internal/mapper/GroupMapper.java
similarity index 91%
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/service/internal/mapper/GroupMapper.java
index 3e6512c..45c40ef 100644
--- a/service/src/main/java/io/mifos/group/service/internal/mapper/GroupMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/GroupMapper.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.service.internal.mapper;
 
-import io.mifos.group.api.v1.domain.Group;
-import io.mifos.group.service.internal.repository.GroupEntity;
+import org.apache.fineract.cn.group.api.v1.domain.Group;
+import org.apache.fineract.cn.group.service.internal.repository.GroupEntity;
 import org.apache.fineract.cn.lang.DateConverter;
 import org.springframework.util.StringUtils;
 
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/service/internal/mapper/MeetingMapper.java
similarity index 89%
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/service/internal/mapper/MeetingMapper.java
index 122e882..2d91e1d 100644
--- a/service/src/main/java/io/mifos/group/service/internal/mapper/MeetingMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/mapper/MeetingMapper.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.service.internal.mapper;
 
-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.service.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/service/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/service/internal/repository/AddressEntity.java
index 10fb8dd..bbdde39 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/AddressEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/repository/AddressRepository.java
similarity index 93%
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/service/internal/repository/AddressRepository.java
index a6fbcff..03146b4 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/AddressRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/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/service/internal/repository/AttendeeEntity.java
index d0d525a..fa2d5d5 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/AttendeeEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/repository/AttendeeRepository.java
similarity index 94%
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/service/internal/repository/AttendeeRepository.java
index 1f590e1..d50fefd 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/AttendeeRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/repository/GroupCommandEntity.java
similarity index 97%
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/service/internal/repository/GroupCommandEntity.java
index df46f02..7f60768 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupCommandEntity.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.service.internal.repository;
 
 import java.time.LocalDateTime;
 import javax.persistence.Column;
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/service/internal/repository/GroupCommandRepository.java
similarity index 94%
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/service/internal/repository/GroupCommandRepository.java
index bfc208f..eef9d7f 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupCommandRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/repository/GroupDefinitionEntity.java
similarity index 98%
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/service/internal/repository/GroupDefinitionEntity.java
index 2fb1299..3f755b2 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupDefinitionEntity.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.service.internal.repository;
 
 import java.time.LocalDateTime;
 import javax.persistence.Column;
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/service/internal/repository/GroupDefinitionRepository.java
similarity index 94%
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/service/internal/repository/GroupDefinitionRepository.java
index 9d78198..74724ee 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupDefinitionRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/repository/GroupEntity.java
similarity index 98%
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/service/internal/repository/GroupEntity.java
index b99529a..7fc37df 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/GroupEntity.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.service.internal.repository;
 
 import java.time.LocalDateTime;
 import javax.persistence.Column;
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/service/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/service/internal/repository/GroupRepository.java
index d1e3d7e..0186fbf 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/GroupRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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/service/internal/repository/MeetingEntity.java
similarity index 98%
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/service/internal/repository/MeetingEntity.java
index 72c50b7..86c339f 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingEntity.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.service.internal.repository;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
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/service/internal/repository/MeetingRepository.java
similarity index 96%
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/service/internal/repository/MeetingRepository.java
index 4437e6e..e8125fe 100644
--- a/service/src/main/java/io/mifos/group/service/internal/repository/MeetingRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/repository/MeetingRepository.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.service.internal.repository;
 
 import java.time.LocalDate;
 import java.util.List;
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/service/internal/service/GroupDefinitionService.java
similarity index 84%
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/service/internal/service/GroupDefinitionService.java
index c691ae8..75e6bac 100644
--- a/service/src/main/java/io/mifos/group/service/internal/service/GroupDefinitionService.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/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.service.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.service.ServiceConstants;
+import org.apache.fineract.cn.group.service.internal.mapper.GroupDefinitionMapper;
+import org.apache.fineract.cn.group.service.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/service/internal/service/GroupService.java
similarity index 79%
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/service/internal/service/GroupService.java
index 8f3f680..d842714 100644
--- a/service/src/main/java/io/mifos/group/service/internal/service/GroupService.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/internal/service/GroupService.java
@@ -16,24 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.internal.service;
+package org.apache.fineract.cn.group.service.internal.service;
 
-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.AttendeeRepository;
-import io.mifos.group.service.internal.repository.GroupCommandRepository;
-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 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.service.ServiceConstants;
+import org.apache.fineract.cn.group.service.internal.mapper.AddressMapper;
+import org.apache.fineract.cn.group.service.internal.mapper.AttendeeMapper;
+import org.apache.fineract.cn.group.service.internal.mapper.GroupCommandMapper;
+import org.apache.fineract.cn.group.service.internal.mapper.GroupMapper;
+import org.apache.fineract.cn.group.service.internal.mapper.MeetingMapper;
+import org.apache.fineract.cn.group.service.internal.repository.AttendeeRepository;
+import org.apache.fineract.cn.group.service.internal.repository.GroupCommandRepository;
+import org.apache.fineract.cn.group.service.internal.repository.GroupEntity;
+import org.apache.fineract.cn.group.service.internal.repository.GroupRepository;
+import org.apache.fineract.cn.group.service.internal.repository.MeetingEntity;
+import org.apache.fineract.cn.group.service.internal.repository.MeetingRepository;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.util.List;
diff --git a/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java b/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupDefinitionRestController.java
similarity index 91%
rename from service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java
rename to service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupDefinitionRestController.java
index 8cee95f..075427f 100644
--- a/service/src/main/java/io/mifos/group/service/rest/GroupDefinitionRestController.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupDefinitionRestController.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.rest;
+package org.apache.fineract.cn.group.service.rest;
 
-import io.mifos.group.api.v1.domain.GroupDefinition;
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.command.CreateGroupDefinitionCommand;
-import io.mifos.group.service.internal.service.GroupDefinitionService;
+import org.apache.fineract.cn.group.api.v1.domain.GroupDefinition;
+import org.apache.fineract.cn.group.service.ServiceConstants;
+import org.apache.fineract.cn.group.service.internal.command.CreateGroupDefinitionCommand;
+import org.apache.fineract.cn.group.service.internal.service.GroupDefinitionService;
 import java.util.List;
 import javax.validation.Valid;
 import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
diff --git a/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java b/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupRestController.java
similarity index 88%
rename from service/src/main/java/io/mifos/group/service/rest/GroupRestController.java
rename to service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupRestController.java
index 9e25f64..51e66cd 100644
--- a/service/src/main/java/io/mifos/group/service/rest/GroupRestController.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/rest/GroupRestController.java
@@ -16,25 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.rest;
+package org.apache.fineract.cn.group.service.rest;
 
-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.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.service.GroupDefinitionService;
-import io.mifos.group.service.internal.service.GroupService;
+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.service.ServiceConstants;
+import org.apache.fineract.cn.group.service.internal.command.ActivateGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.CloseGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.CreateGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.ReopenGroupCommand;
+import org.apache.fineract.cn.group.service.internal.command.SignOffMeetingCommand;
+import org.apache.fineract.cn.group.service.internal.command.UpdateAssignedEmployeeCommand;
+import org.apache.fineract.cn.group.service.internal.command.UpdateLeadersCommand;
+import org.apache.fineract.cn.group.service.internal.command.UpdateMembersCommand;
+import org.apache.fineract.cn.group.service.internal.service.GroupDefinitionService;
+import org.apache.fineract.cn.group.service.internal.service.GroupService;
 import java.util.List;
 import java.util.Set;
 import javax.validation.Valid;
diff --git a/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java b/service/src/main/java/org/apache/fineract/cn/group/service/rest/MigrationRestController.java
similarity index 92%
rename from service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java
rename to service/src/main/java/org/apache/fineract/cn/group/service/rest/MigrationRestController.java
index a1342cc..ebd850e 100644
--- a/service/src/main/java/io/mifos/group/service/rest/MigrationRestController.java
+++ b/service/src/main/java/org/apache/fineract/cn/group/service/rest/MigrationRestController.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.group.service.rest;
+package org.apache.fineract.cn.group.service.rest;
 
-import io.mifos.group.service.ServiceConstants;
-import io.mifos.group.service.internal.command.InitializeServiceCommand;
+import org.apache.fineract.cn.group.service.ServiceConstants;
+import org.apache.fineract.cn.group.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;