8 files changed, 12 insertions, 15 deletions
diff --git a/src/test/java/com/amazon/carbonado/TestStorables.java b/src/test/java/com/amazon/carbonado/TestStorables.java
index f03fc0f..747ee23 100644
--- a/src/test/java/com/amazon/carbonado/TestStorables.java
+++ b/src/test/java/com/amazon/carbonado/TestStorables.java
@@ -47,7 +47,7 @@ import com.amazon.carbonado.UniqueConstraintException;
 import com.amazon.carbonado.cursor.SortedCursor;
 
 import com.amazon.carbonado.spi.RepairExecutor;
-import com.amazon.carbonado.spi.WrappedSupport;
+import com.amazon.carbonado.gen.WrappedSupport;
 
 import com.amazon.carbonado.stored.*;
 
diff --git a/src/test/java/com/amazon/carbonado/spi/StorableInterceptorFactory.java b/src/test/java/com/amazon/carbonado/gen/StorableInterceptorFactory.java
index fd4c715..527ce21 100644
--- a/src/test/java/com/amazon/carbonado/spi/StorableInterceptorFactory.java
+++ b/src/test/java/com/amazon/carbonado/gen/StorableInterceptorFactory.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.amazon.carbonado.spi;
+package com.amazon.carbonado.gen;
 
 import java.util.Map;
 import java.lang.reflect.Constructor;
@@ -35,7 +35,6 @@ import org.cojen.classfile.MethodInfo;
 import org.cojen.classfile.CodeBuilder;
 
 import com.amazon.carbonado.Storable;
-import com.amazon.carbonado.spi.CodeBuilderUtil;
 
 /**
  * StorableInterceptorFactory creates instances of Storables that delegate
diff --git a/src/test/java/com/amazon/carbonado/spi/TestStorableSerializer.java b/src/test/java/com/amazon/carbonado/gen/TestStorableSerializer.java
index 664bf12..2786dce 100644
--- a/src/test/java/com/amazon/carbonado/spi/TestStorableSerializer.java
+++ b/src/test/java/com/amazon/carbonado/gen/TestStorableSerializer.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi;
+package com.amazon.carbonado.gen;
 
 import java.io.*;
 
diff --git a/src/test/java/com/amazon/carbonado/spi/TestWrappedStorableFactory.java b/src/test/java/com/amazon/carbonado/gen/TestWrappedStorableFactory.java
index fd0cd35..40135f1 100644
--- a/src/test/java/com/amazon/carbonado/spi/TestWrappedStorableFactory.java
+++ b/src/test/java/com/amazon/carbonado/gen/TestWrappedStorableFactory.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi;
+package com.amazon.carbonado.gen;
 
 import java.lang.reflect.Method;
 
diff --git a/src/test/java/com/amazon/carbonado/spi/TestConversionComparator.java b/src/test/java/com/amazon/carbonado/info/TestConversionComparator.java
index 5cd7caa..a4e5614 100644
--- a/src/test/java/com/amazon/carbonado/spi/TestConversionComparator.java
+++ b/src/test/java/com/amazon/carbonado/info/TestConversionComparator.java
@@ -16,13 +16,11 @@
  * limitations under the License.
  */
 
-package com.amazon.carbonado.spi;
+package com.amazon.carbonado.info;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.amazon.carbonado.spi.ConversionComparator;
-
 /**
  * Test cases for {@link ConversionComparator}.
  *
diff --git a/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java b/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java
index 6de2faf..b94edc9 100644
--- a/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java
+++ b/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
 
 import junit.framework.TestSuite;
 import com.amazon.carbonado.TestUtilities;
-import com.amazon.carbonado.spi.StorableInterceptorFactory;
+import com.amazon.carbonado.gen.StorableInterceptorFactory;
 import com.amazon.carbonado.stored.StorableTestBasic;
 import com.amazon.carbonado.stored.StorableTestBasicIdMunger;
 import com.amazon.carbonado.TestStorables;
diff --git a/src/test/java/com/amazon/carbonado/repo/toy/ToyStorableGenerator.java b/src/test/java/com/amazon/carbonado/repo/toy/ToyStorableGenerator.java
index a72c7d5..8ab95f6 100644
--- a/src/test/java/com/amazon/carbonado/repo/toy/ToyStorableGenerator.java
+++ b/src/test/java/com/amazon/carbonado/repo/toy/ToyStorableGenerator.java
@@ -34,11 +34,11 @@ import com.amazon.carbonado.Storable;
 import com.amazon.carbonado.SupportException;
 import com.amazon.carbonado.Trigger;
 
-import com.amazon.carbonado.spi.MasterFeature;
-import com.amazon.carbonado.spi.MasterStorableGenerator;
-import com.amazon.carbonado.spi.MasterSupport;
-import com.amazon.carbonado.spi.StorableGenerator;
-import com.amazon.carbonado.spi.TriggerSupport;
+import com.amazon.carbonado.gen.MasterFeature;
+import com.amazon.carbonado.gen.MasterStorableGenerator;
+import com.amazon.carbonado.gen.MasterSupport;
+import com.amazon.carbonado.gen.StorableGenerator;
+import com.amazon.carbonado.gen.TriggerSupport;
 
 /**
  * 
diff --git a/src/test/java/com/amazon/carbonado/repo/toy/ToyStorage.java b/src/test/java/com/amazon/carbonado/repo/toy/ToyStorage.java
index bd73d98..c378dca 100644
--- a/src/test/java/com/amazon/carbonado/repo/toy/ToyStorage.java
+++ b/src/test/java/com/amazon/carbonado/repo/toy/ToyStorage.java
@@ -39,7 +39,7 @@ import com.amazon.carbonado.Trigger;
 
 import com.amazon.carbonado.sequence.SequenceValueProducer;
 
-import com.amazon.carbonado.spi.MasterSupport;
+import com.amazon.carbonado.gen.MasterSupport;
 
 import com.amazon.carbonado.util.QuickConstructorGenerator;