http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java
----------------------------------------------------------------------
diff --git 
a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java
 
b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java
index 90c54d3..261b680 100644
--- 
a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java
+++ 
b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +23,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import mvm.rya.indexing.IndexPlanValidator.IndexedExecutionPlanGenerator;
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
+import 
org.apache.rya.indexing.IndexPlanValidator.IndexedExecutionPlanGenerator;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
 
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java
----------------------------------------------------------------------
diff --git 
a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java
 
b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java
index ee90c35..f56500a 100644
--- 
a/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java
+++ 
b/extras/indexing/src/test/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilitesTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,7 +17,7 @@ package mvm.rya.indexing.pcj.matching;
  * specific language governing permissions and limitations
  * under the License.
  */
-import mvm.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
+import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
 
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
----------------------------------------------------------------------
diff --git 
a/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
 
b/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
index b50e40a..a22825b 100644
--- 
a/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
+++ 
b/extras/indexing/src/test/java/org/apache/rya/sail/config/RyaAccumuloSailFactoryTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.sail.config;
+package org.apache.rya.sail.config;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import mvm.rya.sail.config.RyaAccumuloSailConfig;
-import mvm.rya.sail.config.RyaAccumuloSailFactory;
+import org.apache.rya.sail.config.RyaAccumuloSailConfig;
+import org.apache.rya.sail.config.RyaAccumuloSailFactory;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexingExample/src/main/java/EntityDirectExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/EntityDirectExample.java 
b/extras/indexingExample/src/main/java/EntityDirectExample.java
index 4187d8f..a37e8b0 100644
--- a/extras/indexingExample/src/main/java/EntityDirectExample.java
+++ b/extras/indexingExample/src/main/java/EntityDirectExample.java
@@ -42,9 +42,9 @@ import org.openrdf.repository.sail.SailRepository;
 import org.openrdf.repository.sail.SailRepositoryConnection;
 import org.openrdf.sail.Sail;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 public class EntityDirectExample {
     private static final Logger log = 
Logger.getLogger(EntityDirectExample.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java 
b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
index b741e6a..27ec9b9 100644
--- a/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
+++ b/extras/indexingExample/src/main/java/MongoRyaDirectExample.java
@@ -43,13 +43,13 @@ import org.openrdf.repository.sail.SailRepository;
 import org.openrdf.repository.sail.SailRepositoryConnection;
 import org.openrdf.sail.Sail;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.mongodb.MongoDBRdfConfiguration;
-import mvm.rya.rdftriplestore.RdfCloudTripleStore;
-import mvm.rya.rdftriplestore.inference.InferenceEngineException;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
+import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 public class MongoRyaDirectExample {
     private static final Logger log = 
Logger.getLogger(MongoRyaDirectExample.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexingExample/src/main/java/RyaClientExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/RyaClientExample.java 
b/extras/indexingExample/src/main/java/RyaClientExample.java
index bee44e1..1c0a3b6 100644
--- a/extras/indexingExample/src/main/java/RyaClientExample.java
+++ b/extras/indexingExample/src/main/java/RyaClientExample.java
@@ -60,14 +60,14 @@ import org.apache.fluo.api.client.FluoFactory;
 import org.apache.fluo.api.config.FluoConfiguration;
 import org.apache.fluo.api.config.ObserverSpecification;
 import org.apache.fluo.api.mini.MiniFluo;
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.api.client.Install.InstallConfiguration;
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
-import mvm.rya.api.client.accumulo.AccumuloRyaClientFactory;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.api.client.Install.InstallConfiguration;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 /**
  * Demonstrates how a {@link RyaClient} may be used to interact with an 
instance

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexingExample/src/main/java/RyaDirectExample.java
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/java/RyaDirectExample.java 
b/extras/indexingExample/src/main/java/RyaDirectExample.java
index 522f840..4b5e042 100644
--- a/extras/indexingExample/src/main/java/RyaDirectExample.java
+++ b/extras/indexingExample/src/main/java/RyaDirectExample.java
@@ -57,15 +57,15 @@ import org.openrdf.sail.SailException;
 
 import com.google.common.base.Optional;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.persist.RyaDAOException;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig;
-import 
mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
-import mvm.rya.rdftriplestore.inference.InferenceEngineException;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.persist.RyaDAOException;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
+import 
org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
+import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 public class RyaDirectExample {
        private static final Logger log = 
Logger.getLogger(RyaDirectExample.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
 
b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
index ff6285b..b9d12d1 100644
--- 
a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
+++ 
b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/PCJOptimizerBenchmark.java
@@ -48,9 +48,9 @@ import org.openrdf.query.parser.sparql.SPARQLParser;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
-import mvm.rya.indexing.pcj.matching.PCJOptimizer;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.external.tupleSet.SimpleExternalTupleSet;
+import org.apache.rya.indexing.pcj.matching.PCJOptimizer;
 
 /**
  * A benchmark that may be used to evaluate the performance of {@link 
PCJOptimizer}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
 
b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
index 404f183..e24ac54 100644
--- 
a/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
+++ 
b/extras/rya.benchmark/src/main/java/org/apache/rya/benchmark/query/QueryBenchmark.java
@@ -60,11 +60,11 @@ import org.openrdf.sail.SailConnection;
 import org.openrdf.sail.SailException;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import 
mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
-import 
mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import 
org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
+import 
org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 /**
  * A benchmark that may be used to evaluate the performance of SPARQL queries

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java
 
b/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java
index e45002f..c36cb2c 100644
--- 
a/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java
+++ 
b/extras/rya.benchmark/src/test/java/org/apache/rya/benchmark/query/QueryBenchmarkRunIT.java
@@ -38,15 +38,15 @@ import org.openrdf.sail.Sail;
 import org.openrdf.sail.SailConnection;
 import org.openrdf.sail.SailException;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.api.client.Install.InstallConfiguration;
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
-import mvm.rya.api.client.accumulo.AccumuloRyaClientFactory;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import 
mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
-import 
mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.api.client.Install.InstallConfiguration;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import 
org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
+import 
org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 /**
  * Integration tests {@link QueryBenchmarkRun}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java
index 3c3e244..33bfd98 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaAdminCommands.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static java.util.Objects.requireNonNull;
 
@@ -33,20 +33,20 @@ import org.springframework.stereotype.Component;
 
 import com.google.common.base.Optional;
 
-import mvm.rya.api.client.GetInstanceDetails;
-import mvm.rya.api.client.Install.DuplicateInstanceNameException;
-import mvm.rya.api.client.Install.InstallConfiguration;
-import mvm.rya.api.client.InstanceDoesNotExistException;
-import mvm.rya.api.client.PCJDoesNotExistException;
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.RyaClientException;
-import mvm.rya.api.instance.RyaDetails;
-import mvm.rya.shell.SharedShellState.ConnectionState;
-import mvm.rya.shell.SharedShellState.ShellState;
-import mvm.rya.shell.util.InstallPrompt;
-import mvm.rya.shell.util.InstanceNamesFormatter;
-import mvm.rya.shell.util.RyaDetailsFormatter;
-import mvm.rya.shell.util.SparqlPrompt;
+import org.apache.rya.api.client.GetInstanceDetails;
+import org.apache.rya.api.client.Install.DuplicateInstanceNameException;
+import org.apache.rya.api.client.Install.InstallConfiguration;
+import org.apache.rya.api.client.InstanceDoesNotExistException;
+import org.apache.rya.api.client.PCJDoesNotExistException;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.RyaClientException;
+import org.apache.rya.api.instance.RyaDetails;
+import org.apache.rya.shell.SharedShellState.ConnectionState;
+import org.apache.rya.shell.SharedShellState.ShellState;
+import org.apache.rya.shell.util.InstallPrompt;
+import org.apache.rya.shell.util.InstanceNamesFormatter;
+import org.apache.rya.shell.util.RyaDetailsFormatter;
+import org.apache.rya.shell.util.SparqlPrompt;
 
 /**
  * Rya Shell commands that have to do with administrative tasks.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/RyaBannerProvider.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaBannerProvider.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaBannerProvider.java
index cdd706c..42581ed 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaBannerProvider.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaBannerProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import java.io.IOException;
 import java.net.JarURLConnection;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/RyaConnectionCommands.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaConnectionCommands.java
 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaConnectionCommands.java
index d305a87..a5debc2 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaConnectionCommands.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaConnectionCommands.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static java.util.Objects.requireNonNull;
 
@@ -35,14 +35,14 @@ import org.springframework.stereotype.Component;
 
 import com.google.common.base.Optional;
 
-import mvm.rya.api.client.InstanceExists;
-import mvm.rya.api.client.RyaClientException;
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
-import mvm.rya.api.client.accumulo.AccumuloRyaClientFactory;
-import mvm.rya.shell.SharedShellState.ConnectionState;
-import mvm.rya.shell.util.ConnectorFactory;
-import mvm.rya.shell.util.PasswordPrompt;
+import org.apache.rya.api.client.InstanceExists;
+import org.apache.rya.api.client.RyaClientException;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory;
+import org.apache.rya.shell.SharedShellState.ConnectionState;
+import org.apache.rya.shell.util.ConnectorFactory;
+import org.apache.rya.shell.util.PasswordPrompt;
 
 /**
  * Spring Shell commands that manage the connection that is used by the shell.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/RyaPromptProvider.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaPromptProvider.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaPromptProvider.java
index b78fdd9..ed5f261 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/RyaPromptProvider.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/RyaPromptProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static java.util.Objects.requireNonNull;
 
@@ -26,7 +26,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.shell.plugin.support.DefaultPromptProvider;
 import org.springframework.stereotype.Component;
 
-import mvm.rya.shell.SharedShellState.ShellState;
+import org.apache.rya.shell.SharedShellState.ShellState;
 
 /**
  * Customizes the Rya Shell's prompt.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
index 01ab8bf..e9ada65 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/SharedShellState.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static java.util.Objects.requireNonNull;
 
@@ -30,8 +30,8 @@ import javax.annotation.concurrent.ThreadSafe;
 
 import com.google.common.base.Optional;
 
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
 
 /**
  * Holds values that are shared between the various Rya command classes.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
index 23c3e26..9aaa402 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/ConnectorFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import static java.util.Objects.requireNonNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstallPrompt.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstallPrompt.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstallPrompt.java
index 44aa270..397deca 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstallPrompt.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstallPrompt.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import java.io.IOException;
 
 import com.google.common.base.Optional;
 
 import jline.console.ConsoleReader;
-import mvm.rya.api.client.Install.InstallConfiguration;
+import org.apache.rya.api.client.Install.InstallConfiguration;
 
 /**
  * A mechanism for prompting a user of the application for a the parameters

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
index dc70894..c8fe791 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/InstanceNamesFormatter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import static java.util.Objects.requireNonNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
index 5af4278..caa19b2 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/JLinePrompt.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import static java.util.Objects.requireNonNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
index c4a7d90..db2913d 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/PasswordPrompt.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
index 4c83b8d..fc85bb0 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/RyaDetailsFormatter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import static java.util.Objects.requireNonNull;
 
@@ -25,9 +25,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 
-import mvm.rya.api.instance.RyaDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
+import org.apache.rya.api.instance.RyaDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
 
 /**
  * Formats an instance of {@link RyaDetails}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
index e47e292..e1cb390 100644
--- 
a/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
+++ 
b/extras/rya.console/src/main/java/org/apache/rya/shell/util/SparqlPrompt.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/RyaAdminCommandsTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaAdminCommandsTest.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaAdminCommandsTest.java
index 430e946..b3cc379 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaAdminCommandsTest.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaAdminCommandsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.eq;
@@ -34,32 +34,32 @@ import org.junit.Test;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 
-import mvm.rya.api.client.BatchUpdatePCJ;
-import mvm.rya.api.client.CreatePCJ;
-import mvm.rya.api.client.DeletePCJ;
-import mvm.rya.api.client.GetInstanceDetails;
-import mvm.rya.api.client.Install;
-import mvm.rya.api.client.Install.DuplicateInstanceNameException;
-import mvm.rya.api.client.Install.InstallConfiguration;
-import mvm.rya.api.client.InstanceDoesNotExistException;
-import mvm.rya.api.client.ListInstances;
-import mvm.rya.api.client.PCJDoesNotExistException;
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.RyaClientException;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
-import mvm.rya.api.instance.RyaDetails;
-import mvm.rya.api.instance.RyaDetails.EntityCentricIndexDetails;
-import mvm.rya.api.instance.RyaDetails.FreeTextIndexDetails;
-import mvm.rya.api.instance.RyaDetails.GeoIndexDetails;
-import mvm.rya.api.instance.RyaDetails.JoinSelectivityDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.FluoDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
-import 
mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpdateStrategy;
-import mvm.rya.api.instance.RyaDetails.ProspectorDetails;
-import mvm.rya.api.instance.RyaDetails.TemporalIndexDetails;
-import mvm.rya.shell.util.InstallPrompt;
-import mvm.rya.shell.util.SparqlPrompt;
+import org.apache.rya.api.client.BatchUpdatePCJ;
+import org.apache.rya.api.client.CreatePCJ;
+import org.apache.rya.api.client.DeletePCJ;
+import org.apache.rya.api.client.GetInstanceDetails;
+import org.apache.rya.api.client.Install;
+import org.apache.rya.api.client.Install.DuplicateInstanceNameException;
+import org.apache.rya.api.client.Install.InstallConfiguration;
+import org.apache.rya.api.client.InstanceDoesNotExistException;
+import org.apache.rya.api.client.ListInstances;
+import org.apache.rya.api.client.PCJDoesNotExistException;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.RyaClientException;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.api.instance.RyaDetails;
+import org.apache.rya.api.instance.RyaDetails.EntityCentricIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.FreeTextIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.GeoIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.JoinSelectivityDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.FluoDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
+import 
org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpdateStrategy;
+import org.apache.rya.api.instance.RyaDetails.ProspectorDetails;
+import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails;
+import org.apache.rya.shell.util.InstallPrompt;
+import org.apache.rya.shell.util.SparqlPrompt;
 
 /**
  * Unit tests the methods of {@link RyaAdminCommands}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/RyaConnectionCommandsIT.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaConnectionCommandsIT.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaConnectionCommandsIT.java
index c755181..6d2644b 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaConnectionCommandsIT.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaConnectionCommandsIT.java
@@ -34,7 +34,7 @@
 // * specific language governing permissions and limitations
 // * under the License.
 // */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -50,11 +50,11 @@ import org.springframework.shell.Bootstrap;
 import org.springframework.shell.core.CommandResult;
 import org.springframework.shell.core.JLineShellComponent;
 
-import mvm.rya.api.client.Install.InstallConfiguration;
-import mvm.rya.shell.SharedShellState.ConnectionState;
-import mvm.rya.shell.SharedShellState.ShellState;
-import mvm.rya.shell.util.InstallPrompt;
-import mvm.rya.shell.util.PasswordPrompt;
+import org.apache.rya.api.client.Install.InstallConfiguration;
+import org.apache.rya.shell.SharedShellState.ConnectionState;
+import org.apache.rya.shell.SharedShellState.ShellState;
+import org.apache.rya.shell.util.InstallPrompt;
+import org.apache.rya.shell.util.PasswordPrompt;
 
 /**
  * Integration tests the methods of {@link RyaConnectionCommands}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/RyaPromptProviderTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaPromptProviderTest.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaPromptProviderTest.java
index 54a0bba..d3eaa4e 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaPromptProviderTest.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaPromptProviderTest.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
 
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
 
 /**
  * Tests the methods of {@link RyaPromptProvider}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/RyaShellITBase.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaShellITBase.java 
b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaShellITBase.java
index 162cecf..9727852 100644
--- a/extras/rya.console/src/test/java/org/apache/rya/shell/RyaShellITBase.java
+++ b/extras/rya.console/src/test/java/org/apache/rya/shell/RyaShellITBase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import java.io.IOException;
 
@@ -32,7 +32,7 @@ import org.junit.BeforeClass;
 import org.springframework.shell.Bootstrap;
 import org.springframework.shell.core.JLineShellComponent;
 
-import mvm.rya.accumulo.MiniAccumuloClusterInstance;
+import org.apache.rya.accumulo.MiniAccumuloClusterInstance;
 
 /**
  * All Rya Shell integration tests should extend this one. It provides startup

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/SharedShellStateTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/SharedShellStateTest.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/SharedShellStateTest.java
index e5f0341..e79d186 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/SharedShellStateTest.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/SharedShellStateTest.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell;
+package org.apache.rya.shell;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
 
-import mvm.rya.api.client.RyaClient;
-import mvm.rya.api.client.accumulo.AccumuloConnectionDetails;
-import mvm.rya.shell.SharedShellState.ConnectionState;
-import mvm.rya.shell.SharedShellState.ShellState;
+import org.apache.rya.api.client.RyaClient;
+import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails;
+import org.apache.rya.shell.SharedShellState.ConnectionState;
+import org.apache.rya.shell.SharedShellState.ShellState;
 
 /**
  * Tests the methods of {@link SharedShellState}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/util/ConnectorFactoryIT.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/util/ConnectorFactoryIT.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/util/ConnectorFactoryIT.java
index e96b0ad..c3a5e74 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/util/ConnectorFactoryIT.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/util/ConnectorFactoryIT.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import java.nio.CharBuffer;
 
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.junit.Test;
 
-import mvm.rya.accumulo.AccumuloITBase;
+import org.apache.rya.accumulo.AccumuloITBase;
 
 /**
  * Tests the methods of {@link ConnectorFactory}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/util/InstanceNamesFormatterTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/util/InstanceNamesFormatterTest.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/util/InstanceNamesFormatterTest.java
index f10b776..d6e23df 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/util/InstanceNamesFormatterTest.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/util/InstanceNamesFormatterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.console/src/test/java/org/apache/rya/shell/util/RyaDetailsFormatterTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.console/src/test/java/org/apache/rya/shell/util/RyaDetailsFormatterTest.java
 
b/extras/rya.console/src/test/java/org/apache/rya/shell/util/RyaDetailsFormatterTest.java
index 62d94bd..62ef666 100644
--- 
a/extras/rya.console/src/test/java/org/apache/rya/shell/util/RyaDetailsFormatterTest.java
+++ 
b/extras/rya.console/src/test/java/org/apache/rya/shell/util/RyaDetailsFormatterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.shell.util;
+package org.apache.rya.shell.util;
 
 import static org.junit.Assert.assertEquals;
 
@@ -27,17 +27,17 @@ import org.junit.Test;
 
 import com.google.common.base.Optional;
 
-import mvm.rya.api.instance.RyaDetails;
-import mvm.rya.api.instance.RyaDetails.EntityCentricIndexDetails;
-import mvm.rya.api.instance.RyaDetails.FreeTextIndexDetails;
-import mvm.rya.api.instance.RyaDetails.GeoIndexDetails;
-import mvm.rya.api.instance.RyaDetails.JoinSelectivityDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.FluoDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
-import 
mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpdateStrategy;
-import mvm.rya.api.instance.RyaDetails.ProspectorDetails;
-import mvm.rya.api.instance.RyaDetails.TemporalIndexDetails;
+import org.apache.rya.api.instance.RyaDetails;
+import org.apache.rya.api.instance.RyaDetails.EntityCentricIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.FreeTextIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.GeoIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.JoinSelectivityDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.FluoDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
+import 
org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails.PCJUpdateStrategy;
+import org.apache.rya.api.instance.RyaDetails.ProspectorDetails;
+import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails;
 
 /**
  * Tests the methods of {@link RyaDetailsFormatter}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoEnabledFilterFunctionOptimizer.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoEnabledFilterFunctionOptimizer.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoEnabledFilterFunctionOptimizer.java
index 45d1f1a..d773831 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoEnabledFilterFunctionOptimizer.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoEnabledFilterFunctionOptimizer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing;
+package org.apache.rya.indexing;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -59,17 +59,17 @@ import 
org.openrdf.query.algebra.helpers.QueryModelVisitorBase;
 
 import com.google.common.collect.Lists;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.indexing.IndexingFunctionRegistry.FUNCTION_TYPE;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer;
-import mvm.rya.indexing.accumulo.freetext.FreeTextTupleSet;
-import mvm.rya.indexing.accumulo.geo.GeoMesaGeoIndexer;
-import mvm.rya.indexing.accumulo.geo.GeoTupleSet;
-import mvm.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer;
-import mvm.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
-import mvm.rya.indexing.mongodb.geo.MongoGeoIndexer;
-import mvm.rya.indexing.mongodb.temporal.MongoTemporalIndexer;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.indexing.IndexingFunctionRegistry.FUNCTION_TYPE;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer;
+import org.apache.rya.indexing.accumulo.freetext.FreeTextTupleSet;
+import org.apache.rya.indexing.accumulo.geo.GeoMesaGeoIndexer;
+import org.apache.rya.indexing.accumulo.geo.GeoTupleSet;
+import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer;
+import org.apache.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
+import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import org.apache.rya.indexing.mongodb.temporal.MongoTemporalIndexer;
 
 public class GeoEnabledFilterFunctionOptimizer implements QueryOptimizer, 
Configurable {
     private static final Logger LOG = 
Logger.getLogger(GeoEnabledFilterFunctionOptimizer.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoIndexer.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoIndexer.java 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoIndexer.java
index 40dfeec..d71f036 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoIndexer.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing;
+package org.apache.rya.indexing;
 
 import org.openrdf.model.Statement;
 import org.openrdf.query.QueryEvaluationException;
@@ -27,7 +27,7 @@ import com.vividsolutions.jts.geom.Geometry;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.persist.index.RyaSecondaryIndexer;
+import org.apache.rya.api.persist.index.RyaSecondaryIndexer;
 
 /**
  * A repository to store, index, and retrieve {@link Statement}s based on 
geospatial features.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
index 368d3c9..8cb3a7b 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/GeoRyaSailFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing;
+package org.apache.rya.indexing;
 
 import static java.util.Objects.requireNonNull;
 
@@ -34,23 +34,23 @@ import org.slf4j.LoggerFactory;
 
 import com.mongodb.MongoClient;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.accumulo.AccumuloRyaDAO;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
-import mvm.rya.api.instance.RyaDetailsToConfiguration;
-import mvm.rya.api.layout.TablePrefixLayoutStrategy;
-import mvm.rya.api.persist.RyaDAO;
-import mvm.rya.api.persist.RyaDAOException;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.mongodb.MongoConnectorFactory;
-import mvm.rya.mongodb.MongoDBRdfConfiguration;
-import mvm.rya.mongodb.MongoDBRyaDAO;
-import mvm.rya.mongodb.instance.MongoRyaInstanceDetailsRepository;
-import mvm.rya.rdftriplestore.RdfCloudTripleStore;
-import mvm.rya.rdftriplestore.inference.InferenceEngine;
-import mvm.rya.rdftriplestore.inference.InferenceEngineException;
-import mvm.rya.sail.config.RyaSailFactory;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.accumulo.AccumuloRyaDAO;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.api.instance.RyaDetailsToConfiguration;
+import org.apache.rya.api.layout.TablePrefixLayoutStrategy;
+import org.apache.rya.api.persist.RyaDAO;
+import org.apache.rya.api.persist.RyaDAOException;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.mongodb.MongoConnectorFactory;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.mongodb.MongoDBRyaDAO;
+import org.apache.rya.mongodb.instance.MongoRyaInstanceDetailsRepository;
+import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
+import org.apache.rya.rdftriplestore.inference.InferenceEngine;
+import org.apache.rya.rdftriplestore.inference.InferenceEngineException;
+import org.apache.rya.sail.config.RyaSailFactory;
 
 public class GeoRyaSailFactory {
     private static final Logger LOG = 
LoggerFactory.getLogger(GeoRyaSailFactory.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/OptionalConfigUtils.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/OptionalConfigUtils.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/OptionalConfigUtils.java
index 089610b..b10e824 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/OptionalConfigUtils.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/OptionalConfigUtils.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing;
+package org.apache.rya.indexing;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -49,22 +49,22 @@ import org.openrdf.model.impl.URIImpl;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.instance.RyaDetails;
-import mvm.rya.indexing.GeoEnabledFilterFunctionOptimizer;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.accumulo.entity.EntityCentricIndex;
-import mvm.rya.indexing.accumulo.entity.EntityOptimizer;
-import mvm.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer;
-import mvm.rya.indexing.accumulo.freetext.LuceneTokenizer;
-import mvm.rya.indexing.accumulo.freetext.Tokenizer;
-import mvm.rya.indexing.accumulo.geo.GeoMesaGeoIndexer;
-import mvm.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer;
-import mvm.rya.indexing.external.PrecomputedJoinIndexer;
-import mvm.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
-import mvm.rya.indexing.mongodb.geo.MongoGeoIndexer;
-import mvm.rya.indexing.pcj.matching.PCJOptimizer;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.instance.RyaDetails;
+import org.apache.rya.indexing.GeoEnabledFilterFunctionOptimizer;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.accumulo.entity.EntityCentricIndex;
+import org.apache.rya.indexing.accumulo.entity.EntityOptimizer;
+import org.apache.rya.indexing.accumulo.freetext.AccumuloFreeTextIndexer;
+import org.apache.rya.indexing.accumulo.freetext.LuceneTokenizer;
+import org.apache.rya.indexing.accumulo.freetext.Tokenizer;
+import org.apache.rya.indexing.accumulo.geo.GeoMesaGeoIndexer;
+import org.apache.rya.indexing.accumulo.temporal.AccumuloTemporalIndexer;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexer;
+import org.apache.rya.indexing.mongodb.freetext.MongoFreeTextIndexer;
+import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import org.apache.rya.indexing.pcj.matching.PCJOptimizer;
 
 /**
  * A set of configuration utils to read a Hadoop {@link Configuration} object 
and create Cloudbase/Accumulo objects.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
index fe173af..2e99b62 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.geo;
+package org.apache.rya.indexing.accumulo.geo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -71,16 +71,16 @@ import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.WKTReader;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.GeoIndexer;
-import mvm.rya.indexing.Md5Hash;
-import mvm.rya.indexing.OptionalConfigUtils;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.StatementSerializer;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.GeoIndexer;
+import org.apache.rya.indexing.Md5Hash;
+import org.apache.rya.indexing.OptionalConfigUtils;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.StatementSerializer;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 /**
  * A {@link GeoIndexer} wrapper around a GeoMesa {@link AccumuloDataStore}. 
This class configures and connects to the Datastore, creates the

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoParseUtils.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoParseUtils.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoParseUtils.java
index fa3699a..ffba225 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoParseUtils.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoParseUtils.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.geo;
+package org.apache.rya.indexing.accumulo.geo;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -37,7 +37,7 @@ import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.WKTReader;
 
-import mvm.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.GeoConstants;
 
 public class GeoParseUtils {
     static final Logger logger = Logger.getLogger(GeoParseUtils.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoTupleSet.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoTupleSet.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoTupleSet.java
index a3a0630..f77e726 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoTupleSet.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoTupleSet.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.geo;
+package org.apache.rya.indexing.accumulo.geo;
 
 import java.util.Map;
 import java.util.Set;
@@ -36,13 +36,13 @@ import com.vividsolutions.jts.io.WKTReader;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.GeoIndexer;
-import mvm.rya.indexing.IndexingExpr;
-import mvm.rya.indexing.IteratorFactory;
-import mvm.rya.indexing.SearchFunction;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.GeoIndexer;
+import org.apache.rya.indexing.IndexingExpr;
+import org.apache.rya.indexing.IteratorFactory;
+import org.apache.rya.indexing.SearchFunction;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 //Indexing Node for geo expressions to be inserted into execution plan
 //to delegate geo portion of query to geo index

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java
index 9411330..032f704 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/GeoMongoDBStorageStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.geo;
+package org.apache.rya.indexing.mongodb.geo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,10 +33,10 @@ import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.WKTReader;
 
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.accumulo.geo.GeoParseUtils;
-import mvm.rya.indexing.mongodb.IndexingMongoDBStorageStrategy;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.accumulo.geo.GeoParseUtils;
+import org.apache.rya.indexing.mongodb.IndexingMongoDBStorageStrategy;
 
 public class GeoMongoDBStorageStrategy extends IndexingMongoDBStorageStrategy {
     private static final Logger LOG = 
Logger.getLogger(GeoMongoDBStorageStrategy.class);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java
index 7589f03..02389c4 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.geo;
+package org.apache.rya.indexing.mongodb.geo;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +18,9 @@ package mvm.rya.indexing.mongodb.geo;
  * under the License.
  */
 
-import static 
mvm.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQueryType.EQUALS;
-import static 
mvm.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQueryType.INTERSECTS;
-import static 
mvm.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQueryType.WITHIN;
+import static 
org.apache.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQueryType.EQUALS;
+import static 
org.apache.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQueryType.INTERSECTS;
+import static 
org.apache.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQueryType.WITHIN;
 
 import org.apache.log4j.Logger;
 import org.openrdf.model.Statement;
@@ -30,12 +30,12 @@ import com.mongodb.DBObject;
 import com.vividsolutions.jts.geom.Geometry;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.indexing.GeoIndexer;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.mongodb.AbstractMongoIndexer;
-import mvm.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQuery;
-import mvm.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.indexing.GeoIndexer;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.AbstractMongoIndexer;
+import org.apache.rya.indexing.mongodb.geo.GeoMongoDBStorageStrategy.GeoQuery;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
 
 public class MongoGeoIndexer extends 
AbstractMongoIndexer<GeoMongoDBStorageStrategy> implements GeoIndexer {
     private static final String COLLECTION_SUFFIX = "geo";

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java
 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java
index 35e679e..aa2a129 100644
--- 
a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java
+++ 
b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/mongodb/geo/MongoGeoTupleSet.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.geo;
+package org.apache.rya.indexing.mongodb.geo;
 
 import java.util.Map;
 import java.util.Set;
@@ -36,14 +36,14 @@ import com.vividsolutions.jts.io.WKTReader;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.GeoIndexer;
-import mvm.rya.indexing.IndexingExpr;
-import mvm.rya.indexing.IteratorFactory;
-import mvm.rya.indexing.SearchFunction;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.geo.GeoTupleSet;
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.GeoIndexer;
+import org.apache.rya.indexing.IndexingExpr;
+import org.apache.rya.indexing.IteratorFactory;
+import org.apache.rya.indexing.SearchFunction;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.geo.GeoTupleSet;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 public class MongoGeoTupleSet extends ExternalTupleSet {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerSfTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerSfTest.java
 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerSfTest.java
index 69c3ce2..4b3af75 100644
--- 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerSfTest.java
+++ 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerSfTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.geo;
+package org.apache.rya.indexing.accumulo.geo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -59,13 +59,13 @@ import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.gml2.GMLWriter;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.resolver.RdfToRyaConversions;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 /**
  * Tests all of the "simple functions" of the geoindexer specific to GML.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java
 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java
index bd4092a..a5dd4c9 100644
--- 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java
+++ 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/accumulo/geo/GeoIndexerTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.geo;
+package org.apache.rya.indexing.accumulo.geo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package mvm.rya.indexing.accumulo.geo;
  * under the License.
  */
 
-import static mvm.rya.api.resolver.RdfToRyaConversions.convertStatement;
+import static org.apache.rya.api.resolver.RdfToRyaConversions.convertStatement;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -48,10 +48,10 @@ import com.vividsolutions.jts.geom.PrecisionModel;
 import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 /**
  * Tests  higher level functioning of the geoindexer parse WKT, predicate 
list, 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
index 01c6ab7..df4b4a1 100644
--- 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
+++ 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerSfTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongo;
+package org.apache.rya.indexing.mongo;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -50,15 +50,15 @@ import 
com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.resolver.RdfToRyaConversions;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.OptionalConfigUtils;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.mongodb.geo.MongoGeoIndexer;
-import mvm.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.OptionalConfigUtils;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
 
 /**
  * Tests all of the "simple functions" of the geoindexer.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
index 9b6c8cb..71a5db7 100644
--- 
a/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
+++ 
b/extras/rya.geoindexing/src/test/java/org/apache/rya/indexing/mongo/MongoGeoIndexerTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongo;
+package org.apache.rya.indexing.mongo;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.indexing.mongo;
 
 
 
-import static mvm.rya.api.resolver.RdfToRyaConversions.convertStatement;
+import static org.apache.rya.api.resolver.RdfToRyaConversions.convertStatement;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -52,12 +52,12 @@ import 
com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory;
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.indexing.GeoConstants;
-import mvm.rya.indexing.OptionalConfigUtils;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.mongodb.geo.MongoGeoIndexer;
-import mvm.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.indexing.GeoConstants;
+import org.apache.rya.indexing.OptionalConfigUtils;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.geo.MongoGeoIndexer;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
 
 public class MongoGeoIndexerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
index 83d1c40..77f70b1 100644
--- 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
+++ 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerializer.java
@@ -20,9 +20,9 @@ package org.apache.rya.indexing.pcj.storage.accumulo;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTE;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTE;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -39,11 +39,11 @@ import org.openrdf.query.algebra.evaluation.QueryBindingSet;
 
 import com.google.common.primitives.Bytes;
 
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.resolver.RdfToRyaConversions;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 /**
  * Converts {@link BindingSet}s to byte[]s and back again. The bytes do not

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
index 74368ef..bc615d1 100644
--- 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
+++ 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjStorage.java
@@ -37,15 +37,15 @@ import 
org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;
 import org.openrdf.query.BindingSet;
 import org.openrdf.query.MalformedQueryException;
 
-import mvm.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
-import mvm.rya.api.instance.RyaDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
-import mvm.rya.api.instance.RyaDetailsRepository;
-import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
-import mvm.rya.api.instance.RyaDetailsUpdater;
-import mvm.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator;
-import 
mvm.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException;
+import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
+import org.apache.rya.api.instance.RyaDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
+import org.apache.rya.api.instance.RyaDetailsRepository;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.api.instance.RyaDetailsUpdater;
+import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator;
+import 
org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException;
 
 /**
  * An Accumulo backed implementation of {@link PrecomputedJoinStorage}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
index 913cfc9..e73870a 100644
--- 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
+++ 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/storage/accumulo/BindingSetStringConverter.java
@@ -39,8 +39,8 @@ import org.openrdf.query.algebra.evaluation.QueryBindingSet;
 
 import com.google.common.base.Joiner;
 
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
 
 /**
  * Converts {@link BindingSet}s to Strings and back again. The Strings do not

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
index 5cf01c5..54fe325 100644
--- 
a/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
+++ 
b/extras/rya.indexing.pcj/src/main/java/org/apache/rya/indexing/pcj/update/PrecomputedJoinUpdater.java
@@ -24,7 +24,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 
 import org.apache.rya.indexing.pcj.storage.PcjException;
 
-import mvm.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaStatement;
 
 /**
  * Updates the state of all PCJ indices whenever {@link RyaStatement}s are

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerialzerTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerialzerTest.java
 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerialzerTest.java
index 5011adf..d69205e 100644
--- 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerialzerTest.java
+++ 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/AccumuloPcjSerialzerTest.java
@@ -32,7 +32,7 @@ import org.openrdf.query.impl.MapBindingSet;
  * under the License.
  */
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 /**
  * Tests the methods of {@link AccumuloPcjSerialzer}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIntegrationTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIntegrationTest.java
 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIntegrationTest.java
index bc93a05..623526e 100644
--- 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIntegrationTest.java
+++ 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesIntegrationTest.java
@@ -63,12 +63,12 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.accumulo.AccumuloRyaDAO;
-import mvm.rya.accumulo.MiniAccumuloClusterInstance;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.rdftriplestore.RdfCloudTripleStore;
-import mvm.rya.rdftriplestore.RyaSailRepository;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.accumulo.AccumuloRyaDAO;
+import org.apache.rya.accumulo.MiniAccumuloClusterInstance;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
+import org.apache.rya.rdftriplestore.RyaSailRepository;
 
 /**
  * Performs integration test using {@link MiniAccumuloCluster} to ensure the

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java
 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java
index 79f1f68..bbd0f11 100644
--- 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java
+++ 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/PcjTablesWithMockTest.java
@@ -25,11 +25,11 @@ import static org.junit.Assert.assertEquals;
 import java.util.HashSet;
 import java.util.Set;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.accumulo.AccumuloRyaDAO;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.rdftriplestore.RdfCloudTripleStore;
-import mvm.rya.rdftriplestore.RyaSailRepository;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.accumulo.AccumuloRyaDAO;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
+import org.apache.rya.rdftriplestore.RyaSailRepository;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/accumulo/AccumuloPcjStorageIT.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/accumulo/AccumuloPcjStorageIT.java
 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/accumulo/AccumuloPcjStorageIT.java
index 7474207..7eeff1d 100644
--- 
a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/accumulo/AccumuloPcjStorageIT.java
+++ 
b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/accumulo/AccumuloPcjStorageIT.java
@@ -46,12 +46,12 @@ import org.openrdf.query.impl.MapBindingSet;
 
 import com.google.common.collect.ImmutableMap;
 
-import mvm.rya.accumulo.AccumuloRyaITBase;
-import mvm.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
-import mvm.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
-import mvm.rya.api.instance.RyaDetailsRepository;
-import mvm.rya.api.instance.RyaDetailsRepository.NotInitializedException;
-import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.accumulo.AccumuloRyaITBase;
+import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
+import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.PCJDetails;
+import org.apache.rya.api.instance.RyaDetailsRepository;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.NotInitializedException;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
 
 /**
  * Integration tests the methods of {@link AccumuloPcjStorage}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java
 
b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java
index 7e863c0..fde6257 100644
--- 
a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java
+++ 
b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/AbstractDualInstanceAccumuloMRTool.java
@@ -1,8 +1,8 @@
-package mvm.rya.accumulo.mr.merge;
+package org.apache.rya.accumulo.mr.merge;
 
 /*
  * #%L
- * mvm.rya.accumulo.mr.merge
+ * org.apache.rya.accumulo.mr.merge
  * %%
  * Copyright (C) 2014 Rya
  * %%
@@ -23,10 +23,10 @@ package mvm.rya.accumulo.mr.merge;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.util.Tool;
 
-import mvm.rya.accumulo.AccumuloRdfConstants;
-import mvm.rya.accumulo.mr.AbstractAccumuloMRTool;
-import mvm.rya.accumulo.mr.MRUtils;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.accumulo.AccumuloRdfConstants;
+import org.apache.rya.accumulo.mr.AbstractAccumuloMRTool;
+import org.apache.rya.accumulo.mr.MRUtils;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
 
 /**
  * Handles setting up a map reduce {@link Tool} with a parent and child 
instance.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java
----------------------------------------------------------------------
diff --git 
a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java
 
b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java
index 7314451..87161f6 100644
--- 
a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java
+++ 
b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java
@@ -1,8 +1,8 @@
-package mvm.rya.accumulo.mr.merge;
+package org.apache.rya.accumulo.mr.merge;
 
 /*
  * #%L
- * mvm.rya.accumulo.mr.merge
+ * org.apache.rya.accumulo.mr.merge
  * %%
  * Copyright (C) 2014 Rya
  * %%
@@ -83,27 +83,27 @@ import org.apache.log4j.xml.DOMConfigurator;
 
 import com.google.common.base.Joiner;
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.accumulo.mr.AccumuloHDFSFileInputFormat;
-import mvm.rya.accumulo.mr.MRUtils;
-import mvm.rya.accumulo.mr.merge.common.InstanceType;
-import mvm.rya.accumulo.mr.merge.gui.DateTimePickerDialog;
-import mvm.rya.accumulo.mr.merge.mappers.AccumuloCopyToolMapper;
-import mvm.rya.accumulo.mr.merge.mappers.AccumuloRyaRuleMapper;
-import mvm.rya.accumulo.mr.merge.mappers.FileCopyToolMapper;
-import mvm.rya.accumulo.mr.merge.mappers.MergeToolMapper;
-import mvm.rya.accumulo.mr.merge.mappers.RowRuleMapper;
-import mvm.rya.accumulo.mr.merge.reducers.MultipleFileReducer;
-import mvm.rya.accumulo.mr.merge.util.AccumuloInstanceDriver;
-import mvm.rya.accumulo.mr.merge.util.AccumuloQueryRuleset;
-import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils;
-import mvm.rya.accumulo.mr.merge.util.GroupedRow;
-import mvm.rya.accumulo.mr.merge.util.TimeUtils;
-import mvm.rya.accumulo.mr.merge.util.ToolConfigUtils;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.layout.TablePrefixLayoutStrategy;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.accumulo.mr.AccumuloHDFSFileInputFormat;
+import org.apache.rya.accumulo.mr.MRUtils;
+import org.apache.rya.accumulo.mr.merge.common.InstanceType;
+import org.apache.rya.accumulo.mr.merge.gui.DateTimePickerDialog;
+import org.apache.rya.accumulo.mr.merge.mappers.AccumuloCopyToolMapper;
+import org.apache.rya.accumulo.mr.merge.mappers.AccumuloRyaRuleMapper;
+import org.apache.rya.accumulo.mr.merge.mappers.FileCopyToolMapper;
+import org.apache.rya.accumulo.mr.merge.mappers.MergeToolMapper;
+import org.apache.rya.accumulo.mr.merge.mappers.RowRuleMapper;
+import org.apache.rya.accumulo.mr.merge.reducers.MultipleFileReducer;
+import org.apache.rya.accumulo.mr.merge.util.AccumuloInstanceDriver;
+import org.apache.rya.accumulo.mr.merge.util.AccumuloQueryRuleset;
+import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils;
+import org.apache.rya.accumulo.mr.merge.util.GroupedRow;
+import org.apache.rya.accumulo.mr.merge.util.TimeUtils;
+import org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.layout.TablePrefixLayoutStrategy;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 /**
  * Handles copying data from a parent instance into a child instance.


Reply via email to