2 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java
index 6a6a3b6..2528cbf 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorableGenerator.java
@@ -53,14 +53,13 @@ import com.amazon.carbonado.lob.Lob;
 
 import com.amazon.carbonado.info.StorablePropertyAdapter;
 
-import com.amazon.carbonado.spi.CodeBuilderUtil;
-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 static com.amazon.carbonado.spi.CommonMethodNames.*;
+import com.amazon.carbonado.gen.CodeBuilderUtil;
+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;
+import static com.amazon.carbonado.gen.CommonMethodNames.*;
 
 /**
  * Generates concrete implementations of {@link Storable} types for
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupport.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupport.java
index f178b7d..304c816 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupport.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupport.java
@@ -24,7 +24,7 @@ import com.amazon.carbonado.Storable;
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.PersistException;
 
-import com.amazon.carbonado.spi.MasterSupport;
+import com.amazon.carbonado.gen.MasterSupport;
 
 /**
  *