diff --git a/COMPILING.txt b/COMPILING.txt
index 800b87e1..4ce9498a 100644
--- a/COMPILING.txt
+++ b/COMPILING.txt
@@ -47,8 +47,10 @@ Furthermore, Sqoop's build can be instrumented with the following:
 
 Sqoop is compiled with ant. Type +ant -p+ to see the list of available targets.
 
-Type +ant jar+ to compile java sources into jar files. Type +ant package+ to
-produce a fully self-hosted build. This will appear in the
+Type +ant+ to compile all java sources. You can then run Sqoop with +bin/sqoop+.
+
+If you want to build everything (including the documentation), type
++ant package+. This will appear in the
 +build/sqoop-(version)/+ directory.
 
 == Testing Sqoop
diff --git a/bin/configure-sqoop b/bin/configure-sqoop
index 6bb300d6..47e5d877 100755
--- a/bin/configure-sqoop
+++ b/bin/configure-sqoop
@@ -110,10 +110,11 @@ if [ -d "$SQOOP_HOME/build/ivy/lib/sqoop" ]; then
   done
 fi
 
+add_to_classpath ${SQOOP_JAR_DIR}
+
 export SQOOP_CLASSPATH
 export SQOOP_JAR_DIR
 export SQOOP_SHIM_DIR
-export SQOOP_JAR=`ls -1 ${SQOOP_JAR_DIR}/sqoop-*.jar | head -n 1`
 export HADOOP_CLASSPATH="${SQOOP_CLASSPATH}:${HADOOP_CLASSPATH}"
 export HADOOP_HOME
 export HBASE_HOME
diff --git a/bin/sqoop b/bin/sqoop
index cf8f438d..343105a5 100755
--- a/bin/sqoop
+++ b/bin/sqoop
@@ -95,5 +95,4 @@ bin=`dirname ${prgm}`
 bin=`cd ${bin} && pwd`
 
 source ${bin}/configure-sqoop "${bin}"
-${HADOOP_HOME}/bin/hadoop jar ${SQOOP_JAR} \
-    com.cloudera.sqoop.Sqoop "$@"
+exec ${HADOOP_HOME}/bin/hadoop com.cloudera.sqoop.Sqoop "$@"
diff --git a/build.xml b/build.xml
index 9d668ad9..7a1c6ab5 100644
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,7 @@
    limitations under the License.
 -->
 
-<project name="sqoop" default="jar"
+<project name="sqoop" default="jar-all"
     xmlns:artifact="urn:maven-artifact-ant"
     xmlns:ivy="antlib:org.apache.ivy.ant">
 
@@ -33,6 +33,7 @@
   <property name="version" value="1.1.0-SNAPSHOT" />
   <property name="artifact.name" value="${name}-${version}" />
   <property name="dest.jar" value="${artifact.name}.jar" />
+  <property name="test.jar" value="${name}-test-${version}.jar" />
   <property name="git.hash" value="" />
   
   <!-- locations in the source tree -->
@@ -45,18 +46,40 @@
   <property name="docs.src.dir" location="${base.src.dir}/docs" />
   <property name="script.src.dir" location="${base.src.dir}/scripts" />
 
+  <!-- base directory for all build/test process output -->
   <property name="build.dir" location="${basedir}/build" />
+
+  <!-- generated bin scripts -->
   <property name="build.bin.dir" location="${build.dir}/bin" />
+
+  <!-- generated source code -->
   <property name="build.src.dir" location="${build.dir}/src" />
+
+  <!-- staging area for *-sources.jar files -->
+  <property name="build.srcjar.dir" location="${build.dir}/srcjars" />
+
+  <!-- compiled classes for the main sqoop artifact. -->
   <property name="build.classes" location="${build.dir}/classes"/>
+
+  <!-- compiled outputs for the shim artifacts. -->
   <property name="build.shim.dir" location="${build.dir}/shims"/>
   <property name="build.shim.classes" location="${build.shim.dir}/classes"/>
+
+  <!-- root directory for output/intermediate data for testing -->
   <property name="build.test" location="${build.dir}/test"/>
+  <property name="test.log.dir" location="${build.dir}/test/logs"/>
+
+  <!-- compiled test classes -->
   <property name="build.test.classes" location="${build.test}/classes" />
+
+  <!-- compiled "perftest" programs -->
   <property name="build.perftest" location="${build.dir}/perftest"/>
   <property name="build.perftest.classes" location="${build.perftest}/classes"/>
+
+  <!-- generated documentation output directory -->
   <property name="build.javadoc" location="${build.dir}/docs/api" />
-  <property name="test.log.dir" location="${build.dir}/test/logs"/>
+
+
   <property name="dist.dir" location="${build.dir}/${artifact.name}" />
   <property name="tar.file" location="${build.dir}/${artifact.name}.tar.gz" />
   <property name="build.docs.timestamp"
@@ -95,6 +118,7 @@
   <property name="mvn.deploy.url"
       value="https://repository.cloudera.com/content/repositories/${mvn.repo}"/>
   <property name="sqoop.pom" value="${mvn.build.dir}/sqoop.pom" />
+  <property name="sqooptest.pom" value="${mvn.build.dir}/sqoop-test.pom" />
   <property name="apache.shim.pom"
       value="${mvn.build.dir}/sqoop-shim-apache.pom" />
   <property name="cloudera.shim.pom"
@@ -376,11 +400,19 @@
     <jar jarfile="${build.dir}/${dest.jar}" basedir="${build.classes}" />
   </target>
 
+  <target name="jar-test" depends="compile-test" description="Create test jar">
+    <jar jarfile="${build.dir}/${test.jar}" basedir="${build.test.classes}" />
+  </target>
+
   <!-- Ensure that all source code can be built -->
   <target name="compile-all"
       depends="compile,compile-test,jar-all-shims,compile-perf-test"
       description="Compile all sources"/>
 
+  <!-- Create all jars. Note this does not include the perftests. -->
+  <target name="jar-all" depends="jar,jar-test,jar-all-shims"
+      description="Create all jar artifacts" />
+
   <target name="scripts" depends="jar"
       description="Create tool-specific wrapper scripts">
     <!-- Take the list of available tools from 'sqoop help' and generate
@@ -405,7 +437,7 @@
   </target>
 
   <target name="package"
-      depends="jar,compile-all,docs,javadoc,ivy-retrieve-redist,scripts"
+      depends="jar-all,compile-all,docs,javadoc,ivy-retrieve-redist,scripts"
       description="Create a redistributable package">
 
     <mkdir dir="${dist.dir}"/>
@@ -417,6 +449,13 @@
       </fileset>
     </copy>
 
+    <!-- copy the test artifact -->
+    <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
+      <fileset dir="${build.dir}">
+        <include name="${test.jar}" />
+      </fileset>
+    </copy>
+
     <!-- copy in all shim artifacts -->
     <mkdir dir="${dist.dir}/shims" />
     <copy todir="${dist.dir}/shims" includeEmptyDirs="false" flatten="true">
@@ -689,7 +728,7 @@
     <echo message="Release audit report: ${build.dir}/rat.log" />
   </target>
 
-  <target name="mvn-prep" depends="init,ivy-resolve-common">
+  <target name="mvn-prep" depends="init,ivy-resolve-test">
     <!-- prepare for mvn tasks. -->
 
     <!-- Download maven -->
@@ -704,7 +743,12 @@
 
     <!-- generate our poms from our ivy files. -->
     <mkdir dir="${mvn.build.dir}" />
-    <ivy:makepom ivyfile="ivy.xml" pomfile="${sqoop.pom}"
+    <ivy:makepom ivyfile="ivy/sqoop.xml" pomfile="${sqoop.pom}"
+        settingsRef="${name}.ivy.settings">
+      <mapping conf="default" scope="compile" />
+      <mapping conf="runtime" scope="runtime" />
+    </ivy:makepom>
+    <ivy:makepom ivyfile="ivy/sqoop-test.xml" pomfile="${sqooptest.pom}"
         settingsRef="${name}.ivy.settings">
       <mapping conf="default" scope="compile" />
       <mapping conf="runtime" scope="runtime" />
@@ -731,32 +775,97 @@
     </replaceregexp>
   </target>
 
-  <target name="mvn-install" depends="init,mvn-prep,jar,jar-all-shims"
+  <target name="srcjars" depends="init,jar-all"
+      description="Create source jars">
+    <mkdir dir="${build.srcjar.dir}" />
+    <jar jarfile="${build.srcjar.dir}/${artifact.name}-sources.jar">
+      <fileset dir="${src.dir}" />
+      <fileset dir="${build.src.dir}" />
+    </jar>
+    <jar jarfile="${build.srcjar.dir}/${name}-test-${version}-sources.jar">
+      <fileset dir="${test.dir}" />
+    </jar>
+    <jar jarfile="${build.srcjar.dir}/${name}-shim-apache-${version}-sources.jar">
+      <fileset dir="${shim.src.dir}/apache/" />
+      <fileset dir="${shim.src.dir}/common/" />
+    </jar>
+    <jar jarfile="${build.srcjar.dir}/${name}-shim-cloudera-${version}-sources.jar">
+      <fileset dir="${shim.src.dir}/cloudera/" />
+      <fileset dir="${shim.src.dir}/common/" />
+    </jar>
+  </target>
+
+  <target name="mvn-install" depends="init,mvn-prep,jar-all,srcjars"
       description="Install Sqoop in local m2 repository">
     <artifact:pom file="${sqoop.pom}" id="sqoop" />
     <artifact:install file="${build.dir}/${dest.jar}">
       <pom refid="sqoop" />
+      <attach file="${build.srcjar.dir}/${artifact.name}-sources.jar"
+          classifier="sources" />
+    </artifact:install>
+
+    <artifact:pom file="${sqooptest.pom}" id="sqoop-test" />
+    <artifact:install file="${build.dir}/${test.jar}">
+      <pom refid="sqoop-test" />
+      <attach file="${build.srcjar.dir}/${name}-test-${version}-sources.jar"
+          classifier="sources" />
     </artifact:install>
 
     <artifact:pom file="${apache.shim.pom}" id="sqoop-apache-shim" />
     <artifact:install
         file="${build.shim.dir}/${name}-shim-apache-${version}.jar">
       <pom refid="sqoop-apache-shim" />
+      <attach
+        file="${build.srcjar.dir}/${name}-shim-apache-${version}-sources.jar"
+        classifier="sources" />
     </artifact:install>
 
     <artifact:pom file="${cloudera.shim.pom}" id="sqoop-cloudera-shim" />
     <artifact:install
         file="${build.shim.dir}/${name}-shim-cloudera-${version}.jar">
       <pom refid="sqoop-cloudera-shim" />
+      <attach
+        file="${build.srcjar.dir}/${name}-shim-cloudera-${version}-sources.jar"
+        classifier="sources" />
     </artifact:install>
   </target>
 
-  <target name="mvn-deploy" depends="mvn-prep,jar,jar-all-shims"
+  <target name="mvn-deploy" depends="init,mvn-prep,jar-all,srcjars"
       description="Deploy Sqoop to public maven repository">
     <artifact:pom file="${sqoop.pom}" id="sqoop" />
     <artifact:deploy file="${build.dir}/${dest.jar}">
       <remoteRepository id="${mvn.repo.id}" url="${mvn.deploy.url}"/>
       <pom refid="sqoop" />
+      <attach file="${build.srcjar.dir}/${artifact.name}-sources.jar"
+          classifier="sources" />
+    </artifact:deploy>
+
+    <artifact:pom file="${sqooptest.pom}" id="sqoop-test" />
+    <artifact:deploy file="${build.dir}/${test.jar}">
+      <remoteRepository id="${mvn.repo.id}" url="${mvn.deploy.url}"/>
+      <pom refid="sqoop-test" />
+      <attach file="${build.srcjar.dir}/${name}-test-${version}-sources.jar"
+          classifier="sources" />
+    </artifact:deploy>
+
+    <artifact:pom file="${apache.shim.pom}" id="sqoop-apache-shim" />
+    <artifact:deploy
+        file="${build.shim.dir}/${name}-shim-apache-${version}.jar">
+      <remoteRepository id="${mvn.repo.id}" url="${mvn.deploy.url}"/>
+      <pom refid="sqoop-apache-shim" />
+      <attach
+        file="${build.srcjar.dir}/${name}-shim-apache-${version}-sources.jar"
+        classifier="sources" />
+    </artifact:deploy>
+
+    <artifact:pom file="${cloudera.shim.pom}" id="sqoop-cloudera-shim" />
+    <artifact:deploy
+        file="${build.shim.dir}/${name}-shim-cloudera-${version}.jar">
+      <remoteRepository id="${mvn.repo.id}" url="${mvn.deploy.url}"/>
+      <pom refid="sqoop-cloudera-shim" />
+      <attach
+        file="${build.srcjar.dir}/${name}-shim-cloudera-${version}-sources.jar"
+        classifier="sources" />
     </artifact:deploy>
   </target>
 
@@ -826,6 +935,8 @@
 
   <target name="clean-cache" description="Remove cached dependencies">
     <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop" />
+    <delete dir="${user.home}/.ivy2/cache/com.cloudera.hadoop" />
+    <delete dir="${user.home}/.ivy2/cache/com.cloudera.hadoop" />
     <delete file="${ivy.jar}" />
   </target>
 
@@ -903,7 +1014,7 @@
         file="${cobertura.home}/cobertura.jar" />
   </target>
 
-  <target name="checkstyle" depends="ivy-retrieve-checkstyle, compile-all"
+  <target name="checkstyle" depends="ivy-retrieve-checkstyle,compile-all"
       description="Check source code conventions">
     <taskdef resource="checkstyletask.properties">
       <classpath refid="${name}.checkstyle.classpath" />
diff --git a/ivy.xml b/ivy.xml
index a7ab7f93..72a4aaf9 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -117,7 +117,7 @@
     <dependency org="log4j" name="log4j" rev="${log4j.version}"
       conf="common->master" />
     <dependency org="junit" name="junit" rev="${junit.version}"
-      conf="common->default"/>
+      conf="test->default"/>
     <!--
     <dependency org="org.apache.hbase" name="hbase" rev="${hbase.version}"
       conf="common->default" />
diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
index b27fd761..c3120327 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -53,8 +53,8 @@
         m2compatible="true" checkmodified="true" changingPattern=".*SNAPSHOT"/>
 
     <filesystem name="fs" m2compatible="true">
-       <artifact pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].[ext]"/>
-       <ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
+       <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
+       <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>
 
     <chain name="default" dual="true" checkmodified="true"
diff --git a/ivy/sqoop-test.xml b/ivy/sqoop-test.xml
new file mode 100644
index 00000000..45a6b17d
--- /dev/null
+++ b/ivy/sqoop-test.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<!--
+   Licensed to Cloudera, Inc. under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   Cloudera, Inc. licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<ivy-module version="1.0">
+  <info organisation="com.cloudera.sqoop" module="${name}-test">
+    <license name="Apache 2.0"/>
+    <ivyauthor name="Sqoop Team" url="http://github.com/cloudera/sqoop" />
+    <description>
+        Sqoop test library
+    </description>
+  </info>
+  <configurations defaultconfmapping="default">
+    <!--these match the Maven configurations-->
+    <conf name="default" extends="master,runtime"/>
+    <conf name="master" description="contains the artifact but no dependencies"/>
+    <conf name="runtime" description="runtime but not the artifact" />
+    <conf name="common" visibility="private"
+      extends="runtime"
+      description="artifacts needed to compile/test the application"/>
+  </configurations>
+
+  <publications>
+    <!--get the artifact from our module name-->
+    <artifact conf="master"/>
+  </publications>
+  <dependencies>
+    <!-- Dependencies for Cloudera's Distribution for Hadoop -->
+    <dependency org="com.cloudera.hadoop" name="hadoop-core"
+      rev="${hadoop-core.cloudera.version}" conf="common->default"/>
+    <dependency org="com.cloudera.hadoop" name="hadoop-test"
+      rev="${hadoop-core.cloudera.version}" conf="common->default"/>
+    <dependency org="junit" name="junit" rev="${junit.version}"
+      conf="common->default"/>
+    <dependency org="hsqldb" name="hsqldb" rev="${hsqldb.version}"
+      conf="common->default"/>
+  </dependencies>
+</ivy-module>
diff --git a/ivy/sqoop.xml b/ivy/sqoop.xml
new file mode 100644
index 00000000..7f455fc0
--- /dev/null
+++ b/ivy/sqoop.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<!--
+   Licensed to Cloudera, Inc. under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   Cloudera, Inc. licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<ivy-module version="1.0">
+  <info organisation="com.cloudera.sqoop" module="${name}">
+    <license name="Apache 2.0"/>
+    <ivyauthor name="Sqoop Team" url="http://github.com/cloudera/sqoop" />
+    <description>
+        Sqoop
+    </description>
+  </info>
+  <configurations defaultconfmapping="default">
+    <!--these match the Maven configurations-->
+    <conf name="default" extends="master,runtime"/>
+    <conf name="master" description="contains the artifact but no dependencies"/>
+    <conf name="runtime" description="runtime but not the artifact" />
+    <conf name="common" visibility="private"
+      extends="runtime"
+      description="artifacts needed to compile/test the application"/>
+  </configurations>
+
+  <publications>
+    <!--get the artifact from our module name-->
+    <artifact conf="master"/>
+  </publications>
+  <dependencies>
+    <!-- Dependencies for Cloudera's Distribution for Hadoop -->
+    <dependency org="com.cloudera.hadoop" name="hadoop-core"
+      rev="${hadoop-core.cloudera.version}" conf="common->default"/>
+    <dependency org="hsqldb" name="hsqldb" rev="${hsqldb.version}"
+      conf="common->default"/>
+    <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
+      conf="common->default"/>
+    <dependency org="commons-cli" name="commons-cli"
+      rev="${commons-cli.version}" conf="common->default"/>
+    <dependency org="commons-logging" name="commons-logging"
+      rev="${commons-logging.version}" conf="common->default"/>
+    <dependency org="log4j" name="log4j" rev="${log4j.version}"
+      conf="common->master" />
+  </dependencies>
+</ivy-module>
diff --git a/src/scripts/write-version-info.sh b/src/scripts/write-version-info.sh
index 11988944..a6e3fffe 100755
--- a/src/scripts/write-version-info.sh
+++ b/src/scripts/write-version-info.sh
@@ -29,7 +29,7 @@ buildroot=$1
 version=$2
 specifiedgithash=$3
 
-outputdir=${buildroot}/src/com.cloudera.sqoop
+outputdir=${buildroot}/src/com/cloudera/sqoop
 outputfile=${outputdir}/SqoopVersion.java
 
 signature=$specifiedgithash