25 files changed, 27 insertions, 27 deletions
diff --git a/pom.xml b/pom.xml
index 9af185b..3ce0a0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
             </group>
             <group>
               <title>Service Provider Interface</title>
-              <packages>com.amazon.carbonado.repo.indexed:com.amazon.carbonado.spi*:com.amazon.carbonado.synthetic:com.amazon.carbonado.qe</packages>
+              <packages>com.amazon.carbonado.repo.indexed:com.amazon.carbonado.spi:com.amazon.carbonado.raw:com.amazon.carbonado.synthetic:com.amazon.carbonado.qe</packages>
             </group>
             <group>
               <title>Generic Utilities</title>
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/CustomStorableCodec.java b/src/main/java/com/amazon/carbonado/raw/CustomStorableCodec.java
index f908635..e319e7c 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/CustomStorableCodec.java
+++ b/src/main/java/com/amazon/carbonado/raw/CustomStorableCodec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/CustomStorableCodecFactory.java b/src/main/java/com/amazon/carbonado/raw/CustomStorableCodecFactory.java
index 64d19e8..bfba733 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/CustomStorableCodecFactory.java
+++ b/src/main/java/com/amazon/carbonado/raw/CustomStorableCodecFactory.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.Storable;
 import com.amazon.carbonado.SupportException;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/DataDecoder.java b/src/main/java/com/amazon/carbonado/raw/DataDecoder.java
index 66f2f2f..485ce82 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/DataDecoder.java
+++ b/src/main/java/com/amazon/carbonado/raw/DataDecoder.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.CorruptEncodingException;
 
-import static com.amazon.carbonado.spi.raw.DataEncoder.*;
+import static com.amazon.carbonado.raw.DataEncoder.*;
 
 /**
  * A very low-level class that decodes key components encoded by methods of
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/DataEncoder.java b/src/main/java/com/amazon/carbonado/raw/DataEncoder.java
index 15b8dca..54846ce 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/DataEncoder.java
+++ b/src/main/java/com/amazon/carbonado/raw/DataEncoder.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 /**
  * A very low-level class that supports encoding of primitive data. For
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/GenericEncodingStrategy.java b/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
index cd408e9..2cd0807 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/GenericEncodingStrategy.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/GenericInstanceFactory.java b/src/main/java/com/amazon/carbonado/raw/GenericInstanceFactory.java
index 5a6a4cb..a9c535d 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/GenericInstanceFactory.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericInstanceFactory.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.Storable;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/GenericPropertyInfo.java b/src/main/java/com/amazon/carbonado/raw/GenericPropertyInfo.java
index c734f03..8aa92ee 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/GenericPropertyInfo.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericPropertyInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.reflect.Method;
 
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/GenericStorableCodec.java b/src/main/java/com/amazon/carbonado/raw/GenericStorableCodec.java
index 7a98540..f572dd8 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/GenericStorableCodec.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericStorableCodec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/GenericStorableCodecFactory.java b/src/main/java/com/amazon/carbonado/raw/GenericStorableCodecFactory.java
index fefa880..ab640e6 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/GenericStorableCodecFactory.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericStorableCodecFactory.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.Storable;
 import com.amazon.carbonado.SupportException;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/KeyDecoder.java b/src/main/java/com/amazon/carbonado/raw/KeyDecoder.java
index 127216f..a3254b1 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/KeyDecoder.java
+++ b/src/main/java/com/amazon/carbonado/raw/KeyDecoder.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.CorruptEncodingException;
 
-import static com.amazon.carbonado.spi.raw.KeyEncoder.*;
+import static com.amazon.carbonado.raw.KeyEncoder.*;
 
 /**
  * A very low-level class that decodes key components encoded by methods of
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/KeyEncoder.java b/src/main/java/com/amazon/carbonado/raw/KeyEncoder.java
index dd0faf9..44c5af5 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/KeyEncoder.java
+++ b/src/main/java/com/amazon/carbonado/raw/KeyEncoder.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 /**
  * A very low-level class that supports encoding of primitive data into unique,
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/LayoutPropertyInfo.java b/src/main/java/com/amazon/carbonado/raw/LayoutPropertyInfo.java
index 362c17c..4049dc2 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/LayoutPropertyInfo.java
+++ b/src/main/java/com/amazon/carbonado/raw/LayoutPropertyInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.reflect.Method;
 
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/RawCursor.java b/src/main/java/com/amazon/carbonado/raw/RawCursor.java
index b665191..865cdb2 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/RawCursor.java
+++ b/src/main/java/com/amazon/carbonado/raw/RawCursor.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.util.NoSuchElementException;
 
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/RawStorableGenerator.java b/src/main/java/com/amazon/carbonado/raw/RawStorableGenerator.java
index 6d6fbe5..a8c7f6b 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/RawStorableGenerator.java
+++ b/src/main/java/com/amazon/carbonado/raw/RawStorableGenerator.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/RawSupport.java b/src/main/java/com/amazon/carbonado/raw/RawSupport.java
index 895089d..f6253c9 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/RawSupport.java
+++ b/src/main/java/com/amazon/carbonado/raw/RawSupport.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.PersistException;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/RawUtil.java b/src/main/java/com/amazon/carbonado/raw/RawUtil.java
index 5224b6c..f93316a 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/RawUtil.java
+++ b/src/main/java/com/amazon/carbonado/raw/RawUtil.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 /**
  * Utilities for manipulating binary data.
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/StorableCodec.java b/src/main/java/com/amazon/carbonado/raw/StorableCodec.java
index 307fe7e..b781691 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/StorableCodec.java
+++ b/src/main/java/com/amazon/carbonado/raw/StorableCodec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.Storable;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/StorableCodecFactory.java b/src/main/java/com/amazon/carbonado/raw/StorableCodecFactory.java
index 26e3858..1b19490 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/StorableCodecFactory.java
+++ b/src/main/java/com/amazon/carbonado/raw/StorableCodecFactory.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import com.amazon.carbonado.Storable;
 import com.amazon.carbonado.SupportException;
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/StorablePropertyInfo.java b/src/main/java/com/amazon/carbonado/raw/StorablePropertyInfo.java
index f13a56c..e3a18b1 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/StorablePropertyInfo.java
+++ b/src/main/java/com/amazon/carbonado/raw/StorablePropertyInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.reflect.Method;
 
diff --git a/src/main/java/com/amazon/carbonado/spi/raw/package-info.java b/src/main/java/com/amazon/carbonado/raw/package-info.java
index 8d47419..c92afd8 100644
--- a/src/main/java/com/amazon/carbonado/spi/raw/package-info.java
+++ b/src/main/java/com/amazon/carbonado/raw/package-info.java
@@ -20,4 +20,4 @@
  * Provides support for repositories that encode/decode storables in a raw
  * binary format.
  */
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
diff --git a/src/main/java/com/amazon/carbonado/spi/StorableSerializer.java b/src/main/java/com/amazon/carbonado/spi/StorableSerializer.java
index 1f6ab6e..83621e9 100644
--- a/src/main/java/com/amazon/carbonado/spi/StorableSerializer.java
+++ b/src/main/java/com/amazon/carbonado/spi/StorableSerializer.java
@@ -52,7 +52,7 @@ import com.amazon.carbonado.info.StorableProperty;
 
 import static com.amazon.carbonado.spi.CommonMethodNames.*;
 
-import com.amazon.carbonado.spi.raw.GenericEncodingStrategy;
+import com.amazon.carbonado.raw.GenericEncodingStrategy;
 
 /**
  * Support for general-purpose serialization of storables.
diff --git a/src/test/java/com/amazon/carbonado/spi/raw/TestDataEncoding.java b/src/test/java/com/amazon/carbonado/raw/TestDataEncoding.java
index 783a71e..bff5820 100644
--- a/src/test/java/com/amazon/carbonado/spi/raw/TestDataEncoding.java
+++ b/src/test/java/com/amazon/carbonado/raw/TestDataEncoding.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.util.Random;
 
diff --git a/src/test/java/com/amazon/carbonado/spi/raw/TestEncodingStrategy.java b/src/test/java/com/amazon/carbonado/raw/TestEncodingStrategy.java
index 514df34..11a4eca 100644
--- a/src/test/java/com/amazon/carbonado/spi/raw/TestEncodingStrategy.java
+++ b/src/test/java/com/amazon/carbonado/raw/TestEncodingStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.lang.reflect.*;
 import java.util.*;
diff --git a/src/test/java/com/amazon/carbonado/spi/raw/TestKeyEncoding.java b/src/test/java/com/amazon/carbonado/raw/TestKeyEncoding.java
index ae09c92..3dba00e 100644
--- a/src/test/java/com/amazon/carbonado/spi/raw/TestKeyEncoding.java
+++ b/src/test/java/com/amazon/carbonado/raw/TestKeyEncoding.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi.raw;
+package com.amazon.carbonado.raw;
 
 import java.util.Random;