http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java 
b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java
index 775af53..f0d9f57 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/Join.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query.join;
+package org.apache.rya.api.persist.query.join;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,11 +22,11 @@ package mvm.rya.api.persist.query.join;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.persist.RyaDAOException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.persist.RyaDAOException;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java
index 1dfcbf1..767f61f 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/MergeJoin.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query.join;
+package org.apache.rya.api.persist.query.join;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,12 +24,12 @@ package mvm.rya.api.persist.query.join;
 import com.google.common.base.Preconditions;
 import info.aduna.iteration.CloseableIteration;
 import info.aduna.iteration.EmptyIteration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.*;
-import mvm.rya.api.persist.RyaDAOException;
-import mvm.rya.api.persist.query.RyaQueryEngine;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.utils.PeekingCloseableIteration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.*;
+import org.apache.rya.api.persist.RyaDAOException;
+import org.apache.rya.api.persist.query.RyaQueryEngine;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.utils.PeekingCloseableIteration;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java
index 81f42b4..06fe88b 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/persist/utils/RyaDAOHelper.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.utils;
+package org.apache.rya.api.persist.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,14 +22,14 @@ package mvm.rya.api.persist.utils;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.persist.RyaDAO;
-import mvm.rya.api.persist.RyaDAOException;
-import mvm.rya.api.resolver.RdfToRyaConversions;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.api.utils.NullableStatementImpl;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.persist.RyaDAO;
+import org.apache.rya.api.persist.RyaDAOException;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.api.utils.NullableStatementImpl;
 import org.openrdf.model.Resource;
 import org.openrdf.model.Statement;
 import org.openrdf.model.URI;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategy.java
index 5171feb..0224787 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy;
+package org.apache.rya.api.query.strategy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,12 +22,12 @@ package mvm.rya.api.query.strategy;
 
 
 import com.google.common.base.Preconditions;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.triple.TripleRowRegex;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.triple.TripleRowRegex;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/ByteRange.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/ByteRange.java 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/ByteRange.java
index 6ebc722..adfce0c 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/ByteRange.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/ByteRange.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy;
+package org.apache.rya.api.query.strategy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java
index 7b7eb39..7d61312 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/TriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy;
+package org.apache.rya.api.query.strategy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,15 +21,15 @@ package mvm.rya.api.query.strategy;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.resolver.triple.TripleRowRegex;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.resolver.triple.TripleRowRegex;
 
 import java.io.IOException;
 import java.util.Map;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/AbstractHashedTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/AbstractHashedTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/AbstractHashedTriplePatternStrategy.java
index 9a1aef3..60853f1 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/AbstractHashedTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/AbstractHashedTriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,13 +19,13 @@ package mvm.rya.api.query.strategy.wholerow;
  */
 
 import com.google.common.base.Preconditions;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.query.strategy.AbstractTriplePatternStrategy;
-import mvm.rya.api.query.strategy.TriplePatternStrategy;
-import mvm.rya.api.resolver.triple.TripleRowRegex;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.query.strategy.AbstractTriplePatternStrategy;
+import org.apache.rya.api.query.strategy.TriplePatternStrategy;
+import org.apache.rya.api.resolver.triple.TripleRowRegex;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM;
 
 public abstract class AbstractHashedTriplePatternStrategy extends 
AbstractTriplePatternStrategy implements TriplePatternStrategy {
     public static final String HASHED_ALL_REGEX = "([0-9a-f]{32})\u0000";

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java
index 1c2bc3c..f1abba9 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package mvm.rya.api.query.strategy.wholerow;
 
 
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
 
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -34,15 +34,15 @@ import org.apache.commons.codec.binary.Hex;
 
 import com.google.common.primitives.Bytes;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java
index f801525..c650b89 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategy.java
@@ -1,8 +1,8 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
 
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -34,16 +34,16 @@ import org.apache.commons.codec.binary.Hex;
 
 import com.google.common.primitives.Bytes;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.domain.RyaURIRange;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaURIRange;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java
index 24f5852..013dd8b 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,22 +21,22 @@ package mvm.rya.api.query.strategy.wholerow;
 
 
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST_BYTES;
 
 import java.io.IOException;
 import java.util.Map;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.query.strategy.AbstractTriplePatternStrategy;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.query.strategy.AbstractTriplePatternStrategy;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 import com.google.common.primitives.Bytes;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java
index 3f050e0..2667cb7 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,21 +22,21 @@ package mvm.rya.api.query.strategy.wholerow;
 
 
 import com.google.common.primitives.Bytes;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.query.strategy.AbstractTriplePatternStrategy;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.query.strategy.AbstractTriplePatternStrategy;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 import java.io.IOException;
 import java.util.Map;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.*;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.*;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java
index 2b91a4b..dc83210 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,21 +22,21 @@ package mvm.rya.api.query.strategy.wholerow;
 
 
 import com.google.common.primitives.Bytes;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.domain.RyaURIRange;
-import mvm.rya.api.query.strategy.AbstractTriplePatternStrategy;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaURIRange;
+import org.apache.rya.api.query.strategy.AbstractTriplePatternStrategy;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 
 import java.io.IOException;
 import java.util.Map;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.*;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.*;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java
index 3a6d125..44f77bd 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/CustomRyaTypeResolverMapping.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java
index 485bf0d..61c2b4d 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RdfToRyaConversions.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver;
 
 
 
-import mvm.rya.api.domain.*;
+import org.apache.rya.api.domain.*;
 import org.openrdf.model.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java
index 2b97e1c..d19226e 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaContext.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,20 +25,20 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.resolver.impl.BooleanRyaTypeResolver;
-import mvm.rya.api.resolver.impl.ByteRyaTypeResolver;
-import mvm.rya.api.resolver.impl.CustomDatatypeResolver;
-import mvm.rya.api.resolver.impl.DateTimeRyaTypeResolver;
-import mvm.rya.api.resolver.impl.DoubleRyaTypeResolver;
-import mvm.rya.api.resolver.impl.FloatRyaTypeResolver;
-import mvm.rya.api.resolver.impl.IntegerRyaTypeResolver;
-import mvm.rya.api.resolver.impl.LongRyaTypeResolver;
-import mvm.rya.api.resolver.impl.RyaTypeResolverImpl;
-import mvm.rya.api.resolver.impl.RyaURIResolver;
-import mvm.rya.api.resolver.impl.ServiceBackedRyaTypeResolverMappings;
-import mvm.rya.api.resolver.impl.ShortRyaTypeResolver;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.resolver.impl.BooleanRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.ByteRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.CustomDatatypeResolver;
+import org.apache.rya.api.resolver.impl.DateTimeRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.DoubleRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.FloatRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.IntegerRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.LongRyaTypeResolver;
+import org.apache.rya.api.resolver.impl.RyaTypeResolverImpl;
+import org.apache.rya.api.resolver.impl.RyaURIResolver;
+import org.apache.rya.api.resolver.impl.ServiceBackedRyaTypeResolverMappings;
+import org.apache.rya.api.resolver.impl.ShortRyaTypeResolver;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java
index a30d250..a59ba23 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaToRdfConversions.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package mvm.rya.api.resolver;
 
 
 
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Statement;
 import org.openrdf.model.URI;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java
index 848a0d3..37d19b1 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTripleContext.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,23 +28,23 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.query.strategy.TriplePatternStrategy;
-import 
mvm.rya.api.query.strategy.wholerow.HashedPoWholeRowTriplePatternStrategy;
-import 
mvm.rya.api.query.strategy.wholerow.HashedSpoWholeRowTriplePatternStrategy;
-import mvm.rya.api.query.strategy.wholerow.OspWholeRowTriplePatternStrategy;
-import mvm.rya.api.query.strategy.wholerow.PoWholeRowTriplePatternStrategy;
-import mvm.rya.api.query.strategy.wholerow.SpoWholeRowTriplePatternStrategy;
-import mvm.rya.api.resolver.triple.TripleRow;
-import mvm.rya.api.resolver.triple.TripleRowResolver;
-import mvm.rya.api.resolver.triple.TripleRowResolverException;
-import mvm.rya.api.resolver.triple.impl.WholeRowHashedTripleResolver;
-import mvm.rya.api.resolver.triple.impl.WholeRowTripleResolver;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.query.strategy.TriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.HashedPoWholeRowTriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.HashedSpoWholeRowTriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.OspWholeRowTriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.PoWholeRowTriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.SpoWholeRowTriplePatternStrategy;
+import org.apache.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.resolver.triple.TripleRowResolver;
+import org.apache.rya.api.resolver.triple.TripleRowResolverException;
+import org.apache.rya.api.resolver.triple.impl.WholeRowHashedTripleResolver;
+import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver;
 
 /**
  * Date: 7/16/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java
index 5b1cd20..98e2f82 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package mvm.rya.api.resolver;
 
 
 
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaTypeRange;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaTypeRange;
 import org.openrdf.model.URI;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverException.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverException.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverException.java
index 45f874c..39cd24d 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverException.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverException.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java
index 0c7a30a..82502ff 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/RyaTypeResolverMapping.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java
index f5de2de..1727944 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/BooleanRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java
index 4b80679..5de72fc 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ByteRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java
index ae93e0f..2c4b689 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/CustomDatatypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,11 +22,11 @@ package mvm.rya.api.resolver.impl;
 
 
 import com.google.common.primitives.Bytes;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.openrdf.model.impl.URIImpl;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
 
 /**
  * Date: 7/16/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java
index cb3e7cf..c244b9e 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DateTimeRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java
index 88daa0f..de8f753 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/DoubleRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java
index 2969a4b..851b32c 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/FloatRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java
index 2f6c727..12705d8 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/IntegerRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java
index e073495..3b700d7 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/LongRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaTypeResolverImpl.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaTypeResolverImpl.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaTypeResolverImpl.java
index 3f4d6b8..3e6c6b4 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaTypeResolverImpl.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaTypeResolverImpl.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,17 +22,17 @@ package mvm.rya.api.resolver.impl;
 
 
 import com.google.common.primitives.Bytes;
-import mvm.rya.api.domain.RyaRange;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.resolver.RyaTypeResolver;
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.domain.RyaRange;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.resolver.RyaTypeResolver;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.openrdf.model.URI;
 import org.openrdf.model.vocabulary.XMLSchema;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTES;
 
 /**
  * Date: 7/16/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java
index 8f8bf00..08eeb52 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/RyaURIResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
 import org.openrdf.model.vocabulary.XMLSchema;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ServiceBackedRyaTypeResolverMappings.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ServiceBackedRyaTypeResolverMappings.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ServiceBackedRyaTypeResolverMappings.java
index ce3f05b..31ca864 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ServiceBackedRyaTypeResolverMappings.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ServiceBackedRyaTypeResolverMappings.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolver;
-import mvm.rya.api.resolver.RyaTypeResolverMapping;
+import org.apache.rya.api.resolver.RyaTypeResolver;
+import org.apache.rya.api.resolver.RyaTypeResolverMapping;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ShortRyaTypeResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ShortRyaTypeResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ShortRyaTypeResolver.java
index dba9773..023fb30 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ShortRyaTypeResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/impl/ShortRyaTypeResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.impl;
+package org.apache.rya.api.resolver.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.resolver.impl;
 
 
 
-import mvm.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
 import org.calrissian.mango.types.LexiTypeEncoders;
 import org.calrissian.mango.types.TypeEncoder;
 import org.calrissian.mango.types.exception.TypeDecodingException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRow.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRow.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRow.java
index f825e86..cd96dff 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRow.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRow.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.triple;
+package org.apache.rya.api.resolver.triple;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowRegex.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowRegex.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowRegex.java
index 36d23df..bd20252 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowRegex.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowRegex.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.triple;
+package org.apache.rya.api.resolver.triple;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java
index 2ccc986..62ac2b5 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.triple;
+package org.apache.rya.api.resolver.triple;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,14 +21,14 @@ package mvm.rya.api.resolver.triple;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
 
 import java.util.Map;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
 
 /**
  * Date: 7/17/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolverException.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolverException.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolverException.java
index d1824b1..ee1defc 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolverException.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/TripleRowResolverException.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.triple;
+package org.apache.rya.api.resolver.triple;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java
index cbfc30f..9688fec 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowHashedTripleResolver.java
@@ -1,9 +1,9 @@
-package mvm.rya.api.resolver.triple.impl;
+package org.apache.rya.api.resolver.triple.impl;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTE;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM_BYTES;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.EMPTY_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.EMPTY_BYTES;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TYPE_DELIM_BYTE;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -36,15 +36,15 @@ import org.apache.commons.codec.binary.Hex;
 
 import com.google.common.primitives.Bytes;
 
-import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
-import mvm.rya.api.resolver.triple.TripleRow;
-import mvm.rya.api.resolver.triple.TripleRowResolver;
-import mvm.rya.api.resolver.triple.TripleRowResolverException;
+import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.resolver.triple.TripleRowResolver;
+import org.apache.rya.api.resolver.triple.TripleRowResolverException;
 
 /**
  * Will store triple in spo, po, osp. Storing everything in the whole row.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java
index dc0695b..792d02e 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/resolver/triple/impl/WholeRowTripleResolver.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver.triple.impl;
+package org.apache.rya.api.resolver.triple.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,20 +22,20 @@ package mvm.rya.api.resolver.triple.impl;
 
 
 import com.google.common.primitives.Bytes;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
-import mvm.rya.api.resolver.triple.TripleRow;
-import mvm.rya.api.resolver.triple.TripleRowResolver;
-import mvm.rya.api.resolver.triple.TripleRowResolverException;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.resolver.triple.TripleRowResolver;
+import org.apache.rya.api.resolver.triple.TripleRowResolverException;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.*;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.*;
 
 /**
  * Will store triple in spo, po, osp. Storing everything in the whole row.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/security/SecurityProvider.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/security/SecurityProvider.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/security/SecurityProvider.java
index 61b14d9..797fb3a 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/security/SecurityProvider.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/security/SecurityProvider.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.security;
+package org.apache.rya.api.security;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/CloseableIterableIteration.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/CloseableIterableIteration.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/CloseableIterableIteration.java
index f3e5479..87c5ee2 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/CloseableIterableIteration.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/CloseableIterableIteration.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/EnumerationWrapper.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/EnumerationWrapper.java 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/EnumerationWrapper.java
index b098e52..250ff1f 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/EnumerationWrapper.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/EnumerationWrapper.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/IteratorWrapper.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/IteratorWrapper.java 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/IteratorWrapper.java
index 86748f9..0a841f2 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/utils/IteratorWrapper.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/utils/IteratorWrapper.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/NullableStatementImpl.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/NullableStatementImpl.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/NullableStatementImpl.java
index dfa17e8..e5e75f2 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/NullableStatementImpl.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/NullableStatementImpl.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/PeekingCloseableIteration.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/PeekingCloseableIteration.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/PeekingCloseableIteration.java
index 297c950..18cef9b 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/PeekingCloseableIteration.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/PeekingCloseableIteration.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementAddBindingSetFunction.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementAddBindingSetFunction.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementAddBindingSetFunction.java
index 0fc2a7f..a2b97ff 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementAddBindingSetFunction.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementAddBindingSetFunction.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@ package mvm.rya.api.utils;
 
 
 import com.google.common.base.Function;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.RyaStatement;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.RyaStatement;
 import org.openrdf.query.BindingSet;
 
 import java.util.Map;
@@ -35,6 +35,6 @@ import java.util.Map;
 public class RyaStatementAddBindingSetFunction implements 
Function<RyaStatement, Map.Entry<RyaStatement, BindingSet>> {
     @Override
     public Map.Entry<RyaStatement, BindingSet> apply(RyaStatement 
ryaStatement) {
-        return new 
RdfCloudTripleStoreUtils.CustomEntry<mvm.rya.api.domain.RyaStatement, 
org.openrdf.query.BindingSet>(ryaStatement, null);
+        return new 
RdfCloudTripleStoreUtils.CustomEntry<org.apache.rya.api.domain.RyaStatement, 
org.openrdf.query.BindingSet>(ryaStatement, null);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementRemoveBindingSetCloseableIteration.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementRemoveBindingSetCloseableIteration.java
 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementRemoveBindingSetCloseableIteration.java
index b39fafe..d803715 100644
--- 
a/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementRemoveBindingSetCloseableIteration.java
+++ 
b/common/rya.api/src/main/java/org/apache/rya/api/utils/RyaStatementRemoveBindingSetCloseableIteration.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.utils;
+package org.apache.rya.api.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@ package mvm.rya.api.utils;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.persist.RyaDAOException;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.persist.RyaDAOException;
 import org.openrdf.query.BindingSet;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java 
b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java
index 6db6053..bb349bb 100644
--- a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java
+++ b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaTypeTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java 
b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java
index 3966679..dee896b 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/domain/RyaURIPrefixTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsTest.java 
b/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsTest.java
index c613fee..5227b0c 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,16 +27,16 @@ import org.junit.Test;
 
 import com.google.common.base.Optional;
 
-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.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 RyaDetails}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsToConfigurationTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsToConfigurationTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsToConfigurationTest.java
index 960e8a9..a391dac 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsToConfigurationTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsToConfigurationTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,11 @@ package mvm.rya.api.instance;
  * under the License.
  */
 
-import static mvm.rya.api.instance.ConfigurationFields.USE_ENTITY;
-import static mvm.rya.api.instance.ConfigurationFields.USE_FREETEXT;
-import static mvm.rya.api.instance.ConfigurationFields.USE_GEO;
-import static mvm.rya.api.instance.ConfigurationFields.USE_PCJ;
-import static mvm.rya.api.instance.ConfigurationFields.USE_TEMPORAL;
+import static org.apache.rya.api.instance.ConfigurationFields.USE_ENTITY;
+import static org.apache.rya.api.instance.ConfigurationFields.USE_FREETEXT;
+import static org.apache.rya.api.instance.ConfigurationFields.USE_GEO;
+import static org.apache.rya.api.instance.ConfigurationFields.USE_PCJ;
+import static org.apache.rya.api.instance.ConfigurationFields.USE_TEMPORAL;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -34,16 +34,16 @@ import org.junit.Test;
 
 import com.google.common.base.Optional;
 
-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.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;
 
 public class RyaDetailsToConfigurationTest {
     @Test

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsUpdaterTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsUpdaterTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsUpdaterTest.java
index 596cc7b..d2dc1a5 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsUpdaterTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/instance/RyaDetailsUpdaterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -32,18 +32,18 @@ import org.junit.Test;
 
 import com.google.common.base.Optional;
 
-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.ProspectorDetails;
-import mvm.rya.api.instance.RyaDetails.TemporalIndexDetails;
-import mvm.rya.api.instance.RyaDetailsRepository.ConcurrentUpdateException;
-import mvm.rya.api.instance.RyaDetailsRepository.NotInitializedException;
-import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
-import mvm.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator;
-import 
mvm.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException;
+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.ProspectorDetails;
+import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.ConcurrentUpdateException;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.NotInitializedException;
+import 
org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator;
+import 
org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException;
 
 /**
  * Tests the methods of {@link RyaDetailsUpdater}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java
index 40a9c68..967c6dc 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/persist/query/RyaQueryTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query;
+package org.apache.rya.api.persist.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package mvm.rya.api.persist.query;
 
 
 
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaURI;
 import org.junit.Test;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java
index 919e4cc..aac8297 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/AbstractTriplePatternStrategyTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy;
+package org.apache.rya.api.query.strategy;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,28 +21,28 @@ package mvm.rya.api.query.strategy;
 
 
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT.OSP;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT.PO;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT.SPO;
 
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import junit.framework.TestCase;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.query.strategy.wholerow.OspWholeRowTriplePatternStrategy;
-import mvm.rya.api.query.strategy.wholerow.PoWholeRowTriplePatternStrategy;
-import mvm.rya.api.query.strategy.wholerow.SpoWholeRowTriplePatternStrategy;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTripleContext;
-import mvm.rya.api.resolver.triple.TripleRow;
-import mvm.rya.api.resolver.triple.TripleRowRegex;
-import mvm.rya.api.resolver.triple.impl.WholeRowTripleResolver;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import 
org.apache.rya.api.query.strategy.wholerow.OspWholeRowTriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.PoWholeRowTriplePatternStrategy;
+import 
org.apache.rya.api.query.strategy.wholerow.SpoWholeRowTriplePatternStrategy;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTripleContext;
+import org.apache.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.resolver.triple.TripleRowRegex;
+import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver;
 
 import org.openrdf.model.vocabulary.XMLSchema;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java
index 25fae9b..76216b6 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedPoWholeRowTriplePatternStrategyTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -30,19 +30,19 @@ import org.openrdf.model.impl.URIImpl;
 
 
 import junit.framework.TestCase;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaTypeRange;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.domain.RyaURIRange;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.query.strategy.TriplePatternStrategy;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTripleContext;
-import mvm.rya.api.resolver.triple.TripleRow;
-import mvm.rya.api.resolver.triple.TripleRowRegex;
-import mvm.rya.api.resolver.triple.impl.WholeRowHashedTripleResolver;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaTypeRange;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaURIRange;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.query.strategy.TriplePatternStrategy;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTripleContext;
+import org.apache.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.resolver.triple.TripleRowRegex;
+import org.apache.rya.api.resolver.triple.impl.WholeRowHashedTripleResolver;
 
 /**
  * Date: 7/14/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java
index f751866..88a1923 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/HashedSpoWholeRowTriplePatternStrategyTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,16 +24,16 @@ package mvm.rya.api.query.strategy.wholerow;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import mvm.rya.api.RdfCloudTripleStoreConstants;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaTypeRange;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.domain.RyaURIRange;
-import mvm.rya.api.query.strategy.ByteRange;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTripleContext;
-import mvm.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaTypeRange;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaURIRange;
+import org.apache.rya.api.query.strategy.ByteRange;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTripleContext;
+import org.apache.rya.api.resolver.triple.TripleRow;
 
 import org.apache.hadoop.io.Text;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/MockRdfCloudConfiguration.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/MockRdfCloudConfiguration.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/MockRdfCloudConfiguration.java
index ddb7fa8..dcc707b 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/MockRdfCloudConfiguration.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/MockRdfCloudConfiguration.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.query.strategy.wholerow;
+package org.apache.rya.api.query.strategy.wholerow;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package mvm.rya.api.query.strategy.wholerow;
  */
 
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 
 public class MockRdfCloudConfiguration extends 
RdfCloudTripleStoreConfiguration {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java
index 57b27be..29125e8 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/OspWholeRowTriplePatternStrategyTest.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-//package mvm.rya.api.query.strategy.wholerow;
+//package org.apache.rya.api.query.strategy.wholerow;
 
 //
 //import junit.framework.TestCase;
-//import mvm.rya.api.RdfCloudTripleStoreConstants;
-//import mvm.rya.api.domain.*;
-//import mvm.rya.api.resolver.RyaContext;
-//import mvm.rya.api.resolver.triple.TripleRow;
+//import org.apache.rya.api.RdfCloudTripleStoreConstants;
+//import org.apache.rya.api.domain.*;
+//import org.apache.rya.api.resolver.RyaContext;
+//import org.apache.rya.api.resolver.triple.TripleRow;
 //import org.apache.accumulo.core.data.Key;
 //import org.apache.accumulo.core.data.Range;
 //import org.apache.hadoop.io.Text;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java
index 1079bf8..ea3b46a 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/PoWholeRowTriplePatternStrategyTest.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-//package mvm.rya.api.query.strategy.wholerow;
+//package org.apache.rya.api.query.strategy.wholerow;
 
 //
 //import junit.framework.TestCase;
-//import mvm.rya.api.RdfCloudTripleStoreConstants;
-//import mvm.rya.api.domain.*;
-//import mvm.rya.api.resolver.RyaContext;
-//import mvm.rya.api.resolver.triple.TripleRow;
+//import org.apache.rya.api.RdfCloudTripleStoreConstants;
+//import org.apache.rya.api.domain.*;
+//import org.apache.rya.api.resolver.RyaContext;
+//import org.apache.rya.api.resolver.triple.TripleRow;
 //import org.apache.accumulo.core.data.Key;
 //import org.apache.accumulo.core.data.Range;
 //import org.apache.hadoop.io.Text;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java
 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java
index 019a3aa..28759b5 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/query/strategy/wholerow/SpoWholeRowTriplePatternStrategyTest.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-//package mvm.rya.api.query.strategy.wholerow;
+//package org.apache.rya.api.query.strategy.wholerow;
 
 //
 //import junit.framework.TestCase;
-//import mvm.rya.api.RdfCloudTripleStoreConstants;
-//import mvm.rya.api.domain.*;
-//import mvm.rya.api.resolver.RyaContext;
-//import mvm.rya.api.resolver.triple.TripleRow;
+//import org.apache.rya.api.RdfCloudTripleStoreConstants;
+//import org.apache.rya.api.domain.*;
+//import org.apache.rya.api.resolver.RyaContext;
+//import org.apache.rya.api.resolver.triple.TripleRow;
 //import org.apache.accumulo.core.data.Key;
 //import org.apache.accumulo.core.data.Range;
 //import org.apache.hadoop.io.Text;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java
----------------------------------------------------------------------
diff --git 
a/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java 
b/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java
index 4363fd3..a0d2ecc 100644
--- 
a/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java
+++ 
b/common/rya.api/src/test/java/org/apache/rya/api/resolver/RyaContextTest.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.resolver;
+package org.apache.rya.api.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,13 +24,13 @@ package mvm.rya.api.resolver;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import 
mvm.rya.api.query.strategy.AbstractTriplePatternStrategyTest.MockRdfConfiguration;
-import mvm.rya.api.query.strategy.wholerow.MockRdfCloudConfiguration;
-import mvm.rya.api.resolver.triple.TripleRow;
+import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import 
org.apache.rya.api.query.strategy.AbstractTriplePatternStrategyTest.MockRdfConfiguration;
+import org.apache.rya.api.query.strategy.wholerow.MockRdfCloudConfiguration;
+import org.apache.rya.api.resolver.triple.TripleRow;
 
 import org.openrdf.model.impl.URIImpl;
 


Reply via email to