Merge pull request #7 from myrle-krantz/develop

Updating package names.
diff --git a/README.md b/README.md
index d4cabf1..0f06399 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # Apache Fineract CN Lang
 
-[![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)
-
 ## Abstract
 Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world.
 
diff --git a/src/main/java/io/mifos/core/lang/ApplicationName.java b/src/main/java/org/apache/fineract/cn/lang/ApplicationName.java
similarity index 93%
rename from src/main/java/io/mifos/core/lang/ApplicationName.java
rename to src/main/java/org/apache/fineract/cn/lang/ApplicationName.java
index e93060c..0503108 100644
--- a/src/main/java/io/mifos/core/lang/ApplicationName.java
+++ b/src/main/java/org/apache/fineract/cn/lang/ApplicationName.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -45,7 +45,7 @@
 
   static ApplicationName parse(final String springApplicationNameString) {
     if (springApplicationNameString.length() > 64) {
-      throw new IllegalArgumentException("Spring application name strings for mifos io applications should be 64 characters or less.");
+      throw new IllegalArgumentException("Spring application name strings for Apache Fineract CN applications should be 64 characters or less.");
     }
 
     final Pattern applicationNamePattern = Pattern.compile(
@@ -54,7 +54,7 @@
     final Matcher applicationNameMatcher = applicationNamePattern.matcher(springApplicationNameString);
     if (!applicationNameMatcher.matches()) {
       throw new IllegalArgumentException(
-          "This is not a spring application name string for a mifos io application: "
+          "This is not a spring application name string for an Apache Fineract CN application: "
               + springApplicationNameString);
     }
     String versionString = applicationNameMatcher.group("version");
diff --git a/src/main/java/io/mifos/core/lang/AutoTenantContext.java b/src/main/java/org/apache/fineract/cn/lang/AutoTenantContext.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/AutoTenantContext.java
rename to src/main/java/org/apache/fineract/cn/lang/AutoTenantContext.java
index 4867b10..5200d05 100644
--- a/src/main/java/io/mifos/core/lang/AutoTenantContext.java
+++ b/src/main/java/org/apache/fineract/cn/lang/AutoTenantContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import java.util.Optional;
 
diff --git a/src/main/java/io/mifos/core/lang/DateConverter.java b/src/main/java/org/apache/fineract/cn/lang/DateConverter.java
similarity index 98%
rename from src/main/java/io/mifos/core/lang/DateConverter.java
rename to src/main/java/org/apache/fineract/cn/lang/DateConverter.java
index 689fb84..a378a64 100644
--- a/src/main/java/io/mifos/core/lang/DateConverter.java
+++ b/src/main/java/org/apache/fineract/cn/lang/DateConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/io/mifos/core/lang/DateOfBirth.java b/src/main/java/org/apache/fineract/cn/lang/DateOfBirth.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/DateOfBirth.java
rename to src/main/java/org/apache/fineract/cn/lang/DateOfBirth.java
index 7886896..f6f980d 100644
--- a/src/main/java/io/mifos/core/lang/DateOfBirth.java
+++ b/src/main/java/org/apache/fineract/cn/lang/DateOfBirth.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import java.time.LocalDate;
 
diff --git a/src/main/java/io/mifos/core/lang/DateRange.java b/src/main/java/org/apache/fineract/cn/lang/DateRange.java
similarity index 98%
rename from src/main/java/io/mifos/core/lang/DateRange.java
rename to src/main/java/org/apache/fineract/cn/lang/DateRange.java
index a8316e4..789eff7 100644
--- a/src/main/java/io/mifos/core/lang/DateRange.java
+++ b/src/main/java/org/apache/fineract/cn/lang/DateRange.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/io/mifos/core/lang/ServiceError.java b/src/main/java/org/apache/fineract/cn/lang/ServiceError.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/ServiceError.java
rename to src/main/java/org/apache/fineract/cn/lang/ServiceError.java
index e859d14..716b5d4 100644
--- a/src/main/java/io/mifos/core/lang/ServiceError.java
+++ b/src/main/java/org/apache/fineract/cn/lang/ServiceError.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 @SuppressWarnings("WeakerAccess")
 public final class ServiceError {
diff --git a/src/main/java/io/mifos/core/lang/ServiceException.java b/src/main/java/org/apache/fineract/cn/lang/ServiceException.java
similarity index 98%
rename from src/main/java/io/mifos/core/lang/ServiceException.java
rename to src/main/java/org/apache/fineract/cn/lang/ServiceException.java
index 880dd14..2b224e4 100644
--- a/src/main/java/io/mifos/core/lang/ServiceException.java
+++ b/src/main/java/org/apache/fineract/cn/lang/ServiceException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import java.text.MessageFormat;
 
diff --git a/src/main/java/io/mifos/core/lang/TenantContextHolder.java b/src/main/java/org/apache/fineract/cn/lang/TenantContextHolder.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/TenantContextHolder.java
rename to src/main/java/org/apache/fineract/cn/lang/TenantContextHolder.java
index ad2a36f..f90aab0 100644
--- a/src/main/java/io/mifos/core/lang/TenantContextHolder.java
+++ b/src/main/java/org/apache/fineract/cn/lang/TenantContextHolder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java b/src/main/java/org/apache/fineract/cn/lang/config/ApplicationNameConfiguration.java
similarity index 92%
rename from src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java
rename to src/main/java/org/apache/fineract/cn/lang/config/ApplicationNameConfiguration.java
index c466de3..b652587 100644
--- a/src/main/java/io/mifos/core/lang/config/ApplicationNameConfiguration.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/ApplicationNameConfiguration.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
-import io.mifos.core.lang.ApplicationName;
+import org.apache.fineract.cn.lang.ApplicationName;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/io/mifos/core/lang/config/EnableApplicationName.java b/src/main/java/org/apache/fineract/cn/lang/config/EnableApplicationName.java
similarity index 96%
rename from src/main/java/io/mifos/core/lang/config/EnableApplicationName.java
rename to src/main/java/org/apache/fineract/cn/lang/config/EnableApplicationName.java
index 753ef71..da644e2 100644
--- a/src/main/java/io/mifos/core/lang/config/EnableApplicationName.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/EnableApplicationName.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/src/main/java/io/mifos/core/lang/config/EnableServiceException.java b/src/main/java/org/apache/fineract/cn/lang/config/EnableServiceException.java
similarity index 96%
rename from src/main/java/io/mifos/core/lang/config/EnableServiceException.java
rename to src/main/java/org/apache/fineract/cn/lang/config/EnableServiceException.java
index 058f0b2..abe3af9 100644
--- a/src/main/java/io/mifos/core/lang/config/EnableServiceException.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/EnableServiceException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/src/main/java/io/mifos/core/lang/config/EnableTenantContext.java b/src/main/java/org/apache/fineract/cn/lang/config/EnableTenantContext.java
similarity index 96%
rename from src/main/java/io/mifos/core/lang/config/EnableTenantContext.java
rename to src/main/java/org/apache/fineract/cn/lang/config/EnableTenantContext.java
index c07f630..5ad7625 100644
--- a/src/main/java/io/mifos/core/lang/config/EnableTenantContext.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/EnableTenantContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java b/src/main/java/org/apache/fineract/cn/lang/config/ServiceExceptionFilter.java
similarity index 93%
rename from src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java
rename to src/main/java/org/apache/fineract/cn/lang/config/ServiceExceptionFilter.java
index a998b05..d4afef5 100644
--- a/src/main/java/io/mifos/core/lang/config/ServiceExceptionFilter.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/ServiceExceptionFilter.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
-import io.mifos.core.lang.ServiceError;
-import io.mifos.core.lang.ServiceException;
+import org.apache.fineract.cn.lang.ServiceError;
+import org.apache.fineract.cn.lang.ServiceException;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.util.NestedServletException;
 
diff --git a/src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java b/src/main/java/org/apache/fineract/cn/lang/config/ServiceExceptionJavaConfiguration.java
similarity index 96%
rename from src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java
rename to src/main/java/org/apache/fineract/cn/lang/config/ServiceExceptionJavaConfiguration.java
index 83cdf08..6582ae3 100644
--- a/src/main/java/io/mifos/core/lang/config/ServiceExceptionJavaConfiguration.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/ServiceExceptionJavaConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java b/src/main/java/org/apache/fineract/cn/lang/config/TenantContextJavaConfiguration.java
similarity index 96%
rename from src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java
rename to src/main/java/org/apache/fineract/cn/lang/config/TenantContextJavaConfiguration.java
index 320793b..d406334 100644
--- a/src/main/java/io/mifos/core/lang/config/TenantContextJavaConfiguration.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/TenantContextJavaConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java b/src/main/java/org/apache/fineract/cn/lang/config/TenantHeaderFilter.java
similarity index 94%
rename from src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java
rename to src/main/java/org/apache/fineract/cn/lang/config/TenantHeaderFilter.java
index be1c18d..dcda038 100644
--- a/src/main/java/io/mifos/core/lang/config/TenantHeaderFilter.java
+++ b/src/main/java/org/apache/fineract/cn/lang/config/TenantHeaderFilter.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
-import io.mifos.core.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.TenantContextHolder;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
diff --git a/src/main/java/io/mifos/core/lang/listening/EventExpectation.java b/src/main/java/org/apache/fineract/cn/lang/listening/EventExpectation.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/listening/EventExpectation.java
rename to src/main/java/org/apache/fineract/cn/lang/listening/EventExpectation.java
index a75807a..e80b836 100644
--- a/src/main/java/io/mifos/core/lang/listening/EventExpectation.java
+++ b/src/main/java/org/apache/fineract/cn/lang/listening/EventExpectation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.listening;
+package org.apache.fineract.cn.lang.listening;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
diff --git a/src/main/java/io/mifos/core/lang/listening/EventKey.java b/src/main/java/org/apache/fineract/cn/lang/listening/EventKey.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/listening/EventKey.java
rename to src/main/java/org/apache/fineract/cn/lang/listening/EventKey.java
index 9e29c0c..ee2d49f 100644
--- a/src/main/java/io/mifos/core/lang/listening/EventKey.java
+++ b/src/main/java/org/apache/fineract/cn/lang/listening/EventKey.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.listening;
+package org.apache.fineract.cn.lang.listening;
 
 import java.util.Objects;
 
diff --git a/src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java b/src/main/java/org/apache/fineract/cn/lang/listening/TenantedEventListener.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java
rename to src/main/java/org/apache/fineract/cn/lang/listening/TenantedEventListener.java
index 4b81e98..8a37f1f 100644
--- a/src/main/java/io/mifos/core/lang/listening/TenantedEventListener.java
+++ b/src/main/java/org/apache/fineract/cn/lang/listening/TenantedEventListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.listening;
+package org.apache.fineract.cn.lang.listening;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java b/src/main/java/org/apache/fineract/cn/lang/security/RsaKeyPairFactory.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java
rename to src/main/java/org/apache/fineract/cn/lang/security/RsaKeyPairFactory.java
index ab9fe4c..4b816ed 100644
--- a/src/main/java/io/mifos/core/lang/security/RsaKeyPairFactory.java
+++ b/src/main/java/org/apache/fineract/cn/lang/security/RsaKeyPairFactory.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.security;
+package org.apache.fineract.cn.lang.security;
 
-import io.mifos.core.lang.DateConverter;
+import org.apache.fineract.cn.lang.DateConverter;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;
diff --git a/src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java b/src/main/java/org/apache/fineract/cn/lang/security/RsaPrivateKeyBuilder.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java
rename to src/main/java/org/apache/fineract/cn/lang/security/RsaPrivateKeyBuilder.java
index 76617bb..f6c1613 100644
--- a/src/main/java/io/mifos/core/lang/security/RsaPrivateKeyBuilder.java
+++ b/src/main/java/org/apache/fineract/cn/lang/security/RsaPrivateKeyBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.security;
+package org.apache.fineract.cn.lang.security;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;
diff --git a/src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java b/src/main/java/org/apache/fineract/cn/lang/security/RsaPublicKeyBuilder.java
similarity index 97%
rename from src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java
rename to src/main/java/org/apache/fineract/cn/lang/security/RsaPublicKeyBuilder.java
index 765d3c2..42c4fbd 100644
--- a/src/main/java/io/mifos/core/lang/security/RsaPublicKeyBuilder.java
+++ b/src/main/java/org/apache/fineract/cn/lang/security/RsaPublicKeyBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.security;
+package org.apache.fineract.cn.lang.security;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java b/src/main/java/org/apache/fineract/cn/lang/validation/CheckApplicationName.java
similarity index 88%
rename from src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/CheckApplicationName.java
index 7bf61e6..dd7e641 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckApplicationName.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/CheckApplicationName.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.ApplicationName;
-import io.mifos.core.lang.validation.constraints.ValidApplicationName;
+import org.apache.fineract.cn.lang.ApplicationName;
+import org.apache.fineract.cn.lang.validation.constraints.ValidApplicationName;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java b/src/main/java/org/apache/fineract/cn/lang/validation/CheckIdentifier.java
similarity index 94%
rename from src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/CheckIdentifier.java
index 049b3a3..905bc4b 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckIdentifier.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/CheckIdentifier.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java b/src/main/java/org/apache/fineract/cn/lang/validation/CheckIdentifiers.java
similarity index 92%
rename from src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/CheckIdentifiers.java
index 5c4a668..756dd50 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckIdentifiers.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/CheckIdentifiers.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifiers;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifiers;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java b/src/main/java/org/apache/fineract/cn/lang/validation/CheckLocalDateTimeString.java
similarity index 88%
rename from src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/CheckLocalDateTimeString.java
index 858e96e..10d5dcd 100644
--- a/src/main/java/io/mifos/core/lang/validation/CheckLocalDateTimeString.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/CheckLocalDateTimeString.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.validation.constraints.ValidLocalDateTimeString;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.validation.constraints.ValidLocalDateTimeString;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidApplicationName.java
similarity index 92%
rename from src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidApplicationName.java
index 28e74a9..9c24bf2 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidApplicationName.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidApplicationName.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation.constraints;
+package org.apache.fineract.cn.lang.validation.constraints;
 
-import io.mifos.core.lang.validation.CheckApplicationName;
+import org.apache.fineract.cn.lang.validation.CheckApplicationName;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidIdentifier.java
similarity index 92%
rename from src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidIdentifier.java
index 4720248..fed5b09 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifier.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidIdentifier.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation.constraints;
+package org.apache.fineract.cn.lang.validation.constraints;
 
-import io.mifos.core.lang.validation.CheckIdentifier;
+import org.apache.fineract.cn.lang.validation.CheckIdentifier;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidIdentifiers.java
similarity index 92%
rename from src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidIdentifiers.java
index 8b0f04a..ed53e33 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidIdentifiers.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidIdentifiers.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation.constraints;
+package org.apache.fineract.cn.lang.validation.constraints;
 
-import io.mifos.core.lang.validation.CheckIdentifiers;
+import org.apache.fineract.cn.lang.validation.CheckIdentifiers;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidLocalDateTimeString.java
similarity index 92%
rename from src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java
rename to src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidLocalDateTimeString.java
index 789b99c..ad28c28 100644
--- a/src/main/java/io/mifos/core/lang/validation/constraints/ValidLocalDateTimeString.java
+++ b/src/main/java/org/apache/fineract/cn/lang/validation/constraints/ValidLocalDateTimeString.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation.constraints;
+package org.apache.fineract.cn.lang.validation.constraints;
 
-import io.mifos.core.lang.validation.CheckLocalDateTimeString;
+import org.apache.fineract.cn.lang.validation.CheckLocalDateTimeString;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/src/test/java/io/mifos/core/lang/ApplicationNameTest.java b/src/test/java/org/apache/fineract/cn/lang/ApplicationNameTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/lang/ApplicationNameTest.java
rename to src/test/java/org/apache/fineract/cn/lang/ApplicationNameTest.java
index 0ba4836..bad222b 100644
--- a/src/test/java/io/mifos/core/lang/ApplicationNameTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/ApplicationNameTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/AutoTenantContextTest.java b/src/test/java/org/apache/fineract/cn/lang/AutoTenantContextTest.java
similarity index 97%
rename from src/test/java/io/mifos/core/lang/AutoTenantContextTest.java
rename to src/test/java/org/apache/fineract/cn/lang/AutoTenantContextTest.java
index 6265b47..3f18fe0 100644
--- a/src/test/java/io/mifos/core/lang/AutoTenantContextTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/AutoTenantContextTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/DateConverterTest.java b/src/test/java/org/apache/fineract/cn/lang/DateConverterTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/lang/DateConverterTest.java
rename to src/test/java/org/apache/fineract/cn/lang/DateConverterTest.java
index 0469676..8240de1 100644
--- a/src/test/java/io/mifos/core/lang/DateConverterTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/DateConverterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/DateRangeTest.java b/src/test/java/org/apache/fineract/cn/lang/DateRangeTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/lang/DateRangeTest.java
rename to src/test/java/org/apache/fineract/cn/lang/DateRangeTest.java
index 161c017..049e3cd 100644
--- a/src/test/java/io/mifos/core/lang/DateRangeTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/DateRangeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/TenantContextHolderTest.java b/src/test/java/org/apache/fineract/cn/lang/TenantContextHolderTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/lang/TenantContextHolderTest.java
rename to src/test/java/org/apache/fineract/cn/lang/TenantContextHolderTest.java
index 4852e81..2253cd0 100644
--- a/src/test/java/io/mifos/core/lang/TenantContextHolderTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/TenantContextHolderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang;
+package org.apache.fineract.cn.lang;
 
 import org.junit.After;
 import org.junit.Assert;
diff --git a/src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java b/src/test/java/org/apache/fineract/cn/lang/config/ServiceExceptionFilterTest.java
similarity index 96%
rename from src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java
rename to src/test/java/org/apache/fineract/cn/lang/config/ServiceExceptionFilterTest.java
index 65e56a5..302cb01 100644
--- a/src/test/java/io/mifos/core/lang/config/ServiceExceptionFilterTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/config/ServiceExceptionFilterTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
-import io.mifos.core.lang.ServiceException;
+import org.apache.fineract.cn.lang.ServiceException;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.web.util.NestedServletException;
diff --git a/src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java b/src/test/java/org/apache/fineract/cn/lang/config/TenantHeaderFilterTest.java
similarity index 96%
rename from src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java
rename to src/test/java/org/apache/fineract/cn/lang/config/TenantHeaderFilterTest.java
index ddea9e0..bb22976 100644
--- a/src/test/java/io/mifos/core/lang/config/TenantHeaderFilterTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/config/TenantHeaderFilterTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.config;
+package org.apache.fineract.cn.lang.config;
 
-import io.mifos.core.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.TenantContextHolder;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java b/src/test/java/org/apache/fineract/cn/lang/listening/TenantedEventListenerTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java
rename to src/test/java/org/apache/fineract/cn/lang/listening/TenantedEventListenerTest.java
index 29e79fd..8b34c8e 100644
--- a/src/test/java/io/mifos/core/lang/listening/TenantedEventListenerTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/listening/TenantedEventListenerTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.listening;
+package org.apache.fineract.cn.lang.listening;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java b/src/test/java/org/apache/fineract/cn/lang/security/RsaKeyPairFactoryTest.java
similarity index 96%
rename from src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java
rename to src/test/java/org/apache/fineract/cn/lang/security/RsaKeyPairFactoryTest.java
index 040d12b..3d104c7 100644
--- a/src/test/java/io/mifos/core/lang/security/RsaKeyPairFactoryTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/security/RsaKeyPairFactoryTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.security;
+package org.apache.fineract.cn.lang.security;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java b/src/test/java/org/apache/fineract/cn/lang/security/RsaPrivateKeyBuilderTest.java
similarity index 97%
rename from src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java
rename to src/test/java/org/apache/fineract/cn/lang/security/RsaPrivateKeyBuilderTest.java
index df45947..609c3e6 100644
--- a/src/test/java/io/mifos/core/lang/security/RsaPrivateKeyBuilderTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/security/RsaPrivateKeyBuilderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.security;
+package org.apache.fineract.cn.lang.security;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java b/src/test/java/org/apache/fineract/cn/lang/security/RsaPublicKeyBuilderTest.java
similarity index 97%
rename from src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java
rename to src/test/java/org/apache/fineract/cn/lang/security/RsaPublicKeyBuilderTest.java
index 40bdcec..102e6aa 100644
--- a/src/test/java/io/mifos/core/lang/security/RsaPublicKeyBuilderTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/security/RsaPublicKeyBuilderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.security;
+package org.apache.fineract.cn.lang.security;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/mifos/core/lang/validation/TestHelper.java b/src/test/java/org/apache/fineract/cn/lang/validation/TestHelper.java
similarity index 96%
rename from src/test/java/io/mifos/core/lang/validation/TestHelper.java
rename to src/test/java/org/apache/fineract/cn/lang/validation/TestHelper.java
index 4ac55e3..46ceaf1 100644
--- a/src/test/java/io/mifos/core/lang/validation/TestHelper.java
+++ b/src/test/java/org/apache/fineract/cn/lang/validation/TestHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java b/src/test/java/org/apache/fineract/cn/lang/validation/ValidApplicationNameTest.java
similarity index 94%
rename from src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java
rename to src/test/java/org/apache/fineract/cn/lang/validation/ValidApplicationNameTest.java
index de14c00..dbb4ecb 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidApplicationNameTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/validation/ValidApplicationNameTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.validation.constraints.ValidApplicationName;
+import org.apache.fineract.cn.lang.validation.constraints.ValidApplicationName;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java b/src/test/java/org/apache/fineract/cn/lang/validation/ValidIdentifierTest.java
similarity index 93%
rename from src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java
rename to src/test/java/org/apache/fineract/cn/lang/validation/ValidIdentifierTest.java
index e20c3a2..297cb65 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidIdentifierTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/validation/ValidIdentifierTest.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static io.mifos.core.lang.validation.TestHelper.isValid;
+import static org.apache.fineract.cn.lang.validation.TestHelper.isValid;
 
 /**
  * @author Myrle Krantz
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java b/src/test/java/org/apache/fineract/cn/lang/validation/ValidIdentifiersTest.java
similarity index 91%
rename from src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java
rename to src/test/java/org/apache/fineract/cn/lang/validation/ValidIdentifiersTest.java
index 2b97d53..ef538fe 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidIdentifiersTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/validation/ValidIdentifiersTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifiers;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifiers;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -26,7 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static io.mifos.core.lang.validation.TestHelper.isValid;
+import static org.apache.fineract.cn.lang.validation.TestHelper.isValid;
 
 /**
  * @author Myrle Krantz
diff --git a/src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java b/src/test/java/org/apache/fineract/cn/lang/validation/ValidLocalDateTimeStringTest.java
similarity index 90%
rename from src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java
rename to src/test/java/org/apache/fineract/cn/lang/validation/ValidLocalDateTimeStringTest.java
index 21e0778..a664850 100644
--- a/src/test/java/io/mifos/core/lang/validation/ValidLocalDateTimeStringTest.java
+++ b/src/test/java/org/apache/fineract/cn/lang/validation/ValidLocalDateTimeStringTest.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.lang.validation;
+package org.apache.fineract.cn.lang.validation;
 
-import io.mifos.core.lang.DateConverter;
-import io.mifos.core.lang.validation.constraints.ValidLocalDateTimeString;
+import org.apache.fineract.cn.lang.DateConverter;
+import org.apache.fineract.cn.lang.validation.constraints.ValidLocalDateTimeString;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -28,7 +28,7 @@
 
 import java.time.LocalDateTime;
 
-import static io.mifos.core.lang.validation.TestHelper.isValid;
+import static org.apache.fineract.cn.lang.validation.TestHelper.isValid;
 
 /**
  * @author Myrle Krantz