From 745c380e8db7f81d98b0a0ad7b264a4a4d83eb33 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Sun, 16 Nov 2008 05:59:28 +0000
Subject: [PATCH] Repackage Depot as com.samskivert.depot as it is now a
 standalone library. We're also going to allow ourselves the luxury of a
 Google Collections dependency.

---
 build.xml                                     | 167 ++++++++++++++++++
 etc/libs-incl.xml                             |  12 ++
 .../{jdbc => }/depot/BindVisitor.java         |  52 +++---
 .../{jdbc => }/depot/BuildVisitor.java        |  56 +++---
 .../samskivert/{jdbc => }/depot/ByteEnum.java |   2 +-
 .../{jdbc => }/depot/CacheAdapter.java        |   2 +-
 .../{jdbc => }/depot/CacheInvalidator.java    |   2 +-
 .../samskivert/{jdbc => }/depot/CacheKey.java |   2 +-
 .../{jdbc => }/depot/DataMigration.java       |   2 +-
 .../{jdbc => }/depot/DatabaseException.java   |   2 +-
 .../{jdbc => }/depot/DepotMarshaller.java     |  22 +--
 .../depot/DepotMigrationHistoryRecord.java    |   8 +-
 .../{jdbc => }/depot/DepotRepository.java     |  22 +--
 .../{jdbc => }/depot/DepotTypes.java          |   6 +-
 .../depot/DuplicateKeyException.java          |   2 +-
 .../{jdbc => }/depot/EHCacheAdapter.java      |   4 +-
 .../{jdbc => }/depot/FieldMarshaller.java     |   8 +-
 .../{jdbc => }/depot/FindAllQuery.java        |  12 +-
 .../{jdbc => }/depot/FindOneQuery.java        |   6 +-
 .../depot/IdentityValueGenerator.java         |   4 +-
 .../com/samskivert/{jdbc => }/depot/Key.java  |   6 +-
 .../samskivert/{jdbc => }/depot/KeySet.java   |  12 +-
 .../samskivert/{jdbc => }/depot/KeyUtil.java  |   4 +-
 .../com/samskivert/{jdbc => }/depot/Log.java  |   4 +-
 .../samskivert/{jdbc => }/depot/Modifier.java |   2 +-
 .../samskivert/{jdbc => }/depot/MultiKey.java |   8 +-
 .../{jdbc => }/depot/MySQLBuilder.java        |  34 ++--
 .../{jdbc => }/depot/Operation.java           |   2 +-
 .../{jdbc => }/depot/PersistenceContext.java  |   8 +-
 .../{jdbc => }/depot/PersistentRecord.java    |   2 +-
 .../{jdbc => }/depot/PostgreSQLBuilder.java   |  30 ++--
 .../samskivert/{jdbc => }/depot/Query.java    |   4 +-
 .../{jdbc => }/depot/SQLBuilder.java          |  14 +-
 .../{jdbc => }/depot/SchemaMigration.java     |   6 +-
 .../{jdbc => }/depot/SimpleCacheKey.java      |   2 +-
 .../{jdbc => }/depot/TableValueGenerator.java |   6 +-
 .../depot/ValidatingCacheInvalidator.java     |   2 +-
 .../{jdbc => }/depot/ValueGenerator.java      |   6 +-
 .../{jdbc => }/depot/WhereClause.java         |   6 +-
 .../{jdbc => }/depot/annotation/Column.java   |   2 +-
 .../{jdbc => }/depot/annotation/Computed.java |  10 +-
 .../{jdbc => }/depot/annotation/Entity.java   |   2 +-
 .../depot/annotation/FullTextIndex.java       |   2 +-
 .../depot/annotation/GeneratedValue.java      |   2 +-
 .../depot/annotation/GenerationType.java      |   2 +-
 .../{jdbc => }/depot/annotation/Id.java       |   2 +-
 .../{jdbc => }/depot/annotation/Index.java    |   2 +-
 .../depot/annotation/TableGenerator.java      |   2 +-
 .../depot/annotation/Transient.java           |   2 +-
 .../depot/annotation/UniqueConstraint.java    |   2 +-
 .../{jdbc => }/depot/clause/DeleteClause.java |   8 +-
 .../depot/clause/FieldDefinition.java         |  12 +-
 .../depot/clause/FieldOverride.java           |  10 +-
 .../{jdbc => }/depot/clause/ForUpdate.java    |   6 +-
 .../{jdbc => }/depot/clause/FromOverride.java |   6 +-
 .../{jdbc => }/depot/clause/GroupBy.java      |   8 +-
 .../{jdbc => }/depot/clause/InsertClause.java |   6 +-
 .../{jdbc => }/depot/clause/Join.java         |  12 +-
 .../{jdbc => }/depot/clause/Limit.java        |   6 +-
 .../{jdbc => }/depot/clause/OrderBy.java      |  10 +-
 .../{jdbc => }/depot/clause/QueryClause.java  |   4 +-
 .../{jdbc => }/depot/clause/SelectClause.java |   8 +-
 .../{jdbc => }/depot/clause/UpdateClause.java |  10 +-
 .../{jdbc => }/depot/clause/Where.java        |  20 +--
 .../depot/expression/ColumnExp.java           |   4 +-
 .../depot/expression/EpochSeconds.java        |   4 +-
 .../depot/expression/ExpressionVisitor.java   |  46 ++---
 .../depot/expression/FunctionExp.java         |   4 +-
 .../depot/expression/LiteralExp.java          |   4 +-
 .../depot/expression/SQLExpression.java       |   6 +-
 .../{jdbc => }/depot/expression/ValueExp.java |   4 +-
 .../{jdbc => }/depot/operator/Arithmetic.java |   6 +-
 .../depot/operator/Conditionals.java          |  12 +-
 .../{jdbc => }/depot/operator/Logic.java      |   8 +-
 .../depot/operator/SQLOperator.java           |  10 +-
 .../{jdbc => }/depot/tools/GenRecordTask.java |  14 +-
 .../{jdbc => }/depot/tools/record_column.tmpl |   0
 .../{jdbc => }/depot/tools/record_key.tmpl    |   0
 .../{jdbc => }/depot/tools/record_name.tmpl   |   0
 79 files changed, 504 insertions(+), 325 deletions(-)
 create mode 100644 build.xml
 create mode 100644 etc/libs-incl.xml
 rename src/java/com/samskivert/{jdbc => }/depot/BindVisitor.java (85%)
 rename src/java/com/samskivert/{jdbc => }/depot/BuildVisitor.java (92%)
 rename src/java/com/samskivert/{jdbc => }/depot/ByteEnum.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/CacheAdapter.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/CacheInvalidator.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/CacheKey.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/DataMigration.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/DatabaseException.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/DepotMarshaller.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/DepotMigrationHistoryRecord.java (93%)
 rename src/java/com/samskivert/{jdbc => }/depot/DepotRepository.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/DepotTypes.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/DuplicateKeyException.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/EHCacheAdapter.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/FieldMarshaller.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/FindAllQuery.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/FindOneQuery.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/IdentityValueGenerator.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/Key.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/KeySet.java (94%)
 rename src/java/com/samskivert/{jdbc => }/depot/KeyUtil.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/Log.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/Modifier.java (99%)
 rename src/java/com/samskivert/{jdbc => }/depot/MultiKey.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/MySQLBuilder.java (89%)
 rename src/java/com/samskivert/{jdbc => }/depot/Operation.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/PersistenceContext.java (99%)
 rename src/java/com/samskivert/{jdbc => }/depot/PersistentRecord.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/PostgreSQLBuilder.java (91%)
 rename src/java/com/samskivert/{jdbc => }/depot/Query.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/SQLBuilder.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/SchemaMigration.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/SimpleCacheKey.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/TableValueGenerator.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/ValidatingCacheInvalidator.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/ValueGenerator.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/WhereClause.java (93%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/Column.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/Computed.java (91%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/Entity.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/FullTextIndex.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/GeneratedValue.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/GenerationType.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/Id.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/Index.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/TableGenerator.java (98%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/Transient.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/annotation/UniqueConstraint.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/DeleteClause.java (90%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/FieldDefinition.java (87%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/FieldOverride.java (86%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/ForUpdate.java (88%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/FromOverride.java (93%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/GroupBy.java (87%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/InsertClause.java (93%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/Join.java (89%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/Limit.java (91%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/OrderBy.java (90%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/QueryClause.java (90%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/SelectClause.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/UpdateClause.java (91%)
 rename src/java/com/samskivert/{jdbc => }/depot/clause/Where.java (83%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/ColumnExp.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/EpochSeconds.java (94%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/ExpressionVisitor.java (65%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/FunctionExp.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/LiteralExp.java (93%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/SQLExpression.java (92%)
 rename src/java/com/samskivert/{jdbc => }/depot/expression/ValueExp.java (93%)
 rename src/java/com/samskivert/{jdbc => }/depot/operator/Arithmetic.java (95%)
 rename src/java/com/samskivert/{jdbc => }/depot/operator/Conditionals.java (96%)
 rename src/java/com/samskivert/{jdbc => }/depot/operator/Logic.java (92%)
 rename src/java/com/samskivert/{jdbc => }/depot/operator/SQLOperator.java (92%)
 rename src/java/com/samskivert/{jdbc => }/depot/tools/GenRecordTask.java (97%)
 rename src/java/com/samskivert/{jdbc => }/depot/tools/record_column.tmpl (100%)
 rename src/java/com/samskivert/{jdbc => }/depot/tools/record_key.tmpl (100%)
 rename src/java/com/samskivert/{jdbc => }/depot/tools/record_name.tmpl (100%)

diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..d122ba5
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<project name="depot" default="compile" basedir=".">
+  <!-- things you may want to change -->
+  <property name="app.name"         value="depot"/>
+  <property name="doc.packages"     value="com.samskivert.depot.*"/>
+  <property name="doc.overview"     value="com/samskivert/depot/overview.html"/>
+  <property name="copyright.holder" value="Michael Bayne"/>
+
+  <!-- things you probably don't want to change -->
+  <property name="src.dir"     value="src/java"/>
+  <property name="deploy.dir"  value="dist"/>
+  <property name="classes.dir" value="${deploy.dir}/classes"/>
+  <property name="javadoc.dir" value="${deploy.dir}/docs"/>
+  <property name="libs.dir"    value="lib"/>
+  <property name="gwtjar.dir"  value="${deploy.dir}/gwt-jar"/>
+
+  <!-- declare our classpath business -->
+  <path id="classpath">
+    <pathelement location="${classes.dir}"/>
+    <fileset dir="${deploy.dir}/lib" includes="*.jar"/>
+  </path>
+
+  <!-- our dependencies are in a separate file so that we can integrate into OOO builds -->
+  <import file="etc/libs-incl.xml"/>
+
+  <!-- prepares the application directories -->
+  <target name="prepare">
+    <tstamp><format property="year" pattern="yyyy" /></tstamp>
+    <mkdir dir="${deploy.dir}"/>
+    <mkdir dir="${deploy.dir}/lib"/>
+    <mkdir dir="${classes.dir}"/>
+    <mkdir dir="${javadoc.dir}"/>
+    <copy todir="${deploy.dir}/lib" flatten="true">
+      <fileset refid="${app.name}.libs"/>
+    </copy>
+  </target>
+
+  <!-- determines which optional packages should be built -->
+  <target name="compute-builds">
+    <!-- check to see which packages are available -->
+    <available property="ant.present" classpathref="classpath" ignoresystemclasses="true"
+     classname="org.apache.tools.ant.Task"/>
+    <echo level="info">Ant: ${ant.present}</echo>
+    <available property="ehcache.present" classpathref="classpath"
+     classname="net.sf.ehcache.Element"/>
+    <echo level="info">EH Cache: ${ehcache.present}</echo>
+    <available property="junit.present" classpathref="classpath"
+     classname="junit.framework.Test"/>
+    <echo level="info">JUnit: ${junit.present}</echo>
+    <available property="jakarta.velocity.present" classpathref="classpath"
+     classname="org.apache.velocity.Template"/>
+    <echo level="info">Velocity: ${jakarta.velocity.present}</echo>
+
+    <!-- combines package availability into build controls -->
+    <condition property="build.depot.ehcache">
+      <and><isset property="ehcache.present"/></and>
+    </condition>
+    <condition property="build.depot.tools">
+      <and><isset property="ant.present"/>
+      <isset property="velocity.present"/></and>
+    </condition>
+    <condition property="build.tests">
+      <and><isset property="junit.present"/></and>
+    </condition>
+  </target>
+
+  <!-- generates fields for persistent record classes -->
+  <target name="genrecord" depends="prepare">
+    <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
+             classpathref="classpath"/>
+    <!-- make sure the record class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}"
+           debug="on" optimize="${build.optimize}" deprecation="on">
+      <classpath refid="classpath"/>
+      <include name="**/*Record.java"/>
+    </javac>
+    <!-- now update the source files -->
+    <grecord classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Record.java"/>
+    </grecord>
+  </target>
+
+  <!-- cleans out the intermediate build files -->
+  <target name="clean">
+    <delete dir="${classes.dir}"/>
+    <delete dir="${deploy.dir}/docs"/>
+    <delete dir="${gwtjar.dir}"/>
+    <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
+  </target>
+
+  <!-- wipes the entire build directory clean -->
+  <target name="distclean">
+    <delete dir="${deploy.dir}"/>
+  </target>
+
+  <!-- build the java class files -->
+  <target name="compile" depends="prepare,compute-builds">
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
+      <classpath refid="classpath"/>
+      <exclude name="com/samskivert/depot/EHCacheAdapter.java" unless="build.depot.ehcache"/>
+      <exclude name="com/samskivert/depot/tools/**" unless="build.depot.tools"/>
+      <exclude name="com/samskivert/depot/tests/**" unless="build.tests"/>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
+  </target>
+
+  <!-- build the javadoc documentation -->
+  <target name="javadoc" depends="prepare,compute-builds">
+    <javadoc windowtitle="${app.name} API"
+             doctitle="${app.name} API"
+             overview="${src.dir}/${doc.overview}"
+             destdir="${javadoc.dir}"
+             additionalparam="-breakiterator"
+             link="http://samskivert.com/code/samskivert/samskivert/docs/api/">
+      <packageset dir="${src.dir}">
+        <exclude name="com/samskivert/depot/EHCacheAdapter.java" unless="ehcache.present"/>
+        <exclude name="com/samskivert/depot/tests/**" unless="build.tests"/>
+      </packageset>
+      <bottom>Copyright &#169; 2000-${year} ${copyright.holder}. All Rights Reserved.</bottom>
+      <classpath refid="classpath"/>
+      <link href="http://java.sun.com/j2se/1.5/docs/api/"/>
+    </javadoc>
+  </target>
+
+  <!-- a target for rebuilding everything -->
+  <target name="all" depends="clean,prepare,compile,javadoc,dist"/>
+
+  <!-- runs our unit tests -->
+  <target name="tests" depends="prepare,compile" description="Runs unit tests.">
+    <taskdef name="unit" classpathref="classpath"
+      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+    <unit printsummary="off" haltonfailure="yes" fork="${junit.fork}">
+      <classpath>
+        <pathelement location="${classes.dir}"/>
+        <pathelement location="${basedir}"/> <!-- for rsrc/ -->
+        <fileset dir="${deploy.dir}/lib" includes="*.jar"/>
+        <fileset dir="lib/test" includes="*.jar"/>
+      </classpath>
+      <sysproperty key="test_dir" value="${basedir}"/>
+      <formatter type="brief" usefile="false"/>
+      <batchtest>
+        <fileset dir="${src.dir}">
+          <include name="**/tests/**/*Test.java"/>
+          <exclude name="com/samskivert/depot/EHCacheAdapter.java" unless="ehcache.present"/>
+        </fileset>
+      </batchtest>
+    </unit>
+  </target>
+
+  <!-- builds our distribution files (war and jar) -->
+  <target name="dist" depends="prepare,compile">
+    <jar destfile="${deploy.dir}/${app.name}.jar" basedir="${classes.dir}">
+      <exclude name="**/tests/**"/>
+    </jar>
+  </target>
+
+  <!-- generate a class hierarchy diagram -->
+  <target name="hiergen" depends="prepare,compile">
+    <taskdef name="viztool" classname="com.samskivert.viztool.DriverTask"/>
+    <viztool visualizer="com.samskivert.viztool.hierarchy.HierarchyVisualizer"
+      pkgroot="com.samskivert" classes="com.samskivert.*" output="hierarchy.ps">
+      <classpath refid="classpath"/>
+    </viztool>
+  </target>
+</project>
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
new file mode 100644
index 0000000..288d954
--- /dev/null
+++ b/etc/libs-incl.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- declares the libraries needed to build depot -->
+<project name="library-dependencies">
+  <fileset dir="${libs.dir}" id="depot.libs">
+    <include name="ant.jar"/>
+    <include name="ehcache.jar"/>
+    <include name="google-collect.jar"/>
+    <include name="junit4.jar"/>
+    <include name="samskivert.jar"/>
+    <include name="velocity-1.5-dev.jar"/>
+  </fileset>
+</project>
diff --git a/src/java/com/samskivert/jdbc/depot/BindVisitor.java b/src/java/com/samskivert/depot/BindVisitor.java
similarity index 85%
rename from src/java/com/samskivert/jdbc/depot/BindVisitor.java
rename to src/java/com/samskivert/depot/BindVisitor.java
index 41eea4f..2ffc1e0 100644
--- a/src/java/com/samskivert/jdbc/depot/BindVisitor.java
+++ b/src/java/com/samskivert/depot/BindVisitor.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.nio.ByteBuffer;
 import java.sql.Connection;
@@ -27,31 +27,31 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.ForUpdate;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.GroupBy;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.Join;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.FunctionExp;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
-import com.samskivert.jdbc.depot.operator.Conditionals.Exists;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Logic.Not;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
-import com.samskivert.jdbc.depot.operator.SQLOperator.MultiOperator;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.ForUpdate;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.GroupBy;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.Join;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.FunctionExp;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
+import com.samskivert.depot.operator.Conditionals.Exists;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Logic.Not;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.operator.SQLOperator.MultiOperator;
 
 import com.samskivert.util.StringUtil;
 
diff --git a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java b/src/java/com/samskivert/depot/BuildVisitor.java
similarity index 92%
rename from src/java/com/samskivert/jdbc/depot/BuildVisitor.java
rename to src/java/com/samskivert/depot/BuildVisitor.java
index 13141d8..8c9b419 100644
--- a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
+++ b/src/java/com/samskivert/depot/BuildVisitor.java
@@ -18,40 +18,40 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.ForUpdate;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.GroupBy;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.Join;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.FunctionExp;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
-import com.samskivert.jdbc.depot.operator.Conditionals.Exists;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Logic.Not;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
-import com.samskivert.jdbc.depot.operator.SQLOperator.MultiOperator;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.ForUpdate;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.GroupBy;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.Join;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.FunctionExp;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
+import com.samskivert.depot.operator.Conditionals.Exists;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Logic.Not;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.operator.SQLOperator.MultiOperator;
 
 /**
  * Implements the base functionality of the SQL-building pass of {@link SQLBuilder}. Dialectal
diff --git a/src/java/com/samskivert/jdbc/depot/ByteEnum.java b/src/java/com/samskivert/depot/ByteEnum.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/ByteEnum.java
rename to src/java/com/samskivert/depot/ByteEnum.java
index 77df323..a2d5643 100644
--- a/src/java/com/samskivert/jdbc/depot/ByteEnum.java
+++ b/src/java/com/samskivert/depot/ByteEnum.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * An enum value can be used as a field in a persistent object if it implements this interface and
diff --git a/src/java/com/samskivert/jdbc/depot/CacheAdapter.java b/src/java/com/samskivert/depot/CacheAdapter.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/CacheAdapter.java
rename to src/java/com/samskivert/depot/CacheAdapter.java
index 3ab935f..7cfd785 100644
--- a/src/java/com/samskivert/jdbc/depot/CacheAdapter.java
+++ b/src/java/com/samskivert/depot/CacheAdapter.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
diff --git a/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java b/src/java/com/samskivert/depot/CacheInvalidator.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/CacheInvalidator.java
rename to src/java/com/samskivert/depot/CacheInvalidator.java
index 525ef60..4ba08a7 100644
--- a/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java
+++ b/src/java/com/samskivert/depot/CacheInvalidator.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
diff --git a/src/java/com/samskivert/jdbc/depot/CacheKey.java b/src/java/com/samskivert/depot/CacheKey.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/CacheKey.java
rename to src/java/com/samskivert/depot/CacheKey.java
index 271d528..e568643 100644
--- a/src/java/com/samskivert/jdbc/depot/CacheKey.java
+++ b/src/java/com/samskivert/depot/CacheKey.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
diff --git a/src/java/com/samskivert/jdbc/depot/DataMigration.java b/src/java/com/samskivert/depot/DataMigration.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/DataMigration.java
rename to src/java/com/samskivert/depot/DataMigration.java
index c05548f..87c1644 100644
--- a/src/java/com/samskivert/jdbc/depot/DataMigration.java
+++ b/src/java/com/samskivert/depot/DataMigration.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * Encapsulates a migration of data between entities that should be run only once and using the
diff --git a/src/java/com/samskivert/jdbc/depot/DatabaseException.java b/src/java/com/samskivert/depot/DatabaseException.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/DatabaseException.java
rename to src/java/com/samskivert/depot/DatabaseException.java
index 8d2e524..fc55dbe 100644
--- a/src/java/com/samskivert/jdbc/depot/DatabaseException.java
+++ b/src/java/com/samskivert/depot/DatabaseException.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * Represents a failure reported by the underlying database.
diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/depot/DepotMarshaller.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
rename to src/java/com/samskivert/depot/DepotMarshaller.java
index 187f778..0d7f185 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+++ b/src/java/com/samskivert/depot/DepotMarshaller.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 
@@ -36,21 +36,21 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.annotation.Entity;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.annotation.Index;
-import com.samskivert.jdbc.depot.annotation.TableGenerator;
-import com.samskivert.jdbc.depot.annotation.Transient;
-import com.samskivert.jdbc.depot.annotation.UniqueConstraint;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.annotation.Entity;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.annotation.Index;
+import com.samskivert.depot.annotation.TableGenerator;
+import com.samskivert.depot.annotation.Transient;
+import com.samskivert.depot.annotation.UniqueConstraint;
 
 import com.samskivert.jdbc.ColumnDefinition;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.util.ArrayUtil;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Handles the marshalling and unmarshalling of persistent instances to JDBC primitives ({@link
diff --git a/src/java/com/samskivert/jdbc/depot/DepotMigrationHistoryRecord.java b/src/java/com/samskivert/depot/DepotMigrationHistoryRecord.java
similarity index 93%
rename from src/java/com/samskivert/jdbc/depot/DepotMigrationHistoryRecord.java
rename to src/java/com/samskivert/depot/DepotMigrationHistoryRecord.java
index f3d5a63..d6b1813 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMigrationHistoryRecord.java
+++ b/src/java/com/samskivert/depot/DepotMigrationHistoryRecord.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Timestamp;
 
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.expression.ColumnExp;
 
 /**
  * Maintains a record of all successfully invoked data migrations.
diff --git a/src/java/com/samskivert/jdbc/depot/DepotRepository.java b/src/java/com/samskivert/depot/DepotRepository.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/DepotRepository.java
rename to src/java/com/samskivert/depot/DepotRepository.java
index 86fa652..7bc2394 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotRepository.java
+++ b/src/java/com/samskivert/depot/DepotRepository.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -41,17 +41,17 @@ import com.samskivert.jdbc.ConnectionProvider;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 
-import com.samskivert.jdbc.depot.Modifier.*;
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
+import com.samskivert.depot.Modifier.*;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Provides a base for classes that provide access to persistent objects. Also defines the
diff --git a/src/java/com/samskivert/jdbc/depot/DepotTypes.java b/src/java/com/samskivert/depot/DepotTypes.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/DepotTypes.java
rename to src/java/com/samskivert/depot/DepotTypes.java
index c0ff4e9..9531e59 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotTypes.java
+++ b/src/java/com/samskivert/depot/DepotTypes.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.SQLException;
 
@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Maintains a record of the persistent classes brought into the context of the associated SQL,
diff --git a/src/java/com/samskivert/jdbc/depot/DuplicateKeyException.java b/src/java/com/samskivert/depot/DuplicateKeyException.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/DuplicateKeyException.java
rename to src/java/com/samskivert/depot/DuplicateKeyException.java
index 9096089..ddb53d3 100644
--- a/src/java/com/samskivert/jdbc/depot/DuplicateKeyException.java
+++ b/src/java/com/samskivert/depot/DuplicateKeyException.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * Thrown when an insert or update results in a duplicate key on a column that has a uniqueness
diff --git a/src/java/com/samskivert/jdbc/depot/EHCacheAdapter.java b/src/java/com/samskivert/depot/EHCacheAdapter.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/EHCacheAdapter.java
rename to src/java/com/samskivert/depot/EHCacheAdapter.java
index 54c543c..f966da7 100644
--- a/src/java/com/samskivert/jdbc/depot/EHCacheAdapter.java
+++ b/src/java/com/samskivert/depot/EHCacheAdapter.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
@@ -29,7 +29,7 @@ import net.sf.ehcache.distribution.CacheManagerPeerListener;
 import net.sf.ehcache.distribution.CacheManagerPeerProvider;
 import net.sf.ehcache.distribution.RMIAsynchronousCacheReplicator;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * An implementation of {@link CacheAdapter} for ehcache.
diff --git a/src/java/com/samskivert/jdbc/depot/FieldMarshaller.java b/src/java/com/samskivert/depot/FieldMarshaller.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/FieldMarshaller.java
rename to src/java/com/samskivert/depot/FieldMarshaller.java
index 37efe3f..073b122 100644
--- a/src/java/com/samskivert/jdbc/depot/FieldMarshaller.java
+++ b/src/java/com/samskivert/depot/FieldMarshaller.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -35,9 +35,9 @@ import java.sql.Time;
 import java.sql.Timestamp;
 
 import com.samskivert.jdbc.ColumnDefinition;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.annotation.GeneratedValue;
 
 import com.samskivert.util.StringUtil;
 
diff --git a/src/java/com/samskivert/jdbc/depot/FindAllQuery.java b/src/java/com/samskivert/depot/FindAllQuery.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/FindAllQuery.java
rename to src/java/com/samskivert/depot/FindAllQuery.java
index 8d559d0..642249f 100644
--- a/src/java/com/samskivert/jdbc/depot/FindAllQuery.java
+++ b/src/java/com/samskivert/depot/FindAllQuery.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,12 +37,12 @@ import java.util.Set;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.operator.Conditionals.*;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.operator.Conditionals.*;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * This class implements the functionality required by {@link DepotRepository#findAll}: fetch
diff --git a/src/java/com/samskivert/jdbc/depot/FindOneQuery.java b/src/java/com/samskivert/depot/FindOneQuery.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/FindOneQuery.java
rename to src/java/com/samskivert/depot/FindOneQuery.java
index 5cc449a..187ad99 100644
--- a/src/java/com/samskivert/jdbc/depot/FindOneQuery.java
+++ b/src/java/com/samskivert/depot/FindOneQuery.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -27,8 +27,8 @@ import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.SelectClause;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.SelectClause;
 
 /**
  * The implementation of {@link DepotRepository#load} functionality.
diff --git a/src/java/com/samskivert/jdbc/depot/IdentityValueGenerator.java b/src/java/com/samskivert/depot/IdentityValueGenerator.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/IdentityValueGenerator.java
rename to src/java/com/samskivert/depot/IdentityValueGenerator.java
index 84d7f45..1220358 100644
--- a/src/java/com/samskivert/jdbc/depot/IdentityValueGenerator.java
+++ b/src/java/com/samskivert/depot/IdentityValueGenerator.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.GeneratedValue;
 
 /**
  * Generates primary keys using an identity column.
diff --git a/src/java/com/samskivert/jdbc/depot/Key.java b/src/java/com/samskivert/depot/Key.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/Key.java
rename to src/java/com/samskivert/depot/Key.java
index eb21415..2c25ba2 100644
--- a/src/java/com/samskivert/jdbc/depot/Key.java
+++ b/src/java/com/samskivert/depot/Key.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.util.StringUtil;
 
 /**
diff --git a/src/java/com/samskivert/jdbc/depot/KeySet.java b/src/java/com/samskivert/depot/KeySet.java
similarity index 94%
rename from src/java/com/samskivert/jdbc/depot/KeySet.java
rename to src/java/com/samskivert/depot/KeySet.java
index e5bb851..324e6c0 100644
--- a/src/java/com/samskivert/jdbc/depot/KeySet.java
+++ b/src/java/com/samskivert/depot/KeySet.java
@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.Conditionals;
-import com.samskivert.jdbc.depot.operator.Logic;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.Conditionals;
+import com.samskivert.depot.operator.Logic;
 
 /**
  * Contains a set of primary keys that match a set of persistent records. This is used internally
diff --git a/src/java/com/samskivert/jdbc/depot/KeyUtil.java b/src/java/com/samskivert/depot/KeyUtil.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/KeyUtil.java
rename to src/java/com/samskivert/depot/KeyUtil.java
index 61b0ac1..22e56c7 100644
--- a/src/java/com/samskivert/jdbc/depot/KeyUtil.java
+++ b/src/java/com/samskivert/depot/KeyUtil.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.annotation.Id;
+import com.samskivert.depot.annotation.Id;
 
 /**
  * Simple utility methods used by {@link Key} and {@link KeySet}.
diff --git a/src/java/com/samskivert/jdbc/depot/Log.java b/src/java/com/samskivert/depot/Log.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/Log.java
rename to src/java/com/samskivert/depot/Log.java
index 4721b80..459b657 100644
--- a/src/java/com/samskivert/jdbc/depot/Log.java
+++ b/src/java/com/samskivert/depot/Log.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import com.samskivert.util.Logger;
 
@@ -28,5 +28,5 @@ import com.samskivert.util.Logger;
 public class Log
 {
     /** We dispatch our log messages through this logger. */
-    public static Logger log = Logger.getLogger("com.samskivert.jdbc.depot");
+    public static Logger log = Logger.getLogger("com.samskivert.depot");
 }
diff --git a/src/java/com/samskivert/jdbc/depot/Modifier.java b/src/java/com/samskivert/depot/Modifier.java
similarity index 99%
rename from src/java/com/samskivert/jdbc/depot/Modifier.java
rename to src/java/com/samskivert/depot/Modifier.java
index aed61d4..e575b7c 100644
--- a/src/java/com/samskivert/jdbc/depot/Modifier.java
+++ b/src/java/com/samskivert/depot/Modifier.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/java/com/samskivert/jdbc/depot/MultiKey.java b/src/java/com/samskivert/depot/MultiKey.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/MultiKey.java
rename to src/java/com/samskivert/depot/MultiKey.java
index d1fe8aa..c3de3d9 100644
--- a/src/java/com/samskivert/jdbc/depot/MultiKey.java
+++ b/src/java/com/samskivert/depot/MultiKey.java
@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.clause.Where;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.clause.Where;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * A special form of {@link Where} clause that specifies an explicit range of database rows. It
diff --git a/src/java/com/samskivert/jdbc/depot/MySQLBuilder.java b/src/java/com/samskivert/depot/MySQLBuilder.java
similarity index 89%
rename from src/java/com/samskivert/jdbc/depot/MySQLBuilder.java
rename to src/java/com/samskivert/depot/MySQLBuilder.java
index 21df188..368d35a 100644
--- a/src/java/com/samskivert/jdbc/depot/MySQLBuilder.java
+++ b/src/java/com/samskivert/depot/MySQLBuilder.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Blob;
 import java.sql.Clob;
@@ -32,22 +32,22 @@ import java.sql.Timestamp;
 import java.util.Set;
 
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.jdbc.depot.FieldMarshaller.BooleanMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteEnumMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.DoubleMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.FloatMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.LongMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ObjectMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ShortMarshaller;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.FieldMarshaller.BooleanMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteEnumMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteMarshaller;
+import com.samskivert.depot.FieldMarshaller.DoubleMarshaller;
+import com.samskivert.depot.FieldMarshaller.FloatMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntMarshaller;
+import com.samskivert.depot.FieldMarshaller.LongMarshaller;
+import com.samskivert.depot.FieldMarshaller.ObjectMarshaller;
+import com.samskivert.depot.FieldMarshaller.ShortMarshaller;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
 
 import static com.samskivert.Log.log;
 
diff --git a/src/java/com/samskivert/jdbc/depot/Operation.java b/src/java/com/samskivert/depot/Operation.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/Operation.java
rename to src/java/com/samskivert/depot/Operation.java
index bb07cab..a3f097c 100644
--- a/src/java/com/samskivert/jdbc/depot/Operation.java
+++ b/src/java/com/samskivert/depot/Operation.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java b/src/java/com/samskivert/depot/PersistenceContext.java
similarity index 99%
rename from src/java/com/samskivert/jdbc/depot/PersistenceContext.java
rename to src/java/com/samskivert/depot/PersistenceContext.java
index b0c93b3..e762f50 100644
--- a/src/java/com/samskivert/jdbc/depot/PersistenceContext.java
+++ b/src/java/com/samskivert/depot/PersistenceContext.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -40,9 +40,9 @@ import com.samskivert.jdbc.LiaisonRegistry;
 import com.samskivert.jdbc.MySQLLiaison;
 import com.samskivert.jdbc.PostgreSQLLiaison;
 
-import com.samskivert.jdbc.depot.annotation.TableGenerator;
+import com.samskivert.depot.annotation.TableGenerator;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Defines a scope in which global annotations are shared.
@@ -50,7 +50,7 @@ import static com.samskivert.jdbc.depot.Log.log;
 public class PersistenceContext
 {
     /** Allow toggling of query logging and other debug output via a system property. */
-    public static final boolean DEBUG = Boolean.getBoolean("com.samskivert.jdbc.depot.debug");
+    public static final boolean DEBUG = Boolean.getBoolean("com.samskivert.depot.debug");
 
     /** Map {@link TableGenerator} instances by name. */
     public HashMap<String, TableGenerator> tableGenerators = new HashMap<String, TableGenerator>();
diff --git a/src/java/com/samskivert/jdbc/depot/PersistentRecord.java b/src/java/com/samskivert/depot/PersistentRecord.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/PersistentRecord.java
rename to src/java/com/samskivert/depot/PersistentRecord.java
index 604123a..688366a 100644
--- a/src/java/com/samskivert/jdbc/depot/PersistentRecord.java
+++ b/src/java/com/samskivert/depot/PersistentRecord.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
diff --git a/src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java b/src/java/com/samskivert/depot/PostgreSQLBuilder.java
similarity index 91%
rename from src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java
rename to src/java/com/samskivert/depot/PostgreSQLBuilder.java
index ced8727..202dd13 100644
--- a/src/java/com/samskivert/jdbc/depot/PostgreSQLBuilder.java
+++ b/src/java/com/samskivert/depot/PostgreSQLBuilder.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Blob;
 import java.sql.Clob;
@@ -34,20 +34,20 @@ import java.util.Set;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 import com.samskivert.jdbc.LiaisonRegistry;
-import com.samskivert.jdbc.depot.FieldMarshaller.BooleanMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteEnumMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.DoubleMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.FloatMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.LongMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ObjectMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ShortMarshaller;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.FieldMarshaller.BooleanMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteEnumMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteMarshaller;
+import com.samskivert.depot.FieldMarshaller.DoubleMarshaller;
+import com.samskivert.depot.FieldMarshaller.FloatMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntMarshaller;
+import com.samskivert.depot.FieldMarshaller.LongMarshaller;
+import com.samskivert.depot.FieldMarshaller.ObjectMarshaller;
+import com.samskivert.depot.FieldMarshaller.ShortMarshaller;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
 import com.samskivert.util.ArrayUtil;
 import com.samskivert.util.StringUtil;
 
diff --git a/src/java/com/samskivert/jdbc/depot/Query.java b/src/java/com/samskivert/depot/Query.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/Query.java
rename to src/java/com/samskivert/depot/Query.java
index 70e7d3d..52ad1a1 100644
--- a/src/java/com/samskivert/jdbc/depot/Query.java
+++ b/src/java/com/samskivert/depot/Query.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.jdbc.depot.PersistenceContext.CacheListener;
+import com.samskivert.depot.PersistenceContext.CacheListener;
 
 /**
  * The base of all read-only queries.
diff --git a/src/java/com/samskivert/jdbc/depot/SQLBuilder.java b/src/java/com/samskivert/depot/SQLBuilder.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/SQLBuilder.java
rename to src/java/com/samskivert/depot/SQLBuilder.java
index 2683c60..ff3993c 100644
--- a/src/java/com/samskivert/jdbc/depot/SQLBuilder.java
+++ b/src/java/com/samskivert/depot/SQLBuilder.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 import java.util.Set;
@@ -28,13 +28,13 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import com.samskivert.jdbc.ColumnDefinition;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.annotation.GeneratedValue;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * At the heart of Depot's SQL generation, this object constructs two {@link ExpressionVisitor}
diff --git a/src/java/com/samskivert/jdbc/depot/SchemaMigration.java b/src/java/com/samskivert/depot/SchemaMigration.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/SchemaMigration.java
rename to src/java/com/samskivert/depot/SchemaMigration.java
index 1f99efb..946a52a 100644
--- a/src/java/com/samskivert/jdbc/depot/SchemaMigration.java
+++ b/src/java/com/samskivert/depot/SchemaMigration.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -26,9 +26,9 @@ import java.util.Map;
 
 import com.samskivert.jdbc.ColumnDefinition;
 import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.jdbc.depot.annotation.Column;
+import com.samskivert.depot.annotation.Column;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Encapsulates the migration of a persistent record's database schema. These can be registered
diff --git a/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java b/src/java/com/samskivert/depot/SimpleCacheKey.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java
rename to src/java/com/samskivert/depot/SimpleCacheKey.java
index 1b40b3e..f17d02b 100644
--- a/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java
+++ b/src/java/com/samskivert/depot/SimpleCacheKey.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
diff --git a/src/java/com/samskivert/jdbc/depot/TableValueGenerator.java b/src/java/com/samskivert/depot/TableValueGenerator.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/TableValueGenerator.java
rename to src/java/com/samskivert/depot/TableValueGenerator.java
index 602c71a..345f71c 100644
--- a/src/java/com/samskivert/jdbc/depot/TableValueGenerator.java
+++ b/src/java/com/samskivert/depot/TableValueGenerator.java
@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
-import com.samskivert.jdbc.depot.annotation.TableGenerator;
+import com.samskivert.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.TableGenerator;
 
 import com.samskivert.jdbc.ColumnDefinition;
 import com.samskivert.jdbc.DatabaseLiaison;
diff --git a/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java b/src/java/com/samskivert/depot/ValidatingCacheInvalidator.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java
rename to src/java/com/samskivert/depot/ValidatingCacheInvalidator.java
index 96094f5..f24a8ea 100644
--- a/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java
+++ b/src/java/com/samskivert/depot/ValidatingCacheInvalidator.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * An augmented cache invalidator interface for invalidators that can ensure that they are
diff --git a/src/java/com/samskivert/jdbc/depot/ValueGenerator.java b/src/java/com/samskivert/depot/ValueGenerator.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/ValueGenerator.java
rename to src/java/com/samskivert/depot/ValueGenerator.java
index e2e75f0..83e3b3c 100644
--- a/src/java/com/samskivert/jdbc/depot/ValueGenerator.java
+++ b/src/java/com/samskivert/depot/ValueGenerator.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -27,9 +27,9 @@ import java.sql.Statement;
 
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.GeneratedValue;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Defines the interface to our value generators.
diff --git a/src/java/com/samskivert/jdbc/depot/WhereClause.java b/src/java/com/samskivert/depot/WhereClause.java
similarity index 93%
rename from src/java/com/samskivert/jdbc/depot/WhereClause.java
rename to src/java/com/samskivert/depot/WhereClause.java
index db6d8eb..c3f880d 100644
--- a/src/java/com/samskivert/jdbc/depot/WhereClause.java
+++ b/src/java/com/samskivert/depot/WhereClause.java
@@ -18,10 +18,10 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Currently only exists as a type without any functionality of its own.
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Column.java b/src/java/com/samskivert/depot/annotation/Column.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/annotation/Column.java
rename to src/java/com/samskivert/depot/annotation/Column.java
index 193cbfe..18072ca 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/Column.java
+++ b/src/java/com/samskivert/depot/annotation/Column.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Computed.java b/src/java/com/samskivert/depot/annotation/Computed.java
similarity index 91%
rename from src/java/com/samskivert/jdbc/depot/annotation/Computed.java
rename to src/java/com/samskivert/depot/annotation/Computed.java
index f7fe38c..08e135a 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/Computed.java
+++ b/src/java/com/samskivert/depot/annotation/Computed.java
@@ -18,17 +18,17 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.Join;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.Join;
 
 /**
  * Marks a field as computed, meaning it is ignored for schema purposes and it does not directly
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Entity.java b/src/java/com/samskivert/depot/annotation/Entity.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/annotation/Entity.java
rename to src/java/com/samskivert/depot/annotation/Entity.java
index 5cdf204..86469e2 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/Entity.java
+++ b/src/java/com/samskivert/depot/annotation/Entity.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java b/src/java/com/samskivert/depot/annotation/FullTextIndex.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java
rename to src/java/com/samskivert/depot/annotation/FullTextIndex.java
index 98c5341..198aafa 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java
+++ b/src/java/com/samskivert/depot/annotation/FullTextIndex.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/GeneratedValue.java b/src/java/com/samskivert/depot/annotation/GeneratedValue.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/annotation/GeneratedValue.java
rename to src/java/com/samskivert/depot/annotation/GeneratedValue.java
index c771d44..b6e958a 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/GeneratedValue.java
+++ b/src/java/com/samskivert/depot/annotation/GeneratedValue.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java b/src/java/com/samskivert/depot/annotation/GenerationType.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java
rename to src/java/com/samskivert/depot/annotation/GenerationType.java
index 789030e..dcdf174 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java
+++ b/src/java/com/samskivert/depot/annotation/GenerationType.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 /**
  * Defines the types of primary key generation.
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Id.java b/src/java/com/samskivert/depot/annotation/Id.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/annotation/Id.java
rename to src/java/com/samskivert/depot/annotation/Id.java
index 754130c..e6629c6 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/Id.java
+++ b/src/java/com/samskivert/depot/annotation/Id.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Index.java b/src/java/com/samskivert/depot/annotation/Index.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/annotation/Index.java
rename to src/java/com/samskivert/depot/annotation/Index.java
index fae91b8..f7f32b7 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/Index.java
+++ b/src/java/com/samskivert/depot/annotation/Index.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java b/src/java/com/samskivert/depot/annotation/TableGenerator.java
similarity index 98%
rename from src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java
rename to src/java/com/samskivert/depot/annotation/TableGenerator.java
index 82bfca6..2b9b2a2 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java
+++ b/src/java/com/samskivert/depot/annotation/TableGenerator.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Transient.java b/src/java/com/samskivert/depot/annotation/Transient.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/annotation/Transient.java
rename to src/java/com/samskivert/depot/annotation/Transient.java
index 26a37da..7c0387d 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/Transient.java
+++ b/src/java/com/samskivert/depot/annotation/Transient.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java b/src/java/com/samskivert/depot/annotation/UniqueConstraint.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java
rename to src/java/com/samskivert/depot/annotation/UniqueConstraint.java
index f6d6a66..ecd6ac2 100644
--- a/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java
+++ b/src/java/com/samskivert/depot/annotation/UniqueConstraint.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/java/com/samskivert/jdbc/depot/clause/DeleteClause.java b/src/java/com/samskivert/depot/clause/DeleteClause.java
similarity index 90%
rename from src/java/com/samskivert/jdbc/depot/clause/DeleteClause.java
rename to src/java/com/samskivert/depot/clause/DeleteClause.java
index a35df28..788ffef 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/DeleteClause.java
+++ b/src/java/com/samskivert/depot/clause/DeleteClause.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/FieldDefinition.java b/src/java/com/samskivert/depot/clause/FieldDefinition.java
similarity index 87%
rename from src/java/com/samskivert/jdbc/depot/clause/FieldDefinition.java
rename to src/java/com/samskivert/depot/clause/FieldDefinition.java
index a5b7f6f..446beb6 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/FieldDefinition.java
+++ b/src/java/com/samskivert/depot/clause/FieldDefinition.java
@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Supplies a definition for a computed field of the persistent object we're creating.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/FieldOverride.java b/src/java/com/samskivert/depot/clause/FieldOverride.java
similarity index 86%
rename from src/java/com/samskivert/jdbc/depot/clause/FieldOverride.java
rename to src/java/com/samskivert/depot/clause/FieldOverride.java
index cf59a99..d7a9b46 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/FieldOverride.java
+++ b/src/java/com/samskivert/depot/clause/FieldOverride.java
@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Redirects one field of the persistent object we're creating from its default associated column
diff --git a/src/java/com/samskivert/jdbc/depot/clause/ForUpdate.java b/src/java/com/samskivert/depot/clause/ForUpdate.java
similarity index 88%
rename from src/java/com/samskivert/jdbc/depot/clause/ForUpdate.java
rename to src/java/com/samskivert/depot/clause/ForUpdate.java
index 2adb39e..6ad4457 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/ForUpdate.java
+++ b/src/java/com/samskivert/depot/clause/ForUpdate.java
@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  *  Represents a FOR UPDATE clause.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java b/src/java/com/samskivert/depot/clause/FromOverride.java
similarity index 93%
rename from src/java/com/samskivert/jdbc/depot/clause/FromOverride.java
rename to src/java/com/samskivert/depot/clause/FromOverride.java
index 22160d6..42aac1a 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java
+++ b/src/java/com/samskivert/depot/clause/FromOverride.java
@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  *  Completely overrides the FROM clause, if it exists.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/GroupBy.java b/src/java/com/samskivert/depot/clause/GroupBy.java
similarity index 87%
rename from src/java/com/samskivert/jdbc/depot/clause/GroupBy.java
rename to src/java/com/samskivert/depot/clause/GroupBy.java
index 497da3b..722ed1d 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/GroupBy.java
+++ b/src/java/com/samskivert/depot/clause/GroupBy.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  *  Represents a GROUP BY clause.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/InsertClause.java b/src/java/com/samskivert/depot/clause/InsertClause.java
similarity index 93%
rename from src/java/com/samskivert/jdbc/depot/clause/InsertClause.java
rename to src/java/com/samskivert/depot/clause/InsertClause.java
index 5024b01..96367bd 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/InsertClause.java
+++ b/src/java/com/samskivert/depot/clause/InsertClause.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/Join.java b/src/java/com/samskivert/depot/clause/Join.java
similarity index 89%
rename from src/java/com/samskivert/jdbc/depot/clause/Join.java
rename to src/java/com/samskivert/depot/clause/Join.java
index 4261658..4607177 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/Join.java
+++ b/src/java/com/samskivert/depot/clause/Join.java
@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.Conditionals.Equals;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.Conditionals.Equals;
 
 /**
  *  Represents a JOIN.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/Limit.java b/src/java/com/samskivert/depot/clause/Limit.java
similarity index 91%
rename from src/java/com/samskivert/jdbc/depot/clause/Limit.java
rename to src/java/com/samskivert/depot/clause/Limit.java
index 375558a..2a93cdc 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/Limit.java
+++ b/src/java/com/samskivert/depot/clause/Limit.java
@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  *  Represents a LIMIT/OFFSET clause, for pagination.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java b/src/java/com/samskivert/depot/clause/OrderBy.java
similarity index 90%
rename from src/java/com/samskivert/jdbc/depot/clause/OrderBy.java
rename to src/java/com/samskivert/depot/clause/OrderBy.java
index 0459c12..d8dd14a 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java
+++ b/src/java/com/samskivert/depot/clause/OrderBy.java
@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  *  Represents an ORDER BY clause.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java b/src/java/com/samskivert/depot/clause/QueryClause.java
similarity index 90%
rename from src/java/com/samskivert/jdbc/depot/clause/QueryClause.java
rename to src/java/com/samskivert/depot/clause/QueryClause.java
index 89f229e..bec3958 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java
+++ b/src/java/com/samskivert/depot/clause/QueryClause.java
@@ -18,9 +18,9 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Represents a piece or modifier of an SQL query.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/SelectClause.java b/src/java/com/samskivert/depot/clause/SelectClause.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/clause/SelectClause.java
rename to src/java/com/samskivert/depot/clause/SelectClause.java
index e5bda4d..f8f34f5 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/SelectClause.java
+++ b/src/java/com/samskivert/depot/clause/SelectClause.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,9 +27,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java b/src/java/com/samskivert/depot/clause/UpdateClause.java
similarity index 91%
rename from src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java
rename to src/java/com/samskivert/depot/clause/UpdateClause.java
index 8d4766a..193c0c4 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java
+++ b/src/java/com/samskivert/depot/clause/UpdateClause.java
@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.
diff --git a/src/java/com/samskivert/jdbc/depot/clause/Where.java b/src/java/com/samskivert/depot/clause/Where.java
similarity index 83%
rename from src/java/com/samskivert/jdbc/depot/clause/Where.java
rename to src/java/com/samskivert/depot/clause/Where.java
index 2392d7c..e687b37 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/Where.java
+++ b/src/java/com/samskivert/depot/clause/Where.java
@@ -18,19 +18,19 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
-import com.samskivert.jdbc.depot.operator.Conditionals.Equals;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Logic.And;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
+import com.samskivert.depot.operator.Conditionals.Equals;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Logic.And;
 
 /**
  * Represents a where clause: the condition can be any comparison operator or logical combination
diff --git a/src/java/com/samskivert/jdbc/depot/expression/ColumnExp.java b/src/java/com/samskivert/depot/expression/ColumnExp.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/expression/ColumnExp.java
rename to src/java/com/samskivert/depot/expression/ColumnExp.java
index d10f8fa..6daa338 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/ColumnExp.java
+++ b/src/java/com/samskivert/depot/expression/ColumnExp.java
@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression that unambiguously identifies a field of a class, e.g. GameRecord.itemId.
diff --git a/src/java/com/samskivert/jdbc/depot/expression/EpochSeconds.java b/src/java/com/samskivert/depot/expression/EpochSeconds.java
similarity index 94%
rename from src/java/com/samskivert/jdbc/depot/expression/EpochSeconds.java
rename to src/java/com/samskivert/depot/expression/EpochSeconds.java
index 94118df..2727ad5 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/EpochSeconds.java
+++ b/src/java/com/samskivert/depot/expression/EpochSeconds.java
@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression for extracting the seconds since the epoch from a date expression.
diff --git a/src/java/com/samskivert/jdbc/depot/expression/ExpressionVisitor.java b/src/java/com/samskivert/depot/expression/ExpressionVisitor.java
similarity index 65%
rename from src/java/com/samskivert/jdbc/depot/expression/ExpressionVisitor.java
rename to src/java/com/samskivert/depot/expression/ExpressionVisitor.java
index a629b71..40fd5d0 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/ExpressionVisitor.java
+++ b/src/java/com/samskivert/depot/expression/ExpressionVisitor.java
@@ -18,32 +18,32 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.MultiKey;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.MultiKey;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
 
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.ForUpdate;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.GroupBy;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.Join;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.ForUpdate;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.GroupBy;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.Join;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
 
-import com.samskivert.jdbc.depot.operator.Conditionals.Exists;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
-import com.samskivert.jdbc.depot.operator.Logic.Not;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
-import com.samskivert.jdbc.depot.operator.SQLOperator.MultiOperator;
+import com.samskivert.depot.operator.Conditionals.Exists;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.operator.Logic.Not;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.operator.SQLOperator.MultiOperator;
 
 /**
  * Enumerates visitation methods for every possible SQL expression type.
diff --git a/src/java/com/samskivert/jdbc/depot/expression/FunctionExp.java b/src/java/com/samskivert/depot/expression/FunctionExp.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/expression/FunctionExp.java
rename to src/java/com/samskivert/depot/expression/FunctionExp.java
index f17864c..fc69efd 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/FunctionExp.java
+++ b/src/java/com/samskivert/depot/expression/FunctionExp.java
@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression for a function, e.g. FLOOR(blah).
diff --git a/src/java/com/samskivert/jdbc/depot/expression/LiteralExp.java b/src/java/com/samskivert/depot/expression/LiteralExp.java
similarity index 93%
rename from src/java/com/samskivert/jdbc/depot/expression/LiteralExp.java
rename to src/java/com/samskivert/depot/expression/LiteralExp.java
index 2092f40..afad3f6 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/LiteralExp.java
+++ b/src/java/com/samskivert/depot/expression/LiteralExp.java
@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression for things we don't support natively, e.g. COUNT(*).
diff --git a/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java b/src/java/com/samskivert/depot/expression/SQLExpression.java
similarity index 92%
rename from src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java
rename to src/java/com/samskivert/depot/expression/SQLExpression.java
index d70ad22..effe117 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java
+++ b/src/java/com/samskivert/depot/expression/SQLExpression.java
@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.SQLBuilder;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.SQLBuilder;
 
 /**
  * Represents an SQL expression, e.g. column name, function, or constant.
diff --git a/src/java/com/samskivert/jdbc/depot/expression/ValueExp.java b/src/java/com/samskivert/depot/expression/ValueExp.java
similarity index 93%
rename from src/java/com/samskivert/jdbc/depot/expression/ValueExp.java
rename to src/java/com/samskivert/depot/expression/ValueExp.java
index 080c7b4..0b76427 100644
--- a/src/java/com/samskivert/jdbc/depot/expression/ValueExp.java
+++ b/src/java/com/samskivert/depot/expression/ValueExp.java
@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * A Java value that is bound as a parameter to the query, e.g. 1 or 'abc'.
diff --git a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java b/src/java/com/samskivert/depot/operator/Arithmetic.java
similarity index 95%
rename from src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java
rename to src/java/com/samskivert/depot/operator/Arithmetic.java
index 8519ad6..afaf9a4 100644
--- a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java
+++ b/src/java/com/samskivert/depot/operator/Arithmetic.java
@@ -18,10 +18,10 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
 
 /**
  * A convenient container for implementations of arithmetic operators. Classes that value brevity
diff --git a/src/java/com/samskivert/jdbc/depot/operator/Conditionals.java b/src/java/com/samskivert/depot/operator/Conditionals.java
similarity index 96%
rename from src/java/com/samskivert/jdbc/depot/operator/Conditionals.java
rename to src/java/com/samskivert/depot/operator/Conditionals.java
index 1e083bc..c8e1f69 100644
--- a/src/java/com/samskivert/jdbc/depot/operator/Conditionals.java
+++ b/src/java/com/samskivert/depot/operator/Conditionals.java
@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * A convenient container for implementations of conditional operators.  Classes that value brevity
diff --git a/src/java/com/samskivert/jdbc/depot/operator/Logic.java b/src/java/com/samskivert/depot/operator/Logic.java
similarity index 92%
rename from src/java/com/samskivert/jdbc/depot/operator/Logic.java
rename to src/java/com/samskivert/depot/operator/Logic.java
index ee08788..7170507 100644
--- a/src/java/com/samskivert/jdbc/depot/operator/Logic.java
+++ b/src/java/com/samskivert/depot/operator/Logic.java
@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * A convenient container for implementations of logical operators.  Classes that value brevity
diff --git a/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java b/src/java/com/samskivert/depot/operator/SQLOperator.java
similarity index 92%
rename from src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java
rename to src/java/com/samskivert/depot/operator/SQLOperator.java
index 86022bf..75fd3c6 100644
--- a/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java
+++ b/src/java/com/samskivert/depot/operator/SQLOperator.java
@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
 
 /**
  * A common interface for operator hierarchies in SQL. The main purpose of breaking this out from
diff --git a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java b/src/java/com/samskivert/depot/tools/GenRecordTask.java
similarity index 97%
rename from src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java
rename to src/java/com/samskivert/depot/tools/GenRecordTask.java
index f046b63..b07dfb4 100644
--- a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java
+++ b/src/java/com/samskivert/depot/tools/GenRecordTask.java
@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.tools;
+package com.samskivert.depot.tools;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -49,9 +49,9 @@ import org.apache.tools.ant.util.ClasspathUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.annotation.Transient;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.annotation.Transient;
 import com.samskivert.util.ClassUtil;
 import com.samskivert.util.GenUtil;
 import com.samskivert.util.StringUtil;
@@ -469,13 +469,13 @@ public class GenRecordTask extends Task
     protected Class<?> _prclass;
 
     /** Specifies the path to the name code template. */
-    protected static final String NAME_TMPL = "com/samskivert/jdbc/depot/tools/record_name.tmpl";
+    protected static final String NAME_TMPL = "com/samskivert.depot/tools/record_name.tmpl";
 
     /** Specifies the path to the column code template. */
-    protected static final String COL_TMPL = "com/samskivert/jdbc/depot/tools/record_column.tmpl";
+    protected static final String COL_TMPL = "com/samskivert.depot/tools/record_column.tmpl";
 
     /** Specifies the path to the key code template. */
-    protected static final String KEY_TMPL = "com/samskivert/jdbc/depot/tools/record_key.tmpl";
+    protected static final String KEY_TMPL = "com/samskivert.depot/tools/record_key.tmpl";
 
     // markers
     protected static final String MARKER = "// AUTO-GENERATED: ";
diff --git a/src/java/com/samskivert/jdbc/depot/tools/record_column.tmpl b/src/java/com/samskivert/depot/tools/record_column.tmpl
similarity index 100%
rename from src/java/com/samskivert/jdbc/depot/tools/record_column.tmpl
rename to src/java/com/samskivert/depot/tools/record_column.tmpl
diff --git a/src/java/com/samskivert/jdbc/depot/tools/record_key.tmpl b/src/java/com/samskivert/depot/tools/record_key.tmpl
similarity index 100%
rename from src/java/com/samskivert/jdbc/depot/tools/record_key.tmpl
rename to src/java/com/samskivert/depot/tools/record_key.tmpl
diff --git a/src/java/com/samskivert/jdbc/depot/tools/record_name.tmpl b/src/java/com/samskivert/depot/tools/record_name.tmpl
similarity index 100%
rename from src/java/com/samskivert/jdbc/depot/tools/record_name.tmpl
rename to src/java/com/samskivert/depot/tools/record_name.tmpl