[GitHub] myrle-krantz closed pull request #4: Updating package names.

[GitBox <gi...@apache.org>]

myrle-krantz closed pull request #4: Updating package names.
URL: https://github.com/apache/fineract-cn-teller/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 d3ad0f9..134376d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Apache Fineract CN Teller
 
-[![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 management and operational functionality for teller operation.
 
 ## Versioning
diff --git a/api/src/main/java/io/mifos/teller/api/v1/EventConstants.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/EventConstants.java
similarity index 98%
rename from api/src/main/java/io/mifos/teller/api/v1/EventConstants.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/EventConstants.java
index 44c99db..787f901 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/EventConstants.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/EventConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1;
+package org.apache.fineract.cn.teller.api.v1;
 
 @SuppressWarnings("unused")
 public interface EventConstants {
diff --git a/api/src/main/java/io/mifos/teller/api/v1/PermittableGroupIds.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/PermittableGroupIds.java
similarity index 95%
rename from api/src/main/java/io/mifos/teller/api/v1/PermittableGroupIds.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/PermittableGroupIds.java
index cf469db..de6c9d3 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/PermittableGroupIds.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/PermittableGroupIds.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1;
+package org.apache.fineract.cn.teller.api.v1;
 
 @SuppressWarnings("unused")
 public interface PermittableGroupIds {
diff --git a/api/src/main/java/io/mifos/teller/api/v1/client/TellerAlreadyExistsException.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerAlreadyExistsException.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/client/TellerAlreadyExistsException.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerAlreadyExistsException.java
index 1e767e4..a68b6d3 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/client/TellerAlreadyExistsException.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerAlreadyExistsException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.client;
+package org.apache.fineract.cn.teller.api.v1.client;
 
 public class TellerAlreadyExistsException extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/teller/api/v1/client/TellerManager.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java
similarity index 93%
rename from api/src/main/java/io/mifos/teller/api/v1/client/TellerManager.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java
index bdbb46b..0d5fb79 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/client/TellerManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java
@@ -16,18 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.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.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerBalanceSheet;
-import io.mifos.teller.api.v1.domain.TellerDenomination;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
+package org.apache.fineract.cn.teller.api.v1.client;
+
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerBalanceSheet;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
+import java.util.List;
+import javax.validation.Valid;
+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;
@@ -37,9 +39,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.Valid;
-import java.util.List;
-
 @FeignClient(value = "teller-v1", path = "/teller/v1", configuration = CustomFeignClientsConfiguration.class)
 public interface TellerManager {
 
diff --git a/api/src/main/java/io/mifos/teller/api/v1/client/TellerNotFoundException.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerNotFoundException.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/client/TellerNotFoundException.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerNotFoundException.java
index c447064..305dc69 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/client/TellerNotFoundException.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerNotFoundException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.client;
+package org.apache.fineract.cn.teller.api.v1.client;
 
 public class TellerNotFoundException extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/teller/api/v1/client/TellerTransactionValidationException.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerTransactionValidationException.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/client/TellerTransactionValidationException.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerTransactionValidationException.java
index f71f5e0..d4f483d 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/client/TellerTransactionValidationException.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerTransactionValidationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.client;
+package org.apache.fineract.cn.teller.api.v1.client;
 
 public class TellerTransactionValidationException extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/teller/api/v1/client/TellerValidationException.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerValidationException.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/client/TellerValidationException.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerValidationException.java
index b14e9d2..3d9d6fc 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/client/TellerValidationException.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerValidationException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.client;
+package org.apache.fineract.cn.teller.api.v1.client;
 
 public class TellerValidationException extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/teller/api/v1/client/TransactionProcessingException.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TransactionProcessingException.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/client/TransactionProcessingException.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TransactionProcessingException.java
index 1dcaa75..54270e6 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/client/TransactionProcessingException.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TransactionProcessingException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.client;
+package org.apache.fineract.cn.teller.api.v1.client;
 
 public class TransactionProcessingException extends RuntimeException {
 }
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/Charge.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Charge.java
similarity index 97%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/Charge.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Charge.java
index 780e187..7ca460a 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/Charge.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Charge.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/Cheque.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Cheque.java
similarity index 97%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/Cheque.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Cheque.java
index e7e6fa5..102192a 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/Cheque.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Cheque.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/MICR.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/MICR.java
similarity index 92%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/MICR.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/MICR.java
index 3529c62..c49046d 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/MICR.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/MICR.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 
 public class MICR {
   @ValidIdentifier(maxLength = 8)
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/Teller.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Teller.java
similarity index 97%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/Teller.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Teller.java
index d3c3a94..b4c45e3 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/Teller.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/Teller.java
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
-
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-import org.hibernate.validator.constraints.NotEmpty;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
+import java.math.BigDecimal;
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
-import java.math.BigDecimal;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
+import org.hibernate.validator.constraints.NotEmpty;
 
 public class Teller {
 
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerBalanceSheet.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerBalanceSheet.java
similarity index 98%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/TellerBalanceSheet.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerBalanceSheet.java
index cffd482..25ec970 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerBalanceSheet.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerBalanceSheet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerDenomination.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerDenomination.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/TellerDenomination.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerDenomination.java
index 8fed0bb..0588377 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerDenomination.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerDenomination.java
@@ -16,13 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import javax.validation.constraints.NotNull;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
+import org.hibernate.validator.constraints.Range;
 
 public class TellerDenomination {
 
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerEntry.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerEntry.java
similarity index 97%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/TellerEntry.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerEntry.java
index 4ce6d1e..fdad718 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerEntry.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerEntry.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerManagementCommand.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerManagementCommand.java
similarity index 94%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/TellerManagementCommand.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerManagementCommand.java
index 46e73f1..51ad607 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerManagementCommand.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerManagementCommand.java
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
-
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
+import java.math.BigDecimal;
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 
 public class TellerManagementCommand {
 
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerTransaction.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerTransaction.java
similarity index 96%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/TellerTransaction.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerTransaction.java
index 9c5c8b0..8838ea3 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerTransaction.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerTransaction.java
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
-
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
+import java.math.BigDecimal;
 import javax.validation.Valid;
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 
 public class TellerTransaction {
 
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerTransactionCosts.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerTransactionCosts.java
similarity index 97%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/TellerTransactionCosts.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerTransactionCosts.java
index d8652da..d8754b4 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/TellerTransactionCosts.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/TellerTransactionCosts.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
diff --git a/api/src/main/java/io/mifos/teller/api/v1/domain/UnlockDrawerCommand.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/UnlockDrawerCommand.java
similarity index 96%
rename from api/src/main/java/io/mifos/teller/api/v1/domain/UnlockDrawerCommand.java
rename to api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/UnlockDrawerCommand.java
index 54120fc..1d248e2 100644
--- a/api/src/main/java/io/mifos/teller/api/v1/domain/UnlockDrawerCommand.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/domain/UnlockDrawerCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.api.v1.domain;
+package org.apache.fineract.cn.teller.api.v1.domain;
 
 public class UnlockDrawerCommand {
 
diff --git a/component-test/src/main/java/io/mifos/teller/AbstractTellerTest.java b/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java
similarity index 78%
rename from component-test/src/main/java/io/mifos/teller/AbstractTellerTest.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java
index c481a1e..0ca44cd 100644
--- a/component-test/src/main/java/io/mifos/teller/AbstractTellerTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java
@@ -16,21 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
-
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.lang.ApplicationName;
-import io.mifos.core.test.fixture.TenantDataStoreContextTestRule;
-import io.mifos.core.test.listener.EnableEventRecording;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.client.TellerManager;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import io.mifos.teller.service.internal.service.helper.ChequeService;
-import io.mifos.teller.service.internal.service.helper.DepositAccountManagementService;
-import io.mifos.teller.service.internal.service.helper.OrganizationService;
-import io.mifos.teller.service.internal.service.helper.PortfolioService;
+package org.apache.fineract.cn.teller;
+
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.client.TellerManager;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.ChequeService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.DepositAccountManagementService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.OrganizationService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.PortfolioService;
+import java.security.interfaces.RSAPrivateKey;
+import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.lang.ApplicationName;
+import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule;
+import org.apache.fineract.cn.test.listener.EnableEventRecording;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -50,8 +51,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.security.interfaces.RSAPrivateKey;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
@@ -63,10 +62,10 @@
 
   @Configuration
   @EnableEventRecording
-  @EnableFeignClients(basePackages = {"io.mifos.teller.api.v1.client"})
+  @EnableFeignClients(basePackages = {"org.apache.fineract.cn.teller.api.v1.client"})
   @RibbonClient(name = APP_NAME)
   @Import({TellerConfiguration.class})
-  @ComponentScan("io.mifos.teller.listener")
+  @ComponentScan("org.apache.fineract.cn.teller.listener")
   public static class TestConfiguration {
     public TestConfiguration() {
       super();
diff --git a/component-test/src/main/java/io/mifos/teller/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java
similarity index 86%
rename from component-test/src/main/java/io/mifos/teller/SuiteTestEnvironment.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java
index c36bbb5..60a8e4f 100644
--- a/component-test/src/main/java/io/mifos/teller/SuiteTestEnvironment.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.cassandra.CassandraInitializer;
-import io.mifos.core.test.fixture.mariadb.MariaDBInitializer;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer;
+import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer;
 import org.junit.ClassRule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.RunExternalResourceOnce;
diff --git a/component-test/src/main/java/io/mifos/teller/TestSuite.java b/component-test/src/main/java/org/apache/fineract/cn/teller/TestSuite.java
similarity index 96%
rename from component-test/src/main/java/io/mifos/teller/TestSuite.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/TestSuite.java
index 54bdb50..5a8e507 100644
--- a/component-test/src/main/java/io/mifos/teller/TestSuite.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/TestSuite.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/component-test/src/main/java/io/mifos/teller/TestTellerBalance.java b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerBalance.java
similarity index 89%
rename from component-test/src/main/java/io/mifos/teller/TestTellerBalance.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerBalance.java
index db1317e..bfc7b0c 100644
--- a/component-test/src/main/java/io/mifos/teller/TestTellerBalance.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerBalance.java
@@ -16,34 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
 import com.google.common.collect.Lists;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.accounting.api.v1.domain.AccountEntry;
-import io.mifos.accounting.api.v1.domain.AccountEntryPage;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.domain.Cheque;
-import io.mifos.teller.api.v1.domain.MICR;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerBalanceSheet;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
-import io.mifos.teller.util.TellerGenerator;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Cheque;
+import org.apache.fineract.cn.teller.api.v1.domain.MICR;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerBalanceSheet;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
+import org.apache.fineract.cn.teller.util.TellerGenerator;
 import java.math.BigDecimal;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Optional;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntry;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntryPage;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
 
 public class TestTellerBalance extends AbstractTellerTest {
 
diff --git a/component-test/src/main/java/io/mifos/teller/TestTellerDenomination.java b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerDenomination.java
similarity index 93%
rename from component-test/src/main/java/io/mifos/teller/TestTellerDenomination.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerDenomination.java
index 9e47ce4..bdbbb68 100644
--- a/component-test/src/main/java/io/mifos/teller/TestTellerDenomination.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerDenomination.java
@@ -16,32 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
 import com.google.common.collect.Lists;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.accounting.api.v1.domain.AccountEntry;
-import io.mifos.accounting.api.v1.domain.AccountEntryPage;
-import io.mifos.accounting.api.v1.domain.JournalEntry;
-import io.mifos.core.lang.DateRange;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.client.TellerValidationException;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerDenomination;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
-import io.mifos.teller.util.TellerGenerator;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.client.TellerValidationException;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
+import org.apache.fineract.cn.teller.util.TellerGenerator;
 import java.math.BigDecimal;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntry;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntryPage;
+import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry;
+import org.apache.fineract.cn.lang.DateRange;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
 
 public class TestTellerDenomination extends AbstractTellerTest {
 
diff --git a/component-test/src/main/java/io/mifos/teller/TestTellerManagement.java b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerManagement.java
similarity index 98%
rename from component-test/src/main/java/io/mifos/teller/TestTellerManagement.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerManagement.java
index 3b8e581..daf69b3 100644
--- a/component-test/src/main/java/io/mifos/teller/TestTellerManagement.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerManagement.java
@@ -16,28 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
-
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.client.TellerAlreadyExistsException;
-import io.mifos.teller.api.v1.client.TellerNotFoundException;
-import io.mifos.teller.api.v1.client.TellerValidationException;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerBalanceSheet;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.util.TellerGenerator;
+package org.apache.fineract.cn.teller;
+
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.client.TellerAlreadyExistsException;
+import org.apache.fineract.cn.teller.api.v1.client.TellerNotFoundException;
+import org.apache.fineract.cn.teller.api.v1.client.TellerValidationException;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerBalanceSheet;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.util.TellerGenerator;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
 public class TestTellerManagement extends AbstractTellerTest {
 
   public TestTellerManagement() {
diff --git a/component-test/src/main/java/io/mifos/teller/TestTellerOperation.java b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerOperation.java
similarity index 96%
rename from component-test/src/main/java/io/mifos/teller/TestTellerOperation.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerOperation.java
index 977d36b..24af820 100644
--- a/component-test/src/main/java/io/mifos/teller/TestTellerOperation.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/TestTellerOperation.java
@@ -16,40 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
 import com.google.common.collect.Lists;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.deposit.api.v1.definition.domain.ProductDefinition;
-import io.mifos.deposit.api.v1.instance.domain.ProductInstance;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.client.TellerNotFoundException;
-import io.mifos.teller.api.v1.client.TellerTransactionValidationException;
-import io.mifos.teller.api.v1.client.TransactionProcessingException;
-import io.mifos.teller.api.v1.domain.Charge;
-import io.mifos.teller.api.v1.domain.Cheque;
-import io.mifos.teller.api.v1.domain.MICR;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
-import io.mifos.teller.service.internal.service.helper.ChequeService;
-import io.mifos.teller.util.TellerGenerator;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.client.TellerNotFoundException;
+import org.apache.fineract.cn.teller.api.v1.client.TellerTransactionValidationException;
+import org.apache.fineract.cn.teller.api.v1.client.TransactionProcessingException;
+import org.apache.fineract.cn.teller.api.v1.domain.Charge;
+import org.apache.fineract.cn.teller.api.v1.domain.Cheque;
+import org.apache.fineract.cn.teller.api.v1.domain.MICR;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
+import org.apache.fineract.cn.teller.service.internal.service.helper.ChequeService;
+import org.apache.fineract.cn.teller.util.TellerGenerator;
 import java.math.BigDecimal;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.Optional;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.deposit.api.v1.definition.domain.ProductDefinition;
+import org.apache.fineract.cn.deposit.api.v1.instance.domain.ProductInstance;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
 
 public class TestTellerOperation extends AbstractTellerTest {
 
diff --git a/component-test/src/main/java/io/mifos/teller/listener/MigrationEventListener.java b/component-test/src/main/java/org/apache/fineract/cn/teller/listener/MigrationEventListener.java
similarity index 87%
rename from component-test/src/main/java/io/mifos/teller/listener/MigrationEventListener.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/listener/MigrationEventListener.java
index dc5fcae..b863dc8 100644
--- a/component-test/src/main/java/io/mifos/teller/listener/MigrationEventListener.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/listener/MigrationEventListener.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.listener;
+package org.apache.fineract.cn.teller.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.teller.AbstractTellerTest;
-import io.mifos.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.AbstractTellerTest;
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/component-test/src/main/java/io/mifos/teller/listener/TellerEventListener.java b/component-test/src/main/java/org/apache/fineract/cn/teller/listener/TellerEventListener.java
similarity index 95%
rename from component-test/src/main/java/io/mifos/teller/listener/TellerEventListener.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/listener/TellerEventListener.java
index 0053a96..899b30f 100644
--- a/component-test/src/main/java/io/mifos/teller/listener/TellerEventListener.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/listener/TellerEventListener.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.listener;
+package org.apache.fineract.cn.teller.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
-import io.mifos.teller.AbstractTellerTest;
-import io.mifos.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.AbstractTellerTest;
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jms.annotation.JmsListener;
diff --git a/component-test/src/main/java/io/mifos/teller/util/TellerGenerator.java b/component-test/src/main/java/org/apache/fineract/cn/teller/util/TellerGenerator.java
similarity index 93%
rename from component-test/src/main/java/io/mifos/teller/util/TellerGenerator.java
rename to component-test/src/main/java/org/apache/fineract/cn/teller/util/TellerGenerator.java
index 01ee6f6..cecf6b0 100644
--- a/component-test/src/main/java/io/mifos/teller/util/TellerGenerator.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/util/TellerGenerator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.util;
+package org.apache.fineract.cn.teller.util;
 
-import io.mifos.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
 import org.apache.commons.lang3.RandomStringUtils;
 
 import java.math.BigDecimal;
diff --git a/service/src/main/java/io/mifos/teller/ServiceConstants.java b/service/src/main/java/org/apache/fineract/cn/teller/ServiceConstants.java
similarity index 97%
rename from service/src/main/java/io/mifos/teller/ServiceConstants.java
rename to service/src/main/java/org/apache/fineract/cn/teller/ServiceConstants.java
index b5e797f..242eccd 100644
--- a/service/src/main/java/io/mifos/teller/ServiceConstants.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/ServiceConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
 public interface ServiceConstants {
   String LOGGER_NAME = "teller-logger";
diff --git a/service/src/main/java/io/mifos/teller/TellerApplication.java b/service/src/main/java/org/apache/fineract/cn/teller/TellerApplication.java
similarity index 96%
rename from service/src/main/java/io/mifos/teller/TellerApplication.java
rename to service/src/main/java/org/apache/fineract/cn/teller/TellerApplication.java
index 3fbc404..e3c00d9 100644
--- a/service/src/main/java/io/mifos/teller/TellerApplication.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/TellerApplication.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
 import org.springframework.boot.SpringApplication;
 
diff --git a/service/src/main/java/io/mifos/teller/TellerConfiguration.java b/service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java
similarity index 65%
rename from service/src/main/java/io/mifos/teller/TellerConfiguration.java
rename to service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java
index e53f45a..5f8fec6 100644
--- a/service/src/main/java/io/mifos/teller/TellerConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller;
+package org.apache.fineract.cn.teller;
 
-import io.mifos.accounting.api.v1.client.LedgerManager;
-import io.mifos.anubis.config.EnableAnubis;
-import io.mifos.cheque.api.v1.client.ChequeManager;
-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 io.mifos.deposit.api.v1.client.DepositAccountManager;
-import io.mifos.office.api.v1.client.OrganizationManager;
-import io.mifos.portfolio.api.v1.client.PortfolioManager;
-import io.mifos.tool.crypto.config.EnableCrypto;
+import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager;
+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.cheque.api.v1.client.ChequeManager;
+import org.apache.fineract.cn.command.config.EnableCommandProcessing;
+import org.apache.fineract.cn.crypto.config.EnableCrypto;
+import org.apache.fineract.cn.deposit.api.v1.client.DepositAccountManager;
+import org.apache.fineract.cn.lang.config.EnableServiceException;
+import org.apache.fineract.cn.lang.config.EnableTenantContext;
+import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
+import org.apache.fineract.cn.office.api.v1.client.OrganizationManager;
+import org.apache.fineract.cn.portfolio.api.v1.client.PortfolioManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -65,14 +65,14 @@
     }
 )
 @ComponentScan({
-    "io.mifos.teller.service.rest",
-    "io.mifos.teller.service.internal.service",
-    "io.mifos.teller.service.internal.repository",
-    "io.mifos.teller.service.internal.command.handler",
-    "io.mifos.teller.service.internal.processor"
+    "org.apache.fineract.cn.teller.service.rest",
+    "org.apache.fineract.cn.teller.service.internal.service",
+    "org.apache.fineract.cn.teller.service.internal.repository",
+    "org.apache.fineract.cn.teller.service.internal.command.handler",
+    "org.apache.fineract.cn.teller.service.internal.processor"
 })
 @EnableJpaRepositories({
-    "io.mifos.teller.service.internal.repository"
+    "org.apache.fineract.cn.teller.service.internal.repository"
 })
 public class TellerConfiguration extends WebMvcConfigurerAdapter {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/CancelTellerTransactionCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CancelTellerTransactionCommand.java
similarity index 94%
rename from service/src/main/java/io/mifos/teller/service/internal/command/CancelTellerTransactionCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CancelTellerTransactionCommand.java
index b6c323e..1fe39fe 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/CancelTellerTransactionCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CancelTellerTransactionCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
 public class CancelTellerTransactionCommand {
   private final String tellerTransactionIdentifier;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/ChangeTellerCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/ChangeTellerCommand.java
similarity index 90%
rename from service/src/main/java/io/mifos/teller/service/internal/command/ChangeTellerCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/ChangeTellerCommand.java
index 8d6e6f7..e0aef61 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/ChangeTellerCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/ChangeTellerCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
 
 public class ChangeTellerCommand {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/CloseTellerCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CloseTellerCommand.java
similarity index 90%
rename from service/src/main/java/io/mifos/teller/service/internal/command/CloseTellerCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CloseTellerCommand.java
index 31f674e..ec1d996 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/CloseTellerCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CloseTellerCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
 
 public class CloseTellerCommand {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/ConfirmTellerTransactionCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/ConfirmTellerTransactionCommand.java
similarity index 95%
rename from service/src/main/java/io/mifos/teller/service/internal/command/ConfirmTellerTransactionCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/ConfirmTellerTransactionCommand.java
index fce71ae..5b3b26a 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/ConfirmTellerTransactionCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/ConfirmTellerTransactionCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
 public class ConfirmTellerTransactionCommand {
   private final String tellerTransactionIdentifier;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/CreateTellerCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CreateTellerCommand.java
similarity index 90%
rename from service/src/main/java/io/mifos/teller/service/internal/command/CreateTellerCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CreateTellerCommand.java
index 0c31b5c..6f94dbe 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/CreateTellerCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/CreateTellerCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
 
 public class CreateTellerCommand {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/DeleteTellerCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/DeleteTellerCommand.java
similarity index 94%
rename from service/src/main/java/io/mifos/teller/service/internal/command/DeleteTellerCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/DeleteTellerCommand.java
index 8108120..73030d9 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/DeleteTellerCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/DeleteTellerCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
 public class DeleteTellerCommand {
   private final String tellerCode;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/DrawerUnlockCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/DrawerUnlockCommand.java
similarity index 90%
rename from service/src/main/java/io/mifos/teller/service/internal/command/DrawerUnlockCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/DrawerUnlockCommand.java
index c839438..bde85bd 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/DrawerUnlockCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/DrawerUnlockCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
 
 public class DrawerUnlockCommand {
   private final String tellerCode;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/InitializeTellerTransactionCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/InitializeTellerTransactionCommand.java
similarity index 90%
rename from service/src/main/java/io/mifos/teller/service/internal/command/InitializeTellerTransactionCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/InitializeTellerTransactionCommand.java
index d24f8c6..17cb36d 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/InitializeTellerTransactionCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/InitializeTellerTransactionCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
 
 public class InitializeTellerTransactionCommand {
   private final String tellerCode;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/MigrationCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/MigrationCommand.java
similarity index 93%
rename from service/src/main/java/io/mifos/teller/service/internal/command/MigrationCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/MigrationCommand.java
index 0b66114..c7dc85d 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/MigrationCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/MigrationCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
 public class MigrationCommand {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/OpenTellerCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/OpenTellerCommand.java
similarity index 90%
rename from service/src/main/java/io/mifos/teller/service/internal/command/OpenTellerCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/OpenTellerCommand.java
index 95490b1..a12da9d 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/OpenTellerCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/OpenTellerCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
 
 public class OpenTellerCommand {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/PauseTellerCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/PauseTellerCommand.java
similarity index 94%
rename from service/src/main/java/io/mifos/teller/service/internal/command/PauseTellerCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/PauseTellerCommand.java
index 4a15e7a..4d9c7a2 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/PauseTellerCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/PauseTellerCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
 public class PauseTellerCommand {
   private final String tellerCode;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/TellerDenominationCommand.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/TellerDenominationCommand.java
similarity index 92%
rename from service/src/main/java/io/mifos/teller/service/internal/command/TellerDenominationCommand.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/TellerDenominationCommand.java
index 8b0d322..5449dec 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/TellerDenominationCommand.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/TellerDenominationCommand.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command;
+package org.apache.fineract.cn.teller.service.internal.command;
 
-import io.mifos.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
 
 import java.math.BigDecimal;
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/MigrationAggregate.java
similarity index 79%
rename from service/src/main/java/io/mifos/teller/service/internal/command/handler/MigrationAggregate.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/MigrationAggregate.java
index d81ae9c..783592f 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/handler/MigrationAggregate.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/MigrationAggregate.java
@@ -16,23 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command.handler;
+package org.apache.fineract.cn.teller.service.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.lang.ApplicationName;
-import io.mifos.core.mariadb.domain.FlywayFactoryBean;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.service.internal.command.MigrationCommand;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.service.internal.command.MigrationCommand;
+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.lang.ApplicationName;
+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;
-
 @Aggregate
 public class MigrationAggregate {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/handler/TellerAggregate.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/TellerAggregate.java
similarity index 88%
rename from service/src/main/java/io/mifos/teller/service/internal/command/handler/TellerAggregate.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/TellerAggregate.java
index 1bf6376..8deba25 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/handler/TellerAggregate.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/TellerAggregate.java
@@ -16,53 +16,52 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.command.handler;
+package org.apache.fineract.cn.teller.service.internal.command.handler;
 
 import com.google.common.collect.Sets;
-import io.mifos.accounting.api.v1.domain.Creditor;
-import io.mifos.accounting.api.v1.domain.Debtor;
-import io.mifos.accounting.api.v1.domain.JournalEntry;
-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.teller.ServiceConstants;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerDenomination;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
-import io.mifos.teller.service.internal.command.ChangeTellerCommand;
-import io.mifos.teller.service.internal.command.CloseTellerCommand;
-import io.mifos.teller.service.internal.command.CreateTellerCommand;
-import io.mifos.teller.service.internal.command.DeleteTellerCommand;
-import io.mifos.teller.service.internal.command.DrawerUnlockCommand;
-import io.mifos.teller.service.internal.command.OpenTellerCommand;
-import io.mifos.teller.service.internal.command.PauseTellerCommand;
-import io.mifos.teller.service.internal.command.TellerDenominationCommand;
-import io.mifos.teller.service.internal.mapper.TellerMapper;
-import io.mifos.teller.service.internal.repository.TellerDenominationEntity;
-import io.mifos.teller.service.internal.repository.TellerDenominationRepository;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import io.mifos.teller.service.internal.service.helper.OrganizationService;
-import io.mifos.tool.crypto.HashGenerator;
-import io.mifos.tool.crypto.SaltGenerator;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.ChangeTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.CloseTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.CreateTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.DeleteTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.DrawerUnlockCommand;
+import org.apache.fineract.cn.teller.service.internal.command.OpenTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.PauseTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.TellerDenominationCommand;
+import org.apache.fineract.cn.teller.service.internal.mapper.TellerMapper;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerDenominationEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerDenominationRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.OrganizationService;
+import java.math.BigDecimal;
+import java.time.Clock;
+import java.time.LocalDateTime;
+import java.util.Optional;
 import org.apache.commons.lang.RandomStringUtils;
+import org.apache.fineract.cn.accounting.api.v1.domain.Creditor;
+import org.apache.fineract.cn.accounting.api.v1.domain.Debtor;
+import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry;
+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.crypto.HashGenerator;
+import org.apache.fineract.cn.crypto.SaltGenerator;
+import org.apache.fineract.cn.lang.DateConverter;
+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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
 
-import java.math.BigDecimal;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.Optional;
-
 @Aggregate
 public class TellerAggregate {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/command/handler/TellerTransactionAggregate.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/TellerTransactionAggregate.java
similarity index 80%
rename from service/src/main/java/io/mifos/teller/service/internal/command/handler/TellerTransactionAggregate.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/TellerTransactionAggregate.java
index 83b3cf3..a9034be 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/command/handler/TellerTransactionAggregate.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/command/handler/TellerTransactionAggregate.java
@@ -16,38 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.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.lang.DateConverter;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.EventConstants;
-import io.mifos.teller.api.v1.domain.Cheque;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.service.internal.command.CancelTellerTransactionCommand;
-import io.mifos.teller.service.internal.command.ConfirmTellerTransactionCommand;
-import io.mifos.teller.service.internal.command.InitializeTellerTransactionCommand;
-import io.mifos.teller.service.internal.mapper.ChequeMapper;
-import io.mifos.teller.service.internal.mapper.TellerTransactionMapper;
-import io.mifos.teller.service.internal.processor.TellerTransactionProcessor;
-import io.mifos.teller.service.internal.repository.ChequeEntity;
-import io.mifos.teller.service.internal.repository.ChequeRepository;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.repository.TellerTransactionEntity;
-import io.mifos.teller.service.internal.repository.TellerTransactionRepository;
+package org.apache.fineract.cn.teller.service.internal.command.handler;
+
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.EventConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Cheque;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.service.internal.command.CancelTellerTransactionCommand;
+import org.apache.fineract.cn.teller.service.internal.command.ConfirmTellerTransactionCommand;
+import org.apache.fineract.cn.teller.service.internal.command.InitializeTellerTransactionCommand;
+import org.apache.fineract.cn.teller.service.internal.mapper.ChequeMapper;
+import org.apache.fineract.cn.teller.service.internal.mapper.TellerTransactionMapper;
+import org.apache.fineract.cn.teller.service.internal.processor.TellerTransactionProcessor;
+import org.apache.fineract.cn.teller.service.internal.repository.ChequeEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.ChequeRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionRepository;
+import java.sql.Date;
+import java.util.Optional;
 import org.apache.commons.lang.RandomStringUtils;
+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.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Date;
-import java.util.Optional;
-
 @Aggregate
 public class TellerTransactionAggregate {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/mapper/ChequeMapper.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/ChequeMapper.java
similarity index 77%
rename from service/src/main/java/io/mifos/teller/service/internal/mapper/ChequeMapper.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/ChequeMapper.java
index ebaccbb..618fa80 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/mapper/ChequeMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/ChequeMapper.java
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.mapper;
+package org.apache.fineract.cn.teller.service.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.teller.api.v1.domain.Cheque;
-import io.mifos.teller.api.v1.domain.MICR;
-import io.mifos.teller.service.internal.repository.ChequeEntity;
+import org.apache.fineract.cn.teller.api.v1.domain.Cheque;
+import org.apache.fineract.cn.teller.api.v1.domain.MICR;
+import org.apache.fineract.cn.teller.service.internal.repository.ChequeEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class ChequeMapper {
   private ChequeMapper() {
     super();
   }
 
-  public static io.mifos.cheque.api.v1.domain.Cheque map(final Cheque tellerCheque) {
-    final io.mifos.cheque.api.v1.domain.Cheque cheque = new io.mifos.cheque.api.v1.domain.Cheque();
+  public static org.apache.fineract.cn.cheque.api.v1.domain.Cheque map(final Cheque tellerCheque) {
+    final org.apache.fineract.cn.cheque.api.v1.domain.Cheque cheque = new org.apache.fineract.cn.cheque.api.v1.domain.Cheque();
 
     final MICR tellerChequeMicr = tellerCheque.getMicr();
-    final io.mifos.cheque.api.v1.domain.MICR micr = new io.mifos.cheque.api.v1.domain.MICR();
+    final org.apache.fineract.cn.cheque.api.v1.domain.MICR micr = new org.apache.fineract.cn.cheque.api.v1.domain.MICR();
     micr.setChequeNumber(tellerChequeMicr.getChequeNumber());
     micr.setBranchSortCode(tellerChequeMicr.getBranchSortCode());
     micr.setAccountNumber(tellerChequeMicr.getAccountNumber());
diff --git a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerDenominationMapper.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerDenominationMapper.java
similarity index 84%
rename from service/src/main/java/io/mifos/teller/service/internal/mapper/TellerDenominationMapper.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerDenominationMapper.java
index d99a697..f467b7f 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerDenominationMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerDenominationMapper.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.mapper;
+package org.apache.fineract.cn.teller.service.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.teller.api.v1.domain.TellerDenomination;
-import io.mifos.teller.service.internal.repository.TellerDenominationEntity;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerDenominationEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class TellerDenominationMapper {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerEntryMapper.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerEntryMapper.java
similarity index 87%
rename from service/src/main/java/io/mifos/teller/service/internal/mapper/TellerEntryMapper.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerEntryMapper.java
index 7434169..eba5019 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerEntryMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerEntryMapper.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.mapper;
-
-import io.mifos.accounting.api.v1.domain.AccountEntry;
-import io.mifos.teller.api.v1.domain.TellerEntry;
+package org.apache.fineract.cn.teller.service.internal.mapper;
 
+import org.apache.fineract.cn.teller.api.v1.domain.TellerEntry;
 import java.math.BigDecimal;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntry;
 
 public class TellerEntryMapper {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerMapper.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerMapper.java
similarity index 93%
rename from service/src/main/java/io/mifos/teller/service/internal/mapper/TellerMapper.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerMapper.java
index 1ce812b..1476590 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerMapper.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.mapper;
+package org.apache.fineract.cn.teller.service.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class TellerMapper {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerTransactionMapper.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerTransactionMapper.java
similarity index 92%
rename from service/src/main/java/io/mifos/teller/service/internal/mapper/TellerTransactionMapper.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerTransactionMapper.java
index 246f003..9db6921 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/mapper/TellerTransactionMapper.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/mapper/TellerTransactionMapper.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.mapper;
+package org.apache.fineract.cn.teller.service.internal.mapper;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.service.internal.repository.TellerTransactionEntity;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionEntity;
+import org.apache.fineract.cn.lang.DateConverter;
 
 public class TellerTransactionMapper {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/processor/ChequeTransactionHandler.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/ChequeTransactionHandler.java
similarity index 78%
rename from service/src/main/java/io/mifos/teller/service/internal/processor/ChequeTransactionHandler.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/ChequeTransactionHandler.java
index 6a1774e..1a186e2 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/processor/ChequeTransactionHandler.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/ChequeTransactionHandler.java
@@ -16,24 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.processor;
+package org.apache.fineract.cn.teller.service.internal.processor;
 
-import io.mifos.cheque.api.v1.domain.ChequeTransaction;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.service.internal.mapper.ChequeMapper;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import io.mifos.teller.service.internal.service.helper.ChequeService;
-import io.mifos.teller.service.internal.service.helper.DepositAccountManagementService;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.service.internal.mapper.ChequeMapper;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.ChequeService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.DepositAccountManagementService;
+import java.util.Optional;
+import org.apache.fineract.cn.cheque.api.v1.domain.ChequeTransaction;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import java.util.Optional;
-
 @Component
 public class ChequeTransactionHandler {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/processor/DepositTransactionHandler.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/DepositTransactionHandler.java
similarity index 91%
rename from service/src/main/java/io/mifos/teller/service/internal/processor/DepositTransactionHandler.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/DepositTransactionHandler.java
index ad7f045..5465400 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/processor/DepositTransactionHandler.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/DepositTransactionHandler.java
@@ -16,33 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.processor;
-
-import io.mifos.accounting.api.v1.domain.Creditor;
-import io.mifos.accounting.api.v1.domain.Debtor;
-import io.mifos.accounting.api.v1.domain.JournalEntry;
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.deposit.api.v1.definition.domain.ProductDefinition;
-import io.mifos.deposit.api.v1.instance.domain.ProductInstance;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.Charge;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import io.mifos.teller.service.internal.service.helper.DepositAccountManagementService;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
+package org.apache.fineract.cn.teller.service.internal.processor;
+
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Charge;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.DepositAccountManagementService;
 import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.apache.fineract.cn.accounting.api.v1.domain.Creditor;
+import org.apache.fineract.cn.accounting.api.v1.domain.Debtor;
+import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.deposit.api.v1.definition.domain.ProductDefinition;
+import org.apache.fineract.cn.deposit.api.v1.instance.domain.ProductInstance;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
 
 @Component
 public class DepositTransactionHandler {
diff --git a/service/src/main/java/io/mifos/teller/service/internal/processor/PortfolioTransactionHandler.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/PortfolioTransactionHandler.java
similarity index 83%
rename from service/src/main/java/io/mifos/teller/service/internal/processor/PortfolioTransactionHandler.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/PortfolioTransactionHandler.java
index 8de7706..d34a02c 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/processor/PortfolioTransactionHandler.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/PortfolioTransactionHandler.java
@@ -16,24 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.processor;
-
-import io.mifos.core.lang.ServiceException;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.Charge;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.service.helper.PortfolioService;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
+package org.apache.fineract.cn.teller.service.internal.processor;
 
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Charge;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.service.helper.PortfolioService;
 import java.math.BigDecimal;
 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.Qualifier;
+import org.springframework.stereotype.Component;
 
 @Component
 public class PortfolioTransactionHandler {
diff --git a/service/src/main/java/io/mifos/teller/service/internal/processor/TellerTransactionProcessor.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/TellerTransactionProcessor.java
similarity index 94%
rename from service/src/main/java/io/mifos/teller/service/internal/processor/TellerTransactionProcessor.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/TellerTransactionProcessor.java
index 485f725..8e6a04d 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/processor/TellerTransactionProcessor.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/processor/TellerTransactionProcessor.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.processor;
+package org.apache.fineract.cn.teller.service.internal.processor;
 
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
 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/teller/service/internal/repository/ChequeEntity.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/ChequeEntity.java
similarity index 98%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/ChequeEntity.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/ChequeEntity.java
index c79f508..ba52609 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/ChequeEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/ChequeEntity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/ChequeRepository.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/ChequeRepository.java
similarity index 94%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/ChequeRepository.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/ChequeRepository.java
index 16f74f0..476ef24 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/ChequeRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/ChequeRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerDenominationEntity.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerDenominationEntity.java
similarity index 95%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/TellerDenominationEntity.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerDenominationEntity.java
index c0e0d43..99645c0 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerDenominationEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerDenominationEntity.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -29,8 +29,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "tajet_teller_denominations")
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerDenominationRepository.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerDenominationRepository.java
similarity index 94%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/TellerDenominationRepository.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerDenominationRepository.java
index 34e4b8b..f29b0ad 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerDenominationRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerDenominationRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerEntity.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerEntity.java
similarity index 98%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/TellerEntity.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerEntity.java
index e6842be..57b3a84 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerEntity.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -27,8 +27,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "tajet_teller")
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerRepository.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerRepository.java
similarity index 95%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/TellerRepository.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerRepository.java
index 16b5c09..28bbbb2 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerTransactionEntity.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerTransactionEntity.java
similarity index 97%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/TellerTransactionEntity.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerTransactionEntity.java
index 717db69..7233be3 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerTransactionEntity.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerTransactionEntity.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
-
-import io.mifos.core.mariadb.util.LocalDateTimeConverter;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Convert;
@@ -31,8 +31,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import org.apache.fineract.cn.mariadb.util.LocalDateTimeConverter;
 
 @Entity
 @Table(name = "tajet_teller_transactions")
diff --git a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerTransactionRepository.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerTransactionRepository.java
similarity index 96%
rename from service/src/main/java/io/mifos/teller/service/internal/repository/TellerTransactionRepository.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerTransactionRepository.java
index f613274..180bd51 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/repository/TellerTransactionRepository.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/repository/TellerTransactionRepository.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.repository;
+package org.apache.fineract.cn.teller.service.internal.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/service/src/main/java/io/mifos/teller/service/internal/service/TellerManagementService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/TellerManagementService.java
similarity index 84%
rename from service/src/main/java/io/mifos/teller/service/internal/service/TellerManagementService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/TellerManagementService.java
index 8408065..ca69322 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/TellerManagementService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/TellerManagementService.java
@@ -16,28 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service;
-
-import io.mifos.accounting.api.v1.domain.AccountEntryPage;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerBalanceSheet;
-import io.mifos.teller.api.v1.domain.TellerDenomination;
-import io.mifos.teller.api.v1.domain.TellerEntry;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.service.internal.mapper.TellerDenominationMapper;
-import io.mifos.teller.service.internal.mapper.TellerEntryMapper;
-import io.mifos.teller.service.internal.mapper.TellerMapper;
-import io.mifos.teller.service.internal.repository.TellerDenominationRepository;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.repository.TellerTransactionEntity;
-import io.mifos.teller.service.internal.repository.TellerTransactionRepository;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+package org.apache.fineract.cn.teller.service.internal.service;
+
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerBalanceSheet;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerEntry;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.service.internal.mapper.TellerDenominationMapper;
+import org.apache.fineract.cn.teller.service.internal.mapper.TellerEntryMapper;
+import org.apache.fineract.cn.teller.service.internal.mapper.TellerMapper;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerDenominationRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionRepository;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
 import java.math.BigDecimal;
 import java.time.Clock;
 import java.time.LocalDate;
@@ -47,6 +42,10 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntryPage;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class TellerManagementService {
diff --git a/service/src/main/java/io/mifos/teller/service/internal/service/TellerOperationService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/TellerOperationService.java
similarity index 83%
rename from service/src/main/java/io/mifos/teller/service/internal/service/TellerOperationService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/TellerOperationService.java
index 461e253..f7e1fc3 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/TellerOperationService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/TellerOperationService.java
@@ -16,28 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service;
+package org.apache.fineract.cn.teller.service.internal.service;
 
-import io.mifos.core.lang.ServiceException;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.service.internal.mapper.ChequeMapper;
-import io.mifos.teller.service.internal.mapper.TellerTransactionMapper;
-import io.mifos.teller.service.internal.repository.ChequeEntity;
-import io.mifos.teller.service.internal.repository.ChequeRepository;
-import io.mifos.teller.service.internal.repository.TellerEntity;
-import io.mifos.teller.service.internal.repository.TellerRepository;
-import io.mifos.teller.service.internal.repository.TellerTransactionEntity;
-import io.mifos.teller.service.internal.repository.TellerTransactionRepository;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.service.internal.mapper.ChequeMapper;
+import org.apache.fineract.cn.teller.service.internal.mapper.TellerTransactionMapper;
+import org.apache.fineract.cn.teller.service.internal.repository.ChequeEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.ChequeRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerRepository;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionEntity;
+import org.apache.fineract.cn.teller.service.internal.repository.TellerTransactionRepository;
+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;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 
 @Service
 public class TellerOperationService {
diff --git a/service/src/main/java/io/mifos/teller/service/internal/service/helper/AccountingService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/AccountingService.java
similarity index 84%
rename from service/src/main/java/io/mifos/teller/service/internal/service/helper/AccountingService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/AccountingService.java
index 7c3124d..0989b1e 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/helper/AccountingService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/AccountingService.java
@@ -16,25 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service.helper;
+package org.apache.fineract.cn.teller.service.internal.service.helper;
 
-import io.mifos.accounting.api.v1.client.AccountNotFoundException;
-import io.mifos.accounting.api.v1.client.LedgerManager;
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.accounting.api.v1.domain.AccountCommand;
-import io.mifos.accounting.api.v1.domain.AccountEntryPage;
-import io.mifos.accounting.api.v1.domain.AccountPage;
-import io.mifos.accounting.api.v1.domain.JournalEntry;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import java.util.Optional;
+import org.apache.fineract.cn.accounting.api.v1.client.AccountNotFoundException;
+import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountCommand;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountEntryPage;
+import org.apache.fineract.cn.accounting.api.v1.domain.AccountPage;
+import org.apache.fineract.cn.accounting.api.v1.domain.JournalEntry;
+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;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 @Service
 public class AccountingService {
 
diff --git a/service/src/main/java/io/mifos/teller/service/internal/service/helper/ChequeService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/ChequeService.java
similarity index 84%
rename from service/src/main/java/io/mifos/teller/service/internal/service/helper/ChequeService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/ChequeService.java
index 6975f41..32c4b40 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/helper/ChequeService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/ChequeService.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service.helper;
+package org.apache.fineract.cn.teller.service.internal.service.helper;
 
-import io.mifos.cheque.api.v1.client.ChequeManager;
-import io.mifos.cheque.api.v1.domain.ChequeTransaction;
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.apache.fineract.cn.cheque.api.v1.client.ChequeManager;
+import org.apache.fineract.cn.cheque.api.v1.domain.ChequeTransaction;
 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/teller/service/internal/service/helper/DepositAccountManagementService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/DepositAccountManagementService.java
similarity index 85%
rename from service/src/main/java/io/mifos/teller/service/internal/service/helper/DepositAccountManagementService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/DepositAccountManagementService.java
index dbc8f63..6f7589a 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/helper/DepositAccountManagementService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/DepositAccountManagementService.java
@@ -16,21 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service.helper;
-
-import io.mifos.deposit.api.v1.EventConstants;
-import io.mifos.deposit.api.v1.client.DepositAccountManager;
-import io.mifos.deposit.api.v1.definition.domain.Action;
-import io.mifos.deposit.api.v1.definition.domain.ProductDefinition;
-import io.mifos.deposit.api.v1.instance.domain.ProductInstance;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.Charge;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
+package org.apache.fineract.cn.teller.service.internal.service.helper;
 
+import org.apache.fineract.cn.deposit.api.v1.definition.domain.Action;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Charge;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
@@ -38,6 +29,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import org.apache.fineract.cn.deposit.api.v1.EventConstants;
+import org.apache.fineract.cn.deposit.api.v1.client.DepositAccountManager;
+import org.apache.fineract.cn.deposit.api.v1.definition.domain.ProductDefinition;
+import org.apache.fineract.cn.deposit.api.v1.instance.domain.ProductInstance;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
 
 @Service
 public class DepositAccountManagementService {
@@ -71,7 +70,7 @@ public ProductInstance findProductInstance(final String accountIdentifier) {
     actions.forEach(action -> mappedActions.put(action.getIdentifier(), action));
 
     final MathContext mathContext = new MathContext(2, RoundingMode.HALF_EVEN);
-    final Set<io.mifos.deposit.api.v1.definition.domain.Charge> productCharges = productDefinition.getCharges();
+    final Set<org.apache.fineract.cn.deposit.api.v1.definition.domain.Charge> productCharges = productDefinition.getCharges();
     productCharges.forEach(productCharge -> {
       if (productCharge.getAmount() > 0.00D) {
         final Action action = mappedActions.get(productCharge.getActionIdentifier());
diff --git a/service/src/main/java/io/mifos/teller/service/internal/service/helper/OrganizationService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java
similarity index 87%
rename from service/src/main/java/io/mifos/teller/service/internal/service/helper/OrganizationService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java
index 633b7af..0a16743 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/helper/OrganizationService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service.helper;
+package org.apache.fineract.cn.teller.service.internal.service.helper;
 
-import io.mifos.office.api.v1.client.NotFoundException;
-import io.mifos.office.api.v1.client.OrganizationManager;
-import io.mifos.office.api.v1.domain.ExternalReference;
-import io.mifos.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.office.api.v1.client.NotFoundException;
+import org.apache.fineract.cn.office.api.v1.client.OrganizationManager;
+import org.apache.fineract.cn.office.api.v1.domain.ExternalReference;
 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/teller/service/internal/service/helper/PortfolioService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/PortfolioService.java
similarity index 79%
rename from service/src/main/java/io/mifos/teller/service/internal/service/helper/PortfolioService.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/PortfolioService.java
index 7f14cbc..d57e10b 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/service/helper/PortfolioService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/PortfolioService.java
@@ -16,34 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.service.helper;
+package org.apache.fineract.cn.teller.service.internal.service.helper;
 
 import com.google.common.collect.Sets;
-import io.mifos.core.api.util.NotFoundException;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.individuallending.api.v1.domain.product.AccountDesignators;
-import io.mifos.individuallending.api.v1.domain.workflow.Action;
-import io.mifos.office.api.v1.client.BadRequestException;
-import io.mifos.portfolio.api.v1.client.PortfolioManager;
-import io.mifos.portfolio.api.v1.domain.AccountAssignment;
-import io.mifos.portfolio.api.v1.domain.ChargeDefinition;
-import io.mifos.portfolio.api.v1.domain.Command;
-import io.mifos.portfolio.api.v1.domain.CostComponent;
-import io.mifos.portfolio.api.v1.domain.Payment;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.domain.Charge;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.domain.Charge;
 import java.math.BigDecimal;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.apache.fineract.cn.individuallending.api.v1.domain.product.AccountDesignators;
+import org.apache.fineract.cn.individuallending.api.v1.domain.workflow.Action;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.ServiceException;
+import org.apache.fineract.cn.office.api.v1.client.BadRequestException;
+import org.apache.fineract.cn.office.api.v1.client.NotFoundException;
+import org.apache.fineract.cn.portfolio.api.v1.client.PortfolioManager;
+import org.apache.fineract.cn.portfolio.api.v1.domain.AccountAssignment;
+import org.apache.fineract.cn.portfolio.api.v1.domain.ChargeDefinition;
+import org.apache.fineract.cn.portfolio.api.v1.domain.Command;
+import org.apache.fineract.cn.portfolio.api.v1.domain.CostComponent;
+import org.apache.fineract.cn.portfolio.api.v1.domain.Payment;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
 
 @Service
 public class PortfolioService {
@@ -86,7 +85,7 @@ public PortfolioService(@Qualifier(ServiceConstants.LOGGER_NAME) final Logger lo
           charges.add(charge);
         }
       });
-    } catch (final NotFoundException |  BadRequestException ex) {
+    } catch (final NotFoundException | BadRequestException ex) {
       throw ServiceException.internalError(
           "Could not fetch portfolio information, reason: {0}", ex.getCause() + " - " + ex.getMessage()
       );
diff --git a/service/src/main/java/io/mifos/teller/service/internal/util/MICRParser.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/util/MICRParser.java
similarity index 92%
rename from service/src/main/java/io/mifos/teller/service/internal/util/MICRParser.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/internal/util/MICRParser.java
index d25081d..3af99e9 100644
--- a/service/src/main/java/io/mifos/teller/service/internal/util/MICRParser.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/util/MICRParser.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.internal.util;
+package org.apache.fineract.cn.teller.service.internal.util;
 
-import io.mifos.teller.api.v1.domain.MICR;
+import org.apache.fineract.cn.teller.api.v1.domain.MICR;
 
 public class MICRParser {
   private static final String DELIMITER = "~";
diff --git a/service/src/main/java/io/mifos/teller/service/rest/TellerManagementRestController.java b/service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerManagementRestController.java
similarity index 89%
rename from service/src/main/java/io/mifos/teller/service/rest/TellerManagementRestController.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerManagementRestController.java
index c582560..5a5560d 100644
--- a/service/src/main/java/io/mifos/teller/service/rest/TellerManagementRestController.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerManagementRestController.java
@@ -16,29 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.rest;
-
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.DateRange;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.PermittableGroupIds;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerBalanceSheet;
-import io.mifos.teller.api.v1.domain.TellerDenomination;
-import io.mifos.teller.api.v1.domain.TellerManagementCommand;
-import io.mifos.teller.service.internal.command.ChangeTellerCommand;
-import io.mifos.teller.service.internal.command.CloseTellerCommand;
-import io.mifos.teller.service.internal.command.CreateTellerCommand;
-import io.mifos.teller.service.internal.command.DeleteTellerCommand;
-import io.mifos.teller.service.internal.command.OpenTellerCommand;
-import io.mifos.teller.service.internal.command.TellerDenominationCommand;
-import io.mifos.teller.service.internal.service.TellerManagementService;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import io.mifos.teller.service.internal.service.helper.OrganizationService;
+package org.apache.fineract.cn.teller.service.rest;
+
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.PermittableGroupIds;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerBalanceSheet;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerDenomination;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerManagementCommand;
+import org.apache.fineract.cn.teller.service.internal.command.ChangeTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.CloseTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.CreateTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.DeleteTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.OpenTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.TellerDenominationCommand;
+import org.apache.fineract.cn.teller.service.internal.service.TellerManagementService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.OrganizationService;
+import java.time.Clock;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+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.DateConverter;
+import org.apache.fineract.cn.lang.DateRange;
+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;
@@ -52,13 +58,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.time.Clock;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
 @RestController
 @RequestMapping("/offices/{officeIdentifier}/teller")
 public class TellerManagementRestController {
diff --git a/service/src/main/java/io/mifos/teller/service/rest/TellerOperationRestController.java b/service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerOperationRestController.java
similarity index 88%
rename from service/src/main/java/io/mifos/teller/service/rest/TellerOperationRestController.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerOperationRestController.java
index 5e89362..6273ffc 100644
--- a/service/src/main/java/io/mifos/teller/service/rest/TellerOperationRestController.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerOperationRestController.java
@@ -16,36 +16,41 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.rest;
-
-import io.mifos.accounting.api.v1.domain.Account;
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.api.util.UserContextHolder;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.ServiceException;
-import io.mifos.deposit.api.v1.definition.domain.ProductDefinition;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.api.v1.PermittableGroupIds;
-import io.mifos.teller.api.v1.domain.MICR;
-import io.mifos.teller.api.v1.domain.Teller;
-import io.mifos.teller.api.v1.domain.TellerTransaction;
-import io.mifos.teller.api.v1.domain.TellerTransactionCosts;
-import io.mifos.teller.api.v1.domain.UnlockDrawerCommand;
-import io.mifos.teller.service.internal.command.CancelTellerTransactionCommand;
-import io.mifos.teller.service.internal.command.ConfirmTellerTransactionCommand;
-import io.mifos.teller.service.internal.command.DrawerUnlockCommand;
-import io.mifos.teller.service.internal.command.InitializeTellerTransactionCommand;
-import io.mifos.teller.service.internal.command.PauseTellerCommand;
-import io.mifos.teller.service.internal.processor.TellerTransactionProcessor;
-import io.mifos.teller.service.internal.service.TellerManagementService;
-import io.mifos.teller.service.internal.service.TellerOperationService;
-import io.mifos.teller.service.internal.service.helper.AccountingService;
-import io.mifos.teller.service.internal.service.helper.ChequeService;
-import io.mifos.teller.service.internal.service.helper.DepositAccountManagementService;
-import io.mifos.teller.service.internal.service.helper.OrganizationService;
-import io.mifos.teller.service.internal.util.MICRParser;
+package org.apache.fineract.cn.teller.service.rest;
+
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.api.v1.PermittableGroupIds;
+import org.apache.fineract.cn.teller.api.v1.domain.MICR;
+import org.apache.fineract.cn.teller.api.v1.domain.Teller;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransaction;
+import org.apache.fineract.cn.teller.api.v1.domain.TellerTransactionCosts;
+import org.apache.fineract.cn.teller.api.v1.domain.UnlockDrawerCommand;
+import org.apache.fineract.cn.teller.service.internal.command.CancelTellerTransactionCommand;
+import org.apache.fineract.cn.teller.service.internal.command.ConfirmTellerTransactionCommand;
+import org.apache.fineract.cn.teller.service.internal.command.DrawerUnlockCommand;
+import org.apache.fineract.cn.teller.service.internal.command.InitializeTellerTransactionCommand;
+import org.apache.fineract.cn.teller.service.internal.command.PauseTellerCommand;
+import org.apache.fineract.cn.teller.service.internal.processor.TellerTransactionProcessor;
+import org.apache.fineract.cn.teller.service.internal.service.TellerManagementService;
+import org.apache.fineract.cn.teller.service.internal.service.TellerOperationService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.AccountingService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.ChequeService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.DepositAccountManagementService;
+import org.apache.fineract.cn.teller.service.internal.service.helper.OrganizationService;
+import org.apache.fineract.cn.teller.service.internal.util.MICRParser;
+import java.math.BigDecimal;
+import java.time.Clock;
+import java.time.LocalDate;
+import java.util.List;
+import javax.validation.Valid;
+import org.apache.fineract.cn.accounting.api.v1.domain.Account;
+import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.api.util.UserContextHolder;
+import org.apache.fineract.cn.command.gateway.CommandGateway;
+import org.apache.fineract.cn.deposit.api.v1.definition.domain.ProductDefinition;
+import org.apache.fineract.cn.lang.DateConverter;
+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;
@@ -59,12 +64,6 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.time.Clock;
-import java.time.LocalDate;
-import java.util.List;
-
 @RestController
 @RequestMapping("/teller/{tellerCode}")
 public class TellerOperationRestController {
diff --git a/service/src/main/java/io/mifos/teller/service/rest/TellerRestController.java b/service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerRestController.java
similarity index 84%
rename from service/src/main/java/io/mifos/teller/service/rest/TellerRestController.java
rename to service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerRestController.java
index 9fe63e4..c1e29a2 100644
--- a/service/src/main/java/io/mifos/teller/service/rest/TellerRestController.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/rest/TellerRestController.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.teller.service.rest;
+package org.apache.fineract.cn.teller.service.rest;
 
-import io.mifos.anubis.annotation.AcceptedTokenType;
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.command.gateway.CommandGateway;
-import io.mifos.teller.ServiceConstants;
-import io.mifos.teller.service.internal.command.MigrationCommand;
+import org.apache.fineract.cn.teller.ServiceConstants;
+import org.apache.fineract.cn.teller.service.internal.command.MigrationCommand;
+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.Qualifier;
 import org.springframework.http.MediaType;


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services