diff --git a/.travis.yml b/.travis.yml
index b47a39d..3827743 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ services:
   - docker
 
 jdk:
-#  - oraclejdk7
   - oraclejdk8
 
 env:
diff --git a/pom.xml b/pom.xml
index 418f843..c6728eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.github.utplsql</groupId>
+  <groupId>org.utplsql</groupId>
   <artifactId>java-api</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -31,24 +31,6 @@
     </dependency>
   </dependencies>
 
-  <!--<build>-->
-    <!--<plugins>-->
-      <!--<plugin>-->
-        <!--<groupId>net.orfjackal.retrolambda</groupId>-->
-        <!--<artifactId>retrolambda-maven-plugin</artifactId>-->
-        <!--<version>2.5.1</version>-->
-        <!--<executions>-->
-          <!--<execution>-->
-            <!--<goals>-->
-              <!--<goal>process-main</goal>-->
-              <!--<goal>process-test</goal>-->
-            <!--</goals>-->
-          <!--</execution>-->
-        <!--</executions>-->
-      <!--</plugin>-->
-    <!--</plugins>-->
-  <!--</build>-->
-
   <repositories>
     <repository>
       <id>maven.oracle.com</id>
diff --git a/src/main/java/io/github/utplsql/api/CustomTypes.java b/src/main/java/org/utplsql/api/CustomTypes.java
similarity index 97%
rename from src/main/java/io/github/utplsql/api/CustomTypes.java
rename to src/main/java/org/utplsql/api/CustomTypes.java
index 0dd7d1e..45dda22 100644
--- a/src/main/java/io/github/utplsql/api/CustomTypes.java
+++ b/src/main/java/org/utplsql/api/CustomTypes.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
 /**
  * Database custom data reporter.
diff --git a/src/main/java/io/github/utplsql/api/DBHelper.java b/src/main/java/org/utplsql/api/DBHelper.java
similarity index 98%
rename from src/main/java/io/github/utplsql/api/DBHelper.java
rename to src/main/java/org/utplsql/api/DBHelper.java
index f3a880e..bfe6c94 100644
--- a/src/main/java/io/github/utplsql/api/DBHelper.java
+++ b/src/main/java/org/utplsql/api/DBHelper.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
 import oracle.jdbc.OracleTypes;
 
diff --git a/src/main/java/io/github/utplsql/api/FileMapper.java b/src/main/java/org/utplsql/api/FileMapper.java
similarity index 96%
rename from src/main/java/io/github/utplsql/api/FileMapper.java
rename to src/main/java/org/utplsql/api/FileMapper.java
index 661e9df..cdea084 100644
--- a/src/main/java/io/github/utplsql/api/FileMapper.java
+++ b/src/main/java/org/utplsql/api/FileMapper.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
 
 import oracle.jdbc.OracleConnection;
@@ -40,7 +40,7 @@ public static Array buildFileMappingArray(
         int paramIdx = 0;
         callableStatement.registerOutParameter(++paramIdx, OracleTypes.ARRAY, CustomTypes.UT_FILE_MAPPINGS);
 
-        if (mapperOptions.getRegexPattern() == null) {
+        if (mapperOptions.getObjectOwner() == null) {
             callableStatement.setNull(++paramIdx, Types.VARCHAR);
         } else {
             callableStatement.setString(++paramIdx, mapperOptions.getObjectOwner());
@@ -50,7 +50,7 @@ public static Array buildFileMappingArray(
                 ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_VARCHAR2_LIST, mapperOptions.getFilePaths().toArray()));
 
         if (mapperOptions.getTypeMappings() == null) {
-            callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_KEY_VALUE_PAIR);
+            callableStatement.setNull(++paramIdx, Types.ARRAY, CustomTypes.UT_KEY_VALUE_PAIRS);
         } else {
             callableStatement.setArray(
                     ++paramIdx, oraConn.createOracleArray(CustomTypes.UT_KEY_VALUE_PAIRS, mapperOptions.getTypeMappings().toArray()));
diff --git a/src/main/java/io/github/utplsql/api/FileMapperOptions.java b/src/main/java/org/utplsql/api/FileMapperOptions.java
similarity index 98%
rename from src/main/java/io/github/utplsql/api/FileMapperOptions.java
rename to src/main/java/org/utplsql/api/FileMapperOptions.java
index 723210d..e9d6d86 100644
--- a/src/main/java/io/github/utplsql/api/FileMapperOptions.java
+++ b/src/main/java/org/utplsql/api/FileMapperOptions.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
 import java.util.List;
 
diff --git a/src/main/java/io/github/utplsql/api/FileMapping.java b/src/main/java/org/utplsql/api/FileMapping.java
similarity index 98%
rename from src/main/java/io/github/utplsql/api/FileMapping.java
rename to src/main/java/org/utplsql/api/FileMapping.java
index 9586a18..eb383dd 100644
--- a/src/main/java/io/github/utplsql/api/FileMapping.java
+++ b/src/main/java/org/utplsql/api/FileMapping.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
 import java.sql.SQLData;
 import java.sql.SQLException;
diff --git a/src/main/java/io/github/utplsql/api/KeyValuePair.java b/src/main/java/org/utplsql/api/KeyValuePair.java
similarity index 97%
rename from src/main/java/io/github/utplsql/api/KeyValuePair.java
rename to src/main/java/org/utplsql/api/KeyValuePair.java
index 991bc2a..5826f45 100644
--- a/src/main/java/io/github/utplsql/api/KeyValuePair.java
+++ b/src/main/java/org/utplsql/api/KeyValuePair.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
 import java.sql.SQLData;
 import java.sql.SQLException;
diff --git a/src/main/java/io/github/utplsql/api/OutputBuffer.java b/src/main/java/org/utplsql/api/OutputBuffer.java
similarity index 97%
rename from src/main/java/io/github/utplsql/api/OutputBuffer.java
rename to src/main/java/org/utplsql/api/OutputBuffer.java
index bc12010..6913bf6 100644
--- a/src/main/java/io/github/utplsql/api/OutputBuffer.java
+++ b/src/main/java/org/utplsql/api/OutputBuffer.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
-import io.github.utplsql.api.reporter.Reporter;
+import org.utplsql.api.reporter.Reporter;
 import oracle.jdbc.OracleTypes;
 
 import java.io.PrintStream;
diff --git a/src/main/java/io/github/utplsql/api/TestRunner.java b/src/main/java/org/utplsql/api/TestRunner.java
similarity index 97%
rename from src/main/java/io/github/utplsql/api/TestRunner.java
rename to src/main/java/org/utplsql/api/TestRunner.java
index d4d766b..532921c 100644
--- a/src/main/java/io/github/utplsql/api/TestRunner.java
+++ b/src/main/java/org/utplsql/api/TestRunner.java
@@ -1,8 +1,8 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
-import io.github.utplsql.api.exception.SomeTestsFailedException;
-import io.github.utplsql.api.reporter.DocumentationReporter;
-import io.github.utplsql.api.reporter.Reporter;
+import org.utplsql.api.exception.SomeTestsFailedException;
+import org.utplsql.api.reporter.DocumentationReporter;
+import org.utplsql.api.reporter.Reporter;
 import oracle.jdbc.OracleConnection;
 
 import java.sql.CallableStatement;
diff --git a/src/main/java/io/github/utplsql/api/exception/SomeTestsFailedException.java b/src/main/java/org/utplsql/api/exception/SomeTestsFailedException.java
similarity index 88%
rename from src/main/java/io/github/utplsql/api/exception/SomeTestsFailedException.java
rename to src/main/java/org/utplsql/api/exception/SomeTestsFailedException.java
index 48e7452..708bad6 100644
--- a/src/main/java/io/github/utplsql/api/exception/SomeTestsFailedException.java
+++ b/src/main/java/org/utplsql/api/exception/SomeTestsFailedException.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api.exception;
+package org.utplsql.api.exception;
 
 import java.sql.SQLException;
 
diff --git a/src/main/java/io/github/utplsql/api/reporter/CoverageHTMLReporter.java b/src/main/java/org/utplsql/api/reporter/CoverageHTMLReporter.java
similarity index 95%
rename from src/main/java/io/github/utplsql/api/reporter/CoverageHTMLReporter.java
rename to src/main/java/org/utplsql/api/reporter/CoverageHTMLReporter.java
index b6f180e..790112c 100644
--- a/src/main/java/io/github/utplsql/api/reporter/CoverageHTMLReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/CoverageHTMLReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 import java.sql.SQLInput;
diff --git a/src/main/java/io/github/utplsql/api/reporter/CoverageSonarReporter.java b/src/main/java/org/utplsql/api/reporter/CoverageSonarReporter.java
similarity index 73%
rename from src/main/java/io/github/utplsql/api/reporter/CoverageSonarReporter.java
rename to src/main/java/org/utplsql/api/reporter/CoverageSonarReporter.java
index 4f20c49..cdd9546 100644
--- a/src/main/java/io/github/utplsql/api/reporter/CoverageSonarReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/CoverageSonarReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 
diff --git a/src/main/java/io/github/utplsql/api/reporter/CoverallsReporter.java b/src/main/java/org/utplsql/api/reporter/CoverallsReporter.java
similarity index 72%
rename from src/main/java/io/github/utplsql/api/reporter/CoverallsReporter.java
rename to src/main/java/org/utplsql/api/reporter/CoverallsReporter.java
index 4173eab..96dfceb 100644
--- a/src/main/java/io/github/utplsql/api/reporter/CoverallsReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/CoverallsReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 
diff --git a/src/main/java/io/github/utplsql/api/reporter/DocumentationReporter.java b/src/main/java/org/utplsql/api/reporter/DocumentationReporter.java
similarity index 92%
rename from src/main/java/io/github/utplsql/api/reporter/DocumentationReporter.java
rename to src/main/java/org/utplsql/api/reporter/DocumentationReporter.java
index ba83054..e3e88a4 100644
--- a/src/main/java/io/github/utplsql/api/reporter/DocumentationReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/DocumentationReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 import java.sql.SQLInput;
diff --git a/src/main/java/io/github/utplsql/api/reporter/Reporter.java b/src/main/java/org/utplsql/api/reporter/Reporter.java
similarity index 94%
rename from src/main/java/io/github/utplsql/api/reporter/Reporter.java
rename to src/main/java/org/utplsql/api/reporter/Reporter.java
index f459562..83d201f 100644
--- a/src/main/java/io/github/utplsql/api/reporter/Reporter.java
+++ b/src/main/java/org/utplsql/api/reporter/Reporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.DBHelper;
+import org.utplsql.api.DBHelper;
 
 import java.sql.*;
 import java.util.Calendar;
diff --git a/src/main/java/io/github/utplsql/api/reporter/ReporterFactory.java b/src/main/java/org/utplsql/api/reporter/ReporterFactory.java
similarity index 91%
rename from src/main/java/io/github/utplsql/api/reporter/ReporterFactory.java
rename to src/main/java/org/utplsql/api/reporter/ReporterFactory.java
index 2a4d27d..f76c6be 100644
--- a/src/main/java/io/github/utplsql/api/reporter/ReporterFactory.java
+++ b/src/main/java/org/utplsql/api/reporter/ReporterFactory.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 public final class ReporterFactory {
 
diff --git a/src/main/java/io/github/utplsql/api/reporter/SonarTestReporter.java b/src/main/java/org/utplsql/api/reporter/SonarTestReporter.java
similarity index 72%
rename from src/main/java/io/github/utplsql/api/reporter/SonarTestReporter.java
rename to src/main/java/org/utplsql/api/reporter/SonarTestReporter.java
index 1544847..66be22e 100644
--- a/src/main/java/io/github/utplsql/api/reporter/SonarTestReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/SonarTestReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 
diff --git a/src/main/java/io/github/utplsql/api/reporter/TeamCityReporter.java b/src/main/java/org/utplsql/api/reporter/TeamCityReporter.java
similarity index 72%
rename from src/main/java/io/github/utplsql/api/reporter/TeamCityReporter.java
rename to src/main/java/org/utplsql/api/reporter/TeamCityReporter.java
index ef7689d..9c4499b 100644
--- a/src/main/java/io/github/utplsql/api/reporter/TeamCityReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/TeamCityReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 
diff --git a/src/main/java/io/github/utplsql/api/reporter/XUnitReporter.java b/src/main/java/org/utplsql/api/reporter/XUnitReporter.java
similarity index 71%
rename from src/main/java/io/github/utplsql/api/reporter/XUnitReporter.java
rename to src/main/java/org/utplsql/api/reporter/XUnitReporter.java
index aca7d92..cf1a9e1 100644
--- a/src/main/java/io/github/utplsql/api/reporter/XUnitReporter.java
+++ b/src/main/java/org/utplsql/api/reporter/XUnitReporter.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api.reporter;
+package org.utplsql.api.reporter;
 
-import io.github.utplsql.api.CustomTypes;
+import org.utplsql.api.CustomTypes;
 
 import java.sql.SQLException;
 
diff --git a/src/test/java/io/github/utplsql/api/FileMapperTest.java b/src/test/java/org/utplsql/api/FileMapperTest.java
similarity index 95%
rename from src/test/java/io/github/utplsql/api/FileMapperTest.java
rename to src/test/java/org/utplsql/api/FileMapperTest.java
index c040fb8..ed8e919 100644
--- a/src/test/java/io/github/utplsql/api/FileMapperTest.java
+++ b/src/test/java/org/utplsql/api/FileMapperTest.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
-import io.github.utplsql.api.rules.DatabaseRule;
+import org.utplsql.api.rules.DatabaseRule;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/src/test/java/io/github/utplsql/api/OutputBufferTest.java b/src/test/java/org/utplsql/api/OutputBufferTest.java
similarity index 94%
rename from src/test/java/io/github/utplsql/api/OutputBufferTest.java
rename to src/test/java/org/utplsql/api/OutputBufferTest.java
index eda4734..db043cb 100644
--- a/src/test/java/io/github/utplsql/api/OutputBufferTest.java
+++ b/src/test/java/org/utplsql/api/OutputBufferTest.java
@@ -1,8 +1,8 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
-import io.github.utplsql.api.reporter.DocumentationReporter;
-import io.github.utplsql.api.reporter.Reporter;
-import io.github.utplsql.api.rules.DatabaseRule;
+import org.utplsql.api.reporter.DocumentationReporter;
+import org.utplsql.api.reporter.Reporter;
+import org.utplsql.api.rules.DatabaseRule;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/src/test/java/io/github/utplsql/api/ReporterNameTest.java b/src/test/java/org/utplsql/api/ReporterNameTest.java
similarity index 96%
rename from src/test/java/io/github/utplsql/api/ReporterNameTest.java
rename to src/test/java/org/utplsql/api/ReporterNameTest.java
index 34f9118..cd7cc13 100644
--- a/src/test/java/io/github/utplsql/api/ReporterNameTest.java
+++ b/src/test/java/org/utplsql/api/ReporterNameTest.java
@@ -1,8 +1,8 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
-import io.github.utplsql.api.reporter.*;
 import org.junit.Assert;
 import org.junit.Test;
+import org.utplsql.api.reporter.*;
 
 import java.sql.SQLException;
 
diff --git a/src/test/java/io/github/utplsql/api/TestRunnerTest.java b/src/test/java/org/utplsql/api/TestRunnerTest.java
similarity index 90%
rename from src/test/java/io/github/utplsql/api/TestRunnerTest.java
rename to src/test/java/org/utplsql/api/TestRunnerTest.java
index dd198a3..65fdd80 100644
--- a/src/test/java/io/github/utplsql/api/TestRunnerTest.java
+++ b/src/test/java/org/utplsql/api/TestRunnerTest.java
@@ -1,11 +1,11 @@
-package io.github.utplsql.api;
+package org.utplsql.api;
 
-import io.github.utplsql.api.exception.SomeTestsFailedException;
-import io.github.utplsql.api.reporter.*;
-import io.github.utplsql.api.rules.DatabaseRule;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
+import org.utplsql.api.exception.SomeTestsFailedException;
+import org.utplsql.api.reporter.*;
+import org.utplsql.api.rules.DatabaseRule;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/test/java/io/github/utplsql/api/rules/DatabaseRule.java b/src/test/java/org/utplsql/api/rules/DatabaseRule.java
similarity index 97%
rename from src/test/java/io/github/utplsql/api/rules/DatabaseRule.java
rename to src/test/java/org/utplsql/api/rules/DatabaseRule.java
index 2cb5805..79baf95 100644
--- a/src/test/java/io/github/utplsql/api/rules/DatabaseRule.java
+++ b/src/test/java/org/utplsql/api/rules/DatabaseRule.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.api.rules;
+package org.utplsql.api.rules;
 
 import org.junit.rules.ExternalResource;