Merge pull request #4 from ebenezergraham/patch-1

Update README.md to use Apache Fineract CN
diff --git a/build.gradle b/build.gradle
index 80213cf..385aa95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 buildscript {
     repositories {
-        jcenter();
+        jcenter()
     }
     dependencies {
         classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE'
@@ -9,6 +26,7 @@
 
 plugins {
     id 'com.github.hierynomus.license' version '0.13.1'
+    id("org.nosphere.apache.rat") version "0.3.1"
 }
 
 group 'org.apache.fineract.cn'
@@ -83,3 +101,17 @@
         java = 'SLASHSTAR_STYLE'
     }
 }
+
+
+rat {
+    // List of exclude directives, defaults to ['**/.gradle/**']
+    excludes = [
+            ".idea/**",
+            ".gradle/**",
+            "gradle/**",
+            "build/**",
+            "gradlew",
+            "gradlew.bat",
+            "README.md"
+    ]
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 7c8e3dc..491f745 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 rootProject.name = 'api'
\ No newline at end of file
diff --git a/src/main/java/io/mifos/core/api/annotation/ThrowsException.java b/src/main/java/org/apache/fineract/cn/api/annotation/ThrowsException.java
similarity index 96%
rename from src/main/java/io/mifos/core/api/annotation/ThrowsException.java
rename to src/main/java/org/apache/fineract/cn/api/annotation/ThrowsException.java
index 5d0c3ab..040aec3 100644
--- a/src/main/java/io/mifos/core/api/annotation/ThrowsException.java
+++ b/src/main/java/org/apache/fineract/cn/api/annotation/ThrowsException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.annotation;
+package org.apache.fineract.cn.api.annotation;
 
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/io/mifos/core/api/annotation/ThrowsExceptions.java b/src/main/java/org/apache/fineract/cn/api/annotation/ThrowsExceptions.java
similarity index 95%
rename from src/main/java/io/mifos/core/api/annotation/ThrowsExceptions.java
rename to src/main/java/org/apache/fineract/cn/api/annotation/ThrowsExceptions.java
index 0a78ef7..06dd0e6 100644
--- a/src/main/java/io/mifos/core/api/annotation/ThrowsExceptions.java
+++ b/src/main/java/org/apache/fineract/cn/api/annotation/ThrowsExceptions.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.annotation;
+package org.apache.fineract.cn.api.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/io/mifos/core/api/config/ApiConfiguration.java b/src/main/java/org/apache/fineract/cn/api/config/ApiConfiguration.java
similarity index 92%
rename from src/main/java/io/mifos/core/api/config/ApiConfiguration.java
rename to src/main/java/org/apache/fineract/cn/api/config/ApiConfiguration.java
index db170a0..56d4994 100644
--- a/src/main/java/io/mifos/core/api/config/ApiConfiguration.java
+++ b/src/main/java/org/apache/fineract/cn/api/config/ApiConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.config;
+package org.apache.fineract.cn.api.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +28,7 @@
  * @author Myrle Krantz
  */
 @Configuration
-@ComponentScan({"io.mifos.core.api.util"})
+@ComponentScan({"org.apache.fineract.cn.api.util"})
 public class ApiConfiguration {
 
   public static final String LOGGER_NAME = "api-logger";
diff --git a/src/main/java/io/mifos/core/api/config/EnableApiFactory.java b/src/main/java/org/apache/fineract/cn/api/config/EnableApiFactory.java
similarity index 96%
rename from src/main/java/io/mifos/core/api/config/EnableApiFactory.java
rename to src/main/java/org/apache/fineract/cn/api/config/EnableApiFactory.java
index c332dad..d010d5c 100644
--- a/src/main/java/io/mifos/core/api/config/EnableApiFactory.java
+++ b/src/main/java/org/apache/fineract/cn/api/config/EnableApiFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.config;
+package org.apache.fineract.cn.api.config;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/src/main/java/io/mifos/core/api/context/AutoGuest.java b/src/main/java/org/apache/fineract/cn/api/context/AutoGuest.java
similarity index 95%
rename from src/main/java/io/mifos/core/api/context/AutoGuest.java
rename to src/main/java/org/apache/fineract/cn/api/context/AutoGuest.java
index 0256303..e936cba 100644
--- a/src/main/java/io/mifos/core/api/context/AutoGuest.java
+++ b/src/main/java/org/apache/fineract/cn/api/context/AutoGuest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.context;
+package org.apache.fineract.cn.api.context;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/context/AutoSeshat.java b/src/main/java/org/apache/fineract/cn/api/context/AutoSeshat.java
similarity index 91%
rename from src/main/java/io/mifos/core/api/context/AutoSeshat.java
rename to src/main/java/org/apache/fineract/cn/api/context/AutoSeshat.java
index acb2322..f111b60 100644
--- a/src/main/java/io/mifos/core/api/context/AutoSeshat.java
+++ b/src/main/java/org/apache/fineract/cn/api/context/AutoSeshat.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.context;
+package org.apache.fineract.cn.api.context;
 
-import io.mifos.core.api.util.ApiConstants;
+import org.apache.fineract.cn.api.util.ApiConstants;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/context/AutoUserContext.java b/src/main/java/org/apache/fineract/cn/api/context/AutoUserContext.java
similarity index 89%
rename from src/main/java/io/mifos/core/api/context/AutoUserContext.java
rename to src/main/java/org/apache/fineract/cn/api/context/AutoUserContext.java
index 5643f79..1b6f48c 100644
--- a/src/main/java/io/mifos/core/api/context/AutoUserContext.java
+++ b/src/main/java/org/apache/fineract/cn/api/context/AutoUserContext.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.context;
+package org.apache.fineract.cn.api.context;
 
-import io.mifos.core.api.util.UserContext;
-import io.mifos.core.api.util.UserContextHolder;
+import org.apache.fineract.cn.api.util.UserContext;
+import org.apache.fineract.cn.api.util.UserContextHolder;
 
 import java.util.Optional;
 
diff --git a/src/main/java/io/mifos/core/api/util/AnnotatedErrorDecoder.java b/src/main/java/org/apache/fineract/cn/api/util/AnnotatedErrorDecoder.java
similarity index 96%
rename from src/main/java/io/mifos/core/api/util/AnnotatedErrorDecoder.java
rename to src/main/java/org/apache/fineract/cn/api/util/AnnotatedErrorDecoder.java
index 792ab28..a50025b 100644
--- a/src/main/java/io/mifos/core/api/util/AnnotatedErrorDecoder.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/AnnotatedErrorDecoder.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.Feign;
 import feign.FeignException;
 import feign.Response;
 import feign.Util;
 import feign.codec.ErrorDecoder;
-import io.mifos.core.api.annotation.ThrowsException;
-import io.mifos.core.api.annotation.ThrowsExceptions;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
+import org.apache.fineract.cn.api.annotation.ThrowsExceptions;
 import org.slf4j.Logger;
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/io/mifos/core/api/util/ApiConstants.java b/src/main/java/org/apache/fineract/cn/api/util/ApiConstants.java
similarity index 95%
rename from src/main/java/io/mifos/core/api/util/ApiConstants.java
rename to src/main/java/org/apache/fineract/cn/api/util/ApiConstants.java
index ed19428..aa83a42 100644
--- a/src/main/java/io/mifos/core/api/util/ApiConstants.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/ApiConstants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/util/ApiFactory.java b/src/main/java/org/apache/fineract/cn/api/util/ApiFactory.java
similarity index 96%
rename from src/main/java/io/mifos/core/api/util/ApiFactory.java
rename to src/main/java/org/apache/fineract/cn/api/util/ApiFactory.java
index b60472b..1a574bd 100644
--- a/src/main/java/io/mifos/core/api/util/ApiFactory.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/ApiFactory.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.Feign;
 import feign.gson.GsonDecoder;
 import feign.gson.GsonEncoder;
-import io.mifos.core.api.config.ApiConfiguration;
+import org.apache.fineract.cn.api.config.ApiConfiguration;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/src/main/java/io/mifos/core/api/util/CookieInterceptingClient.java b/src/main/java/org/apache/fineract/cn/api/util/CookieInterceptingClient.java
similarity index 98%
rename from src/main/java/io/mifos/core/api/util/CookieInterceptingClient.java
rename to src/main/java/org/apache/fineract/cn/api/util/CookieInterceptingClient.java
index faa634e..fdc64aa 100644
--- a/src/main/java/io/mifos/core/api/util/CookieInterceptingClient.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/CookieInterceptingClient.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.*;
 
diff --git a/src/main/java/io/mifos/core/api/util/CustomFeignClientsConfiguration.java b/src/main/java/org/apache/fineract/cn/api/util/CustomFeignClientsConfiguration.java
similarity index 88%
rename from src/main/java/io/mifos/core/api/util/CustomFeignClientsConfiguration.java
rename to src/main/java/org/apache/fineract/cn/api/util/CustomFeignClientsConfiguration.java
index 783c6d1..d8e4b60 100644
--- a/src/main/java/io/mifos/core/api/util/CustomFeignClientsConfiguration.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/CustomFeignClientsConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.Feign;
 import feign.Target;
@@ -24,6 +24,7 @@
 import feign.codec.Encoder;
 import feign.gson.GsonDecoder;
 import feign.gson.GsonEncoder;
+import org.apache.fineract.cn.api.config.ApiConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,8 +33,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 
-import static io.mifos.core.api.config.ApiConfiguration.LOGGER_NAME;
-
 /**
  * @author Myrle Krantz
  */
@@ -79,15 +78,15 @@
     return new GsonEncoder();
   }
 
-  @Bean(name = LOGGER_NAME)
+  @Bean(name = ApiConfiguration.LOGGER_NAME)
   public Logger logger() {
-    return LoggerFactory.getLogger(LOGGER_NAME);
+    return LoggerFactory.getLogger(ApiConfiguration.LOGGER_NAME);
   }
 
   @Bean
   @Scope("prototype")
   @ConditionalOnMissingBean
-  public Feign.Builder feignBuilder(@Qualifier(LOGGER_NAME) final Logger logger) {
+  public Feign.Builder feignBuilder(@Qualifier(ApiConfiguration.LOGGER_NAME) final Logger logger) {
     return new AnnotatedErrorDecoderFeignBuilder(logger);
   }
 }
\ No newline at end of file
diff --git a/src/main/java/io/mifos/core/api/util/EmptyBodyInterceptor.java b/src/main/java/org/apache/fineract/cn/api/util/EmptyBodyInterceptor.java
similarity index 97%
rename from src/main/java/io/mifos/core/api/util/EmptyBodyInterceptor.java
rename to src/main/java/org/apache/fineract/cn/api/util/EmptyBodyInterceptor.java
index 9c9371a..0a0bb04 100644
--- a/src/main/java/io/mifos/core/api/util/EmptyBodyInterceptor.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/EmptyBodyInterceptor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
diff --git a/src/main/java/io/mifos/core/api/util/FeignTargetWithCookieJar.java b/src/main/java/org/apache/fineract/cn/api/util/FeignTargetWithCookieJar.java
similarity index 96%
rename from src/main/java/io/mifos/core/api/util/FeignTargetWithCookieJar.java
rename to src/main/java/org/apache/fineract/cn/api/util/FeignTargetWithCookieJar.java
index 700acd6..3af9fcc 100644
--- a/src/main/java/io/mifos/core/api/util/FeignTargetWithCookieJar.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/FeignTargetWithCookieJar.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/util/InternalServerError.java b/src/main/java/org/apache/fineract/cn/api/util/InternalServerError.java
similarity index 95%
rename from src/main/java/io/mifos/core/api/util/InternalServerError.java
rename to src/main/java/org/apache/fineract/cn/api/util/InternalServerError.java
index 9fcfe19..abac3fb 100644
--- a/src/main/java/io/mifos/core/api/util/InternalServerError.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/InternalServerError.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/util/InvalidTokenException.java b/src/main/java/org/apache/fineract/cn/api/util/InvalidTokenException.java
similarity index 95%
rename from src/main/java/io/mifos/core/api/util/InvalidTokenException.java
rename to src/main/java/org/apache/fineract/cn/api/util/InvalidTokenException.java
index 609d672..29a0087 100644
--- a/src/main/java/io/mifos/core/api/util/InvalidTokenException.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/InvalidTokenException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/util/NotFoundException.java b/src/main/java/org/apache/fineract/cn/api/util/NotFoundException.java
similarity index 95%
rename from src/main/java/io/mifos/core/api/util/NotFoundException.java
rename to src/main/java/org/apache/fineract/cn/api/util/NotFoundException.java
index db0fb2d..095f5a5 100644
--- a/src/main/java/io/mifos/core/api/util/NotFoundException.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/NotFoundException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/api/util/TenantedTargetInterceptor.java b/src/main/java/org/apache/fineract/cn/api/util/TenantedTargetInterceptor.java
similarity index 86%
rename from src/main/java/io/mifos/core/api/util/TenantedTargetInterceptor.java
rename to src/main/java/org/apache/fineract/cn/api/util/TenantedTargetInterceptor.java
index dadda82..c73b970 100644
--- a/src/main/java/io/mifos/core/api/util/TenantedTargetInterceptor.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/TenantedTargetInterceptor.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
+
+import static org.apache.fineract.cn.lang.config.TenantHeaderFilter.TENANT_HEADER;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
-import io.mifos.core.lang.TenantContextHolder;
-
-import static io.mifos.core.lang.config.TenantHeaderFilter.TENANT_HEADER;
+import org.apache.fineract.cn.lang.TenantContextHolder;
 
 
 /**
diff --git a/src/main/java/io/mifos/core/api/util/TokenedTargetInterceptor.java b/src/main/java/org/apache/fineract/cn/api/util/TokenedTargetInterceptor.java
similarity index 96%
rename from src/main/java/io/mifos/core/api/util/TokenedTargetInterceptor.java
rename to src/main/java/org/apache/fineract/cn/api/util/TokenedTargetInterceptor.java
index c4d108d..072cc9c 100644
--- a/src/main/java/io/mifos/core/api/util/TokenedTargetInterceptor.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/TokenedTargetInterceptor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
diff --git a/src/main/java/io/mifos/core/api/util/UserContext.java b/src/main/java/org/apache/fineract/cn/api/util/UserContext.java
similarity index 97%
rename from src/main/java/io/mifos/core/api/util/UserContext.java
rename to src/main/java/org/apache/fineract/cn/api/util/UserContext.java
index 1dd20ad..ceb6226 100644
--- a/src/main/java/io/mifos/core/api/util/UserContext.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/UserContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
diff --git a/src/main/java/io/mifos/core/api/util/UserContextHolder.java b/src/main/java/org/apache/fineract/cn/api/util/UserContextHolder.java
similarity index 98%
rename from src/main/java/io/mifos/core/api/util/UserContextHolder.java
rename to src/main/java/org/apache/fineract/cn/api/util/UserContextHolder.java
index f4cc13a..3673db3 100644
--- a/src/main/java/io/mifos/core/api/util/UserContextHolder.java
+++ b/src/main/java/org/apache/fineract/cn/api/util/UserContextHolder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import org.springframework.util.Assert;
 
diff --git a/src/test/java/io/mifos/core/api/context/AutoUserContextTest.java b/src/test/java/org/apache/fineract/cn/api/context/AutoUserContextTest.java
similarity index 92%
rename from src/test/java/io/mifos/core/api/context/AutoUserContextTest.java
rename to src/test/java/org/apache/fineract/cn/api/context/AutoUserContextTest.java
index 43b5ce7..15afe80 100644
--- a/src/test/java/io/mifos/core/api/context/AutoUserContextTest.java
+++ b/src/test/java/org/apache/fineract/cn/api/context/AutoUserContextTest.java
@@ -16,14 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.context;
+package org.apache.fineract.cn.api.context;
 
-import io.mifos.core.api.util.UserContextHolder;
+import org.apache.fineract.cn.api.util.UserContextHolder;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Optional;
-
 /**
  * @author Myrle Krantz
  */
diff --git a/src/test/java/io/mifos/core/api/util/AnnotatedErrorDecoderTest.java b/src/test/java/org/apache/fineract/cn/api/util/AnnotatedErrorDecoderTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/api/util/AnnotatedErrorDecoderTest.java
rename to src/test/java/org/apache/fineract/cn/api/util/AnnotatedErrorDecoderTest.java
index 7316f82..b272ab7 100644
--- a/src/test/java/io/mifos/core/api/util/AnnotatedErrorDecoderTest.java
+++ b/src/test/java/org/apache/fineract/cn/api/util/AnnotatedErrorDecoderTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.Feign;
 import feign.FeignException;
 import feign.Response;
-import io.mifos.core.api.annotation.ThrowsException;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/io/mifos/core/api/util/CookieInterceptingClientTest.java b/src/test/java/org/apache/fineract/cn/api/util/CookieInterceptingClientTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/api/util/CookieInterceptingClientTest.java
rename to src/test/java/org/apache/fineract/cn/api/util/CookieInterceptingClientTest.java
index 0a7c520..0b64af1 100644
--- a/src/test/java/io/mifos/core/api/util/CookieInterceptingClientTest.java
+++ b/src/test/java/org/apache/fineract/cn/api/util/CookieInterceptingClientTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.Request;
 import feign.RequestTemplate;
diff --git a/src/test/java/io/mifos/core/api/util/TenantedTargetInterceptorTest.java b/src/test/java/org/apache/fineract/cn/api/util/TenantedTargetInterceptorTest.java
similarity index 93%
rename from src/test/java/io/mifos/core/api/util/TenantedTargetInterceptorTest.java
rename to src/test/java/org/apache/fineract/cn/api/util/TenantedTargetInterceptorTest.java
index 2f87f3d..e9f0a4f 100644
--- a/src/test/java/io/mifos/core/api/util/TenantedTargetInterceptorTest.java
+++ b/src/test/java/org/apache/fineract/cn/api/util/TenantedTargetInterceptorTest.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.RequestTemplate;
-import io.mifos.core.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.TenantContextHolder;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/io/mifos/core/api/util/TokenedTargetInterceptorTest.java b/src/test/java/org/apache/fineract/cn/api/util/TokenedTargetInterceptorTest.java
similarity index 93%
rename from src/test/java/io/mifos/core/api/util/TokenedTargetInterceptorTest.java
rename to src/test/java/org/apache/fineract/cn/api/util/TokenedTargetInterceptorTest.java
index b907bc0..b6dd9dc 100644
--- a/src/test/java/io/mifos/core/api/util/TokenedTargetInterceptorTest.java
+++ b/src/test/java/org/apache/fineract/cn/api/util/TokenedTargetInterceptorTest.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import feign.RequestTemplate;
-import io.mifos.core.api.context.AutoUserContext;
+import org.apache.fineract.cn.api.context.AutoUserContext;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/io/mifos/core/api/util/UserContextHolderTest.java b/src/test/java/org/apache/fineract/cn/api/util/UserContextHolderTest.java
similarity index 98%
rename from src/test/java/io/mifos/core/api/util/UserContextHolderTest.java
rename to src/test/java/org/apache/fineract/cn/api/util/UserContextHolderTest.java
index 9f56a9a..dcdefc0 100644
--- a/src/test/java/io/mifos/core/api/util/UserContextHolderTest.java
+++ b/src/test/java/org/apache/fineract/cn/api/util/UserContextHolderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.api.util;
+package org.apache.fineract.cn.api.util;
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Assert;