diff --git a/pom.xml b/pom.xml
index f0f5b41..6acefac 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>cli</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -18,15 +18,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.beust</groupId>
-      <artifactId>jcommander</artifactId>
-      <version>1.69</version>
+      <groupId>org.utplsql</groupId>
+      <artifactId>java-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>io.github.utplsql</groupId>
-      <artifactId>java-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <groupId>com.beust</groupId>
+      <artifactId>jcommander</artifactId>
+      <version>1.69</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -50,7 +50,7 @@
           <repositoryLayout>flat</repositoryLayout>
           <programs>
             <program>
-              <mainClass>io.github.utplsql.cli.Cli</mainClass>
+              <mainClass>org.utplsql.cli.Cli</mainClass>
               <id>utplsql</id>
             </program>
           </programs>
diff --git a/src/main/java/io/github/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
similarity index 97%
rename from src/main/java/io/github/utplsql/cli/Cli.java
rename to src/main/java/org/utplsql/cli/Cli.java
index 0e79ce0..4ea8652 100644
--- a/src/main/java/io/github/utplsql/cli/Cli.java
+++ b/src/main/java/org/utplsql/cli/Cli.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
diff --git a/src/main/java/io/github/utplsql/cli/ConnectionInfo.java b/src/main/java/org/utplsql/cli/ConnectionInfo.java
similarity index 99%
rename from src/main/java/io/github/utplsql/cli/ConnectionInfo.java
rename to src/main/java/org/utplsql/cli/ConnectionInfo.java
index 5f8deac..cbdda73 100644
--- a/src/main/java/io/github/utplsql/cli/ConnectionInfo.java
+++ b/src/main/java/org/utplsql/cli/ConnectionInfo.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import com.beust.jcommander.ParameterException;
 
diff --git a/src/main/java/io/github/utplsql/cli/ConnectionStringConverter.java b/src/main/java/org/utplsql/cli/ConnectionStringConverter.java
similarity index 90%
rename from src/main/java/io/github/utplsql/cli/ConnectionStringConverter.java
rename to src/main/java/org/utplsql/cli/ConnectionStringConverter.java
index 5caa362..ba8c82a 100644
--- a/src/main/java/io/github/utplsql/cli/ConnectionStringConverter.java
+++ b/src/main/java/org/utplsql/cli/ConnectionStringConverter.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import com.beust.jcommander.IStringConverter;
 
diff --git a/src/main/java/io/github/utplsql/cli/FileWalker.java b/src/main/java/org/utplsql/cli/FileWalker.java
similarity index 97%
rename from src/main/java/io/github/utplsql/cli/FileWalker.java
rename to src/main/java/org/utplsql/cli/FileWalker.java
index 2fb108c..3fec655 100644
--- a/src/main/java/io/github/utplsql/cli/FileWalker.java
+++ b/src/main/java/org/utplsql/cli/FileWalker.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/main/java/io/github/utplsql/cli/ReporterOptions.java b/src/main/java/org/utplsql/cli/ReporterOptions.java
similarity index 95%
rename from src/main/java/io/github/utplsql/cli/ReporterOptions.java
rename to src/main/java/org/utplsql/cli/ReporterOptions.java
index 61eb930..a20ae3d 100644
--- a/src/main/java/io/github/utplsql/cli/ReporterOptions.java
+++ b/src/main/java/org/utplsql/cli/ReporterOptions.java
@@ -1,6 +1,6 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
-import io.github.utplsql.api.reporter.Reporter;
+import org.utplsql.api.reporter.Reporter;
 
 /**
  * Created by Vinicius on 20/05/2017.
diff --git a/src/main/java/io/github/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
similarity index 88%
rename from src/main/java/io/github/utplsql/cli/RunCommand.java
rename to src/main/java/org/utplsql/cli/RunCommand.java
index c82fd1c..dd77db5 100644
--- a/src/main/java/io/github/utplsql/cli/RunCommand.java
+++ b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -1,11 +1,11 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import io.github.utplsql.api.*;
-import io.github.utplsql.api.exception.SomeTestsFailedException;
-import io.github.utplsql.api.reporter.Reporter;
-import io.github.utplsql.api.reporter.ReporterFactory;
+import org.utplsql.api.*;
+import org.utplsql.api.exception.SomeTestsFailedException;
+import org.utplsql.api.reporter.Reporter;
+import org.utplsql.api.reporter.ReporterFactory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -202,17 +202,24 @@ public List<ReporterOptions> getReporterOptionsList() {
     public FileMapperOptions getMapperOptions(List<String> mappingParams, List<String> filePaths) {
         FileMapperOptions mapperOptions = new FileMapperOptions(filePaths);
 
+        final String OPT_OWNER="-owner=";
+        final String OPT_REGEX="-regex_expression=";
+        final String OPT_TYPE_MAPPING="-type_mapping=";
+        final String OPT_OWNER_SUBEX="-owner_subexpression=";
+        final String OPT_NAME_SUBEX="-name_subexpression=";
+        final String OPT_TYPE_SUBEX="-type_subexpression=";
+
         for (String p : mappingParams) {
-            if (p.startsWith("-object_owner=")) {
-                mapperOptions.setObjectOwner(p.substring("-object_owner=".length()));
+            if (p.startsWith(OPT_OWNER)) {
+                mapperOptions.setObjectOwner(p.substring(OPT_OWNER.length()));
             }
             else
-            if (p.startsWith("-regex_pattern=")) {
-                mapperOptions.setRegexPattern(p.substring("-regex_pattern=".length()));
+            if (p.startsWith(OPT_REGEX)) {
+                mapperOptions.setRegexPattern(p.substring(OPT_REGEX.length()));
             }
             else
-            if (p.startsWith("-type_mapping=")) {
-                String typeMappingsParam = p.substring("-type_mapping=".length());
+            if (p.startsWith(OPT_TYPE_MAPPING)) {
+                String typeMappingsParam = p.substring(OPT_TYPE_MAPPING.length());
 
                 List<KeyValuePair> typeMappings = new ArrayList<>();
                 for (String mapping : typeMappingsParam.split("/")) {
@@ -223,23 +230,20 @@ public FileMapperOptions getMapperOptions(List<String> mappingParams, List<Strin
                 mapperOptions.setTypeMappings(typeMappings);
             }
             else
-            if (p.startsWith("-owner_subexpression=")) {
-                mapperOptions.setOwnerSubExpression(Integer.parseInt(p.substring("-owner_subexpression=".length())));
+            if (p.startsWith(OPT_OWNER_SUBEX)) {
+                mapperOptions.setOwnerSubExpression(Integer.parseInt(p.substring(OPT_OWNER_SUBEX.length())));
             }
             else
-            if (p.startsWith("-name_subexpression=")) {
-                mapperOptions.setNameSubExpression(Integer.parseInt(p.substring("-name_subexpression=".length())));
+            if (p.startsWith(OPT_NAME_SUBEX)) {
+                mapperOptions.setNameSubExpression(Integer.parseInt(p.substring(OPT_NAME_SUBEX.length())));
             }
             else
-            if (p.startsWith("-type_subexpression=")) {
+            if (p.startsWith(OPT_TYPE_SUBEX)) {
                 mapperOptions.setTypeSubExpression(Integer.parseInt(p.substring("-type_subexpression=".length())));
             }
         }
 
-        if (mapperOptions.getRegexPattern() == null || mapperOptions.getRegexPattern().isEmpty())
-            return null;
-        else
-            return mapperOptions;
+        return mapperOptions;
     }
 
 }
diff --git a/src/test/java/io/github/utplsql/cli/ConnectionInfoTest.java b/src/test/java/org/utplsql/cli/ConnectionInfoTest.java
similarity index 99%
rename from src/test/java/io/github/utplsql/cli/ConnectionInfoTest.java
rename to src/test/java/org/utplsql/cli/ConnectionInfoTest.java
index a48ef77..874de69 100644
--- a/src/test/java/io/github/utplsql/cli/ConnectionInfoTest.java
+++ b/src/test/java/org/utplsql/cli/ConnectionInfoTest.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import com.beust.jcommander.ParameterException;
 import org.junit.Assert;
diff --git a/src/test/java/io/github/utplsql/cli/FileWalkerTest.java b/src/test/java/org/utplsql/cli/FileWalkerTest.java
similarity index 98%
rename from src/test/java/io/github/utplsql/cli/FileWalkerTest.java
rename to src/test/java/org/utplsql/cli/FileWalkerTest.java
index 4752df6..b8e2738 100644
--- a/src/test/java/io/github/utplsql/cli/FileWalkerTest.java
+++ b/src/test/java/org/utplsql/cli/FileWalkerTest.java
@@ -1,4 +1,4 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/io/github/utplsql/cli/RunCommandTest.java b/src/test/java/org/utplsql/cli/RunCommandTest.java
similarity index 98%
rename from src/test/java/io/github/utplsql/cli/RunCommandTest.java
rename to src/test/java/org/utplsql/cli/RunCommandTest.java
index 9ae9a48..66a1e2b 100644
--- a/src/test/java/io/github/utplsql/cli/RunCommandTest.java
+++ b/src/test/java/org/utplsql/cli/RunCommandTest.java
@@ -1,9 +1,9 @@
-package io.github.utplsql.cli;
+package org.utplsql.cli;
 
 import com.beust.jcommander.JCommander;
-import io.github.utplsql.api.CustomTypes;
 import org.junit.Assert;
 import org.junit.Test;
+import org.utplsql.api.CustomTypes;
 
 import java.util.List;