diff --git a/ant-bridge.sh b/ant-bridge.sh
new file mode 100755
index 000000000..e76e03930
--- /dev/null
+++ b/ant-bridge.sh
@@ -0,0 +1,171 @@
+#!/bin/sh
+
+mvn_args="verify"
+mvn_properties=
+mvn_clean=
+unknown_args=
+property_regex='-D(.*)=(.*)'
+unit_test_regex='.*UnitTest'
+post_script=
+run_type="run"
+
+for arg in "${@}" ; do
+    if [[ "${arg}" == "dry" ]] ; then
+        run_type="dry"
+
+    elif [[ "${arg}" == "clean" ]] ; then
+        mvn_clean="clean"
+        mvn_args=
+
+    elif [[ "${arg}" =~ ${property_regex} ]] ; then
+        property_name=${BASH_REMATCH[1]}
+        property_value=${BASH_REMATCH[2]}
+
+        if [[ "${property_name}" == "single" ]] ; then
+            test_property="test"
+            test_disabled="it.test"
+            if [[ ! "${property_value}" =~ ${unit_test_regex} ]] ; then
+                test_property="it.test"
+                test_disabled="test"
+            fi
+
+            mvn_properties="${mvn_properties} -D${test_disabled}=disabled -D${test_property}=${property_value}"
+
+        elif [[ "${property_name}" == "test.debug.port" ]] ; then
+            mvn_properties="${mvn_properties} -Dmaven.surefire.debug=\"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${property_value}\""
+
+        elif [[ "${property_name}" == "test.default.maxmemory" ]] ; then
+            mvn_properties="${mvn_properties} -Dtest.maxmemory=${property_value}"
+
+        else
+            unknown_args="${unknown_args} \"${arg}\""
+
+        fi
+
+    else
+        if [[ "${arg}" != "dist" && "${mvn_args}" != "" && "${mvn_args}" != "verify" ]] ; then
+            echo "Sorry, this script does not currently support mixing targets." >&2
+            exit 1
+
+        elif [[ "${arg}" == "dist" ]] ; then
+            mvn_args="verify"
+
+        elif [[ "${arg}" == "gatk" ]] ; then
+            mvn_args="verify '-P!queue'"
+
+        elif [[ "${arg}" == "test.compile" ]] ; then
+            mvn_args="test-compile"
+
+        elif [[ "${arg}" == "gatkdocs" ]] ; then
+            local_repo="sitetemprepo"
+            mvn_args="install -Dmaven.repo.local=${local_repo} -Ddisable.queue && mvn site -Dmaven.repo.local=${local_repo} -Ddisable.queue"
+
+        elif [[ "${arg}" == "package.gatk.full" ]] ; then
+            mvn_args="package '-P!private,!queue'"
+
+        elif [[ "${arg}" == "package.gatk.all" ]] ; then
+            mvn_args="package '-P!queue'"
+
+        elif [[ "${arg}" == "package.queue.full" ]] ; then
+            mvn_args="package '-P!private'"
+
+        elif [[ "${arg}" == "package.queue.all" ]] ; then
+            mvn_args="package"
+
+#        elif [[ "${arg}" == "release.gatk.full" ]] ; then
+#            mvn_args="package '-P!private,!queue'"
+#            post_script=" && private/src/main/scripts/shell/copy_release.sh public/gatk-package/target/GenomeAnalysisTK-*.tar.bz2"
+
+#        elif [[ "${arg}" == "release.queue.full" ]] ; then
+#            mvn_args="package '-P!private'"
+#            post_script=" && private/src/main/scripts/shell/copy_release.sh public/queue-package/target/Queue-*.tar.bz2"
+
+        elif [[ "${arg}" == "build-picard-private" ]] ; then
+            mvn_args="mvn install -f private/picard-maven/pom.xml"
+
+        # TODO: clover support
+        # see ant and maven docs for clover:
+        #  https://confluence.atlassian.com/display/CLOVER/1.+QuickStart+Guide
+        #  https://confluence.atlassian.com/display/CLOVER/Clover-for-Maven+2+and+3+User%27s+Guide
+        #
+        #elif [[ "${arg}" == "clover.report" ]] ; then
+        #    mvn_args=...
+        #
+        #elif [[ "${arg}" == "with.clover" ]] ; then
+        #    mvn_args=...
+
+        # TODO: This runs *all* commit tests, including the few on Queue.
+        elif [[ "${arg}" == "gatkfull.binary.release.tests" ]] ; then
+            local_repo="sitetemprepo"
+            mvn_args="install -Dmaven.repo.local=${local_repo} && mvn verify"
+            mvn_args="${mvn_args} -Dmaven.repo.local=${local_repo} -Dmaven.javadoc.skip=true"
+            mvn_args="${mvn_args} -Dsting.generate-gatk-extensions.skipped=true"
+            mvn_args="${mvn_args} -Dsting.jar.phase=none -Dsting.unpack.phase=none -Dsting.shade.phase=none"
+            mvn_args="${mvn_args} -Dsting.packagecommittests.skipped=false"
+
+        # TODO: This runs only the pipeline tests (full, non-dry run), but not the commit tests for Queue.
+        elif [[ "${arg}" == "queuefull.binary.release.tests" ]] ; then
+            local_repo="sitetemprepo"
+            mvn_args="install -Dmaven.repo.local=${local_repo} && mvn verify"
+            mvn_args="${mvn_args} -Dmaven.repo.local=${local_repo} -Dmaven.javadoc.skip=true"
+            mvn_args="${mvn_args} -Dsting.generate-gatk-extensions.skipped=true"
+            mvn_args="${mvn_args} -Dsting.jar.phase=none -Dsting.unpack.phase=none -Dsting.shade.phase=none"
+            mvn_args="${mvn_args} -Dsting.packagepipelinetests.skipped=false"
+            mvn_args="${mvn_args} -Dsting.pipelinetests.run=true"
+
+        elif [[ "${arg}" == "committests" ]] ; then
+            mvn_args="verify -Dsting.committests.skipped=false"
+
+        elif [[ "${arg}" == "test" ]] ; then
+            mvn_args="test -Dsting.unittests.skipped=false"
+
+        elif [[ "${arg}" == "unittest" ]] ; then
+            mvn_args="test -Dsting.unittests.skipped=false"
+
+        elif [[ "${arg}" == "integrationtest" ]] ; then
+            mvn_args="verify -Dsting.integrationtests.skipped=false"
+
+        elif [[ "${arg}" == "largescaletest" ]] ; then
+            mvn_args="verify -Dsting.largescaletests.skipped=false"
+
+        elif [[ "${arg}" == "pipelinetest" ]] ; then
+            mvn_args="verify -Dsting.pipelinetests.skipped=false"
+
+        elif [[ "${arg}" == "pipelinetestrun" ]] ; then
+            mvn_args="verify -Dsting.pipelinetests.skipped=false -Dsting.pipelinetests.run=true"
+
+        elif [[ "${arg}" == "fasttest" ]] ; then
+            mvn_args="verify -Dsting.committests.skipped=false -pl private/gatk-private -am -Dresource.bundle.skip=true"
+
+        else
+            unknown_args="${unknown_args} \"${arg}\""
+
+        fi
+
+    fi
+
+done
+
+mvn_cmd=
+if [[ "${mvn_clean}" != "" ]] ; then
+    if [[ "${mvn_args}" != "" ]] ; then
+      mvn_cmd="mvn ${mvn_clean} && mvn ${mvn_args}"
+    else
+      mvn_cmd="mvn ${mvn_clean}"
+    fi
+else
+    mvn_cmd="mvn ${mvn_args}"
+fi
+
+if [[ "${unknown_args}" != "" ]] ; then
+    echo "Unrecognized arguments:${unknown_args}" >&2
+
+else
+    echo "Equivalent maven command"
+    echo "${mvn_cmd}${mvn_properties}${post_script}"
+
+    if [[ "${run_type}" != "dry" ]] ; then
+        sh -c "${mvn_cmd}${mvn_properties}${post_script}"
+    fi
+
+fi
diff --git a/build.xml b/build.xml
deleted file mode 100644
index fd0801bfb..000000000
--- a/build.xml
+++ /dev/null
@@ -1,1518 +0,0 @@
-<!--
-  ~ Copyright (c) 2012, The Broad Institute
-  ~
-  ~ Permission is hereby granted, free of charge, to any person
-  ~ obtaining a copy of this software and associated documentation
-  ~ files (the "Software"), to deal in the Software without
-  ~ restriction, including without limitation the rights to use,
-  ~ copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the
-  ~ Software is furnished to do so, subject to the following
-  ~ conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be
-  ~ included in all copies or substantial portions of the Software.
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  ~ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  ~ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  ~ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  ~ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  ~ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  ~ OTHER DEALINGS IN THE SOFTWARE.
-  -->
-
-<!-- To get a list of the major build targets, run "ant -p" -->
-<project name="Sting" default="dist" basedir="."
-         xmlns:artifact="antlib:org.apache.maven.artifact.ant"
-         xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>Compile and distribute the Sting toolkit</description>
-
-    <!-- ******************************************************************************** -->
-    <!-- Properties                                                                       -->
-    <!-- ******************************************************************************** -->
-
-    <!-- The system classpath should take precedence over classpaths specified in this file -->
-    <property name="build.sysclasspath" value="first" />
-
-    <!-- Use this prefix to access environment variables -->
-    <property environment="env"/>
-
-    <!-- Build defaults: -->
-    <property name="default.build.target" value="all" />       <!-- can be "all", "public" (public only), or "protected" (public + protected) -->
-    <property name="compile.scala.by.default" value="true" />  <!-- compile Scala by default? "true" or "false" -->
-    <property name="use.contracts.by.default" value="false" /> <!-- should contracts be built by default? "true" or "false -->
-
-    <!-- Top-level directories -->
-    <property name="build.dir" value="build" />
-    <property name="dist.dir" value="dist" />
-    <property name="lib.dir" value="lib" />
-    <property name="public.dir" value="public" />
-    <property name="private.dir" value="private" />
-    <property name="protected.dir" value="protected" />
-    <property name="external.dir" value="external" />
-
-    <!-- Source directories -->
-    <property name="java.public.source.dir" value="${public.dir}/java/src" />
-    <property name="java.private.source.dir" value="${private.dir}/java/src" />
-    <property name="java.protected.source.dir" value="${protected.dir}/java/src" />
-    <property name="scala.public.source.dir" value="${public.dir}/scala/src" />
-    <property name="scala.private.source.dir" value="${private.dir}/scala/src" />
-    <property name="scala.protected.source.dir" value="${protected.dir}/scala/src" />
-    <property name="queue-extensions.source.dir" value="${build.dir}/queue-extensions/src" />
-    <property name="R.public.scripts.dir" value="${public.dir}/R/scripts" />
-    <property name="R.private.scripts.dir" value="${private.dir}/R/scripts" />
-    <property name="R.protected.scripts.dir" value="${protected.dir}/R/scripts" />
-    <property name="R.public.src.dir" value="${public.dir}/R/src" />
-
-    <!-- Build directories -->
-    <property name="java.classes" value="${build.dir}/java/classes" />
-    <property name="scala.classes" value="${build.dir}/scala/classes" />
-    <property name="R.library.dir" value="${public.dir}/R" />  <!-- TODO: Installing libraries back into the source directory: intentionally avoids ant clean?? -->
-    <property name="R.tar.dir" value="${build.dir}/R/src" />
-    <property name="R.package.path" value="org/broadinstitute/sting/utils/R" />
-    <property name="R.script.staging.dir" value="${build.dir}/R/stage" />
-
-    <!-- Packaging system properties -->
-    <property name="package.xml.dir" value="${public.dir}/packages" />
-    <property name="package.output.dir" value="${dist.dir}/packages" />
-    <property name="staging.dir" value="staging" />
-    <property name="default.executable" value="none" />
-
-    <!-- GATKDocs/Javadoc/Scaladoc directories -->
-    <property name="gatkdocs.dir" value="gatkdocs" />
-    <property name="javadoc.dir" value="javadoc" />
-    <property name="scaladoc.dir" value="scaladoc" />
-
-    <!-- Resource file used for help text and version information -->
-    <property name="resource.file" value="StingText.properties" />
-    <property name="resource.path" value="${java.classes}/StingText.properties" />
-
-    <!-- Directory containing cryptographic keys used by the GATK -->
-    <property name="key.dir" value="${public.dir}/keys" />
-
-    <!-- Contracts for Java -->
-    <!-- Disabled by default -->
-    <!-- To enable, run with -Duse.contracts=true -->
-    <property name="java.contracts.dir" value="${build.dir}/java/contracts" />
-    <property name="contracts.version" value="1.0-r139" />
-    <property name="cofoja.jar" value="${lib.dir}/cofoja-${contracts.version}.jar"/>
-    <property name="contract.dump.dir" value="dump" />
-
-    <!-- do we want to halt on failure of a unit test? default to yes (Bamboo uses 'no') -->
-    <property name="halt" value="yes" />
-
-    <!-- should our unit test output go to a file or the screen? false means it goes to the screen (default) true to file -->
-    <property name="usefile" value="false" />
-
-    <!-- To run tests with debugging, use -Dtest.debug=true -Dtest.debug.port=XXXX on the command line -->
-    <property name="test.debug.port" value="5005" />  <!-- override on the command line if desired -->
-    <property name="test.default.maxmemory" value="4g"/>
-
-    <!-- clover parameters -->
-    <property name="clover.jar" location="private/resources/clover/lib/clover.jar"/>
-    <property name="clover.instrument.level" value="method"/>
-    <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
-
-    <!-- ******************************************************************************** -->
-    <!-- Filesets and paths                                                               -->
-    <!-- ******************************************************************************** -->
-
-    <!-- All the complexity of selecting among public/private/protected should be up here, not down in the targets -->
-
-    <patternset id="java.source.directories.pattern">
-        <include name="${java.public.source.dir}" />
-        <include name="${java.private.source.dir}" if="include.private" />
-        <include name="${java.protected.source.dir}" if="include.protected" />
-    </patternset>
-
-    <patternset id="java.source.files.pattern">
-        <include name="${java.public.source.dir}/**/*.java" />
-        <include name="${java.private.source.dir}/**/*.java" if="include.private" />
-        <include name="${java.protected.source.dir}/**/*.java" if="include.protected" />
-    </patternset>
-
-    <patternset id="scala.source.directories.pattern">
-        <include name="${scala.public.source.dir}" />
-        <include name="${scala.private.source.dir}" if="include.private" />
-        <include name="${scala.protected.source.dir}" if="include.protected" />
-    </patternset>
-
-    <patternset id="scala.source.files.pattern">
-        <include name="${scala.public.source.dir}/**/*.scala" />
-        <include name="${scala.private.source.dir}/**/*.scala" if="include.private" />
-        <include name="${scala.protected.source.dir}/**/*.scala" if="include.protected" />
-    </patternset>
-
-    <patternset id="R.script.source.directories.pattern">
-        <include name="${R.public.scripts.dir}" />
-        <include name="${R.private.scripts.dir}" if="include.private" />
-        <include name="${R.protected.scripts.dir}" if="include.protected" />
-    </patternset>
-
-    <patternset id="R.script.source.files.pattern">
-        <include name="${R.public.scripts.dir}/**/*.R" />
-        <include name="${R.private.scripts.dir}/**/*.R" if="include.private" />
-        <include name="${R.protected.scripts.dir}/**.*.R" if="include.protected" />
-    </patternset>
-
-    <path id="java.source.path">
-        <dirset dir="${basedir}">
-            <patternset refid="java.source.directories.pattern" />
-        </dirset>
-    </path>
-
-    <path id="scala.source.path">
-        <dirset dir="${basedir}">
-            <patternset refid="scala.source.directories.pattern" />
-        </dirset>
-    </path>
-
-    <path id="R.script.source.path">
-        <dirset dir="${basedir}">
-            <patternset refid="R.script.source.directories.pattern" />
-        </dirset>
-    </path>
-
-    <fileset id="java.source.files" dir="${basedir}">
-        <patternset refid="java.source.files.pattern" />
-    </fileset>
-
-    <fileset id="scala.source.files" dir="${basedir}">
-        <patternset refid="scala.source.files.pattern" />
-    </fileset>
-
-    <fileset id="R.script.source.files" dir="${basedir}">
-        <patternset refid="R.script.source.files.pattern" />
-    </fileset>
-
-    <fileset id="java.class.files" dir="${java.classes}" erroronmissingdir="false">
-        <include name="**/*.class"/>
-    </fileset>
-
-    <patternset id="dependency.mask" includes="*.jar" />
-
-    <path id="external.dependencies">
-        <fileset dir="${lib.dir}" erroronmissingdir="false">
-            <patternset refid="dependency.mask" />
-        </fileset>
-    </path>
-
-    <path id="scala.dependencies">
-        <path refid="external.dependencies" />
-        <pathelement location="${java.classes}" />
-        <!-- Need the resources as we will be running a command line program which needs the help text. -->
-        <pathelement location="${resource.path}" />
-        <!-- Add any previously compiled scala classes to the path. -->
-        <pathelement location="${scala.classes}" />
-    </path>
-
-    <path id="build.results">
-        <!-- Ensure that GenomeAnalysisTK.jar comes first in the path, as it contains overrides for certain classes in our dependencies -->
-        <pathelement location="${dist.dir}/GenomeAnalysisTK.jar" />
-        <!-- After GenomeAnalysisTK.jar we include all of the other jars in the dist directory -->
-        <fileset dir="${dist.dir}" erroronmissingdir="false">
-            <patternset refid="dependency.mask" />
-            <exclude name="GenomeAnalysisTK.jar" />
-        </fileset>
-    </path>
-
-    <fileset id="external.source.files" dir="${external.dir}" erroronmissingdir="false">
-        <include name="**/*.java" />
-    </fileset>
-
-    <path id="external.build.dir">
-        <path path="${java.classes}" />
-    </path>
-
-    <path id="external.dist.dir">
-        <path path="${dist.dir}" />
-    </path>
-
-    <!-- GATK dependencies consist of 3rd party plugins plus compiled GATK classes -->
-    <path id="external.gatk.classpath">
-        <path path="${java.classes}"/>
-        <path refid="external.dependencies" />
-    </path>
-
-    <!-- the path for resources that need to go into the GATK jar;
-         any additional resources should go into this set. -->
-    <path id="gatk.resources">
-        <fileset dir="${java.public.source.dir}">
-            <include name="**/resources/*" />
-            <include name="**/templates/*" />
-        </fileset>
-        <fileset dir="${java.private.source.dir}" erroronmissingdir="false">
-            <include name="**/resources/*" if="include.private" />
-            <include name="**/templates/*" if="include.private" />
-        </fileset>
-        <fileset dir="${java.protected.source.dir}" erroronmissingdir="false">
-            <include name="**/resources/*" if="include.protected" />
-            <include name="**/templates/*" if="include.protected" />
-        </fileset>
-    </path>
-
-    <!-- ******************************************************************************** -->
-    <!-- Ivy Retrieve                                                                     -->
-    <!-- ******************************************************************************** -->
-
-    <target name="init.resolve" unless="init.resolve.done">
-        <!-- ivy properties -->
-        <property name="ivy.install.version" value="2.2.0"/>
-        <property name="ivy.home" value="${user.home}/.ant"/>
-        <property name="ivy.jar.dir" value="${ivy.home}/${lib.dir}"/>
-        <property name="ivy.jar.file" value="ivy-${ivy.install.version}.jar"/>
-        <property name="ivy.settings.dir" value="settings"/>
-        <property file="${ivy.settings.dir}/ivysettings.properties"/>
-        <property name="maven-ant-tasks.install.version" value="2.1.3"/>
-        <property name="maven-ant-tasks.jar.file" value="maven-ant-tasks-${maven-ant-tasks.install.version}.jar"/>
-
-        <mkdir dir="${lib.dir}"/>
-        <mkdir dir="${ivy.jar.dir}"/>
-
-        <!-- Comment out the following lines to build the GATK without a network connection, assuming you have all of the libraries cached already -->
-
-        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/${ivy.jar.file}"
-             dest="${ivy.jar.dir}/${ivy.jar.file}"
-             usetimestamp="true"/>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-                 uri="antlib:org.apache.ivy.ant"
-                 classpath="${ivy.jar.dir}/${ivy.jar.file}"/>
-
-        <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/${maven-ant-tasks.install.version}/${maven-ant-tasks.jar.file}"
-             dest="${ivy.jar.dir}/${maven-ant-tasks.jar.file}"
-             usetimestamp="true"/>
-        <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
-                 uri="antlib:antlib:org.apache.maven.artifact.ant"
-                 classpath="${ivy.jar.dir}/${maven-ant-tasks.jar.file}"/>
-
-        <!-- End network lines -->
-
-        <ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
-        <property name="init.resolve.done" value="true"/>
-    </target>
-
-    <target name="resolve" depends="init.resolve,init" description="Locate and download library dependencies">
-        <property name="ivy.conf" value="default"/>
-        <ivy:retrieve file="ivy.xml" conf="${ivy.conf}" />
-        <!-- Remove old versions of ivy jars AFTER the ivy:retrieve has been class loaded. -->
-        <delete file="${ivy.jar.dir}/ivy-2.0.0.jar"/>
-        <delete file="${ivy.jar.dir}/ivy-2.2.0-rc1.jar"/>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Initialization                                                                   -->
-    <!-- ******************************************************************************** -->
-
-    <!-- Targets for generating the build version -->
-    <target name="git.describe">
-      <exec executable="git" outputproperty="git.describe.output" resultproperty="git.describe.exit.value" failonerror="false">
-        <arg line="describe --long" />
-      </exec>
-      <condition property="git.describe.succeeded">
-        <equals arg1="${git.describe.exit.value}" arg2="0" />
-      </condition>
-    </target>
-
-    <target name="tagged.build.version" depends="git.describe" if="git.describe.succeeded">
-        <property name="build.version" value="${git.describe.output}" />
-    </target>
-
-    <target name="git.rev-parse" depends="git.describe" unless="git.describe.succeeded">
-      <exec executable="git" outputproperty="git.rev-parse.output" resultproperty="git.rev-parse.exit.value" failonerror="false">
-        <arg line="rev-parse --short HEAD" />
-      </exec>
-      <condition property="git.rev-parse.succeeded">
-        <equals arg1="${git.rev-parse.exit.value}" arg2="0" />
-      </condition>
-    </target>
-
-    <target name="untagged.build.version" depends="git.rev-parse" if="git.rev-parse.succeeded">
-        <property name="build.version" value="${git.rev-parse.output}" />
-    </target>
-
-    <target name="generate.build.version" depends="tagged.build.version, untagged.build.version">
-        <!-- Set build.version to exported if no other value has been set -->
-        <property name="build.version" value="exported" />
-    </target>
-
-
-    <!-- INIT OVERRIDES: call these targets BEFORE init to override build defaults -->
-    <target name="init.build.publiconly">
-        <property name="build.target" value="public" />
-    </target>
-
-    <target name="init.build.publicprotectedonly">
-        <property name="build.target" value="protected" />
-    </target>
-
-    <target name="init.build.all">
-        <property name="build.target" value="all" />
-    </target>
-
-    <target name="init.javaonly">
-        <property name="compile.scala" value="false" />
-    </target>
-
-    <target name="init.javaandscala">
-        <property name="compile.scala" value="true" />
-    </target>
-
-    <target name="init.usecontracts">
-        <property name="use.contracts" value="true" />
-    </target>
-
-
-    <!-- INIT -->
-    <target name="init" depends="generate.build.version">
-        <tstamp>
-            <format property="build.timestamp" pattern="yyyy/MM/dd HH:mm:ss"/>
-        </tstamp>
-
-        <!-- These properties should be overridden before init is called if the defaults are not desired -->
-        <property name="build.target" value="${default.build.target}" />
-        <property name="compile.scala" value="${compile.scala.by.default}" />
-        <property name="use.contracts" value="${use.contracts.by.default}" />
-        <property name="executable" value="${default.executable}" />
-
-        <!-- Determine what should be built -->
-        <condition property="include.scala">
-            <equals arg1="${compile.scala}" arg2="true" />
-        </condition>
-
-        <condition property="include.private">
-            <and>
-                <available file="${private.dir}" />
-                <equals arg1="${build.target}" arg2="all" />
-            </and>
-        </condition>
-
-        <condition property="include.protected">
-            <and>
-                <available file="${protected.dir}" />
-                <or>
-                    <equals arg1="${build.target}" arg2="all" />
-                    <equals arg1="${build.target}" arg2="protected" />
-                </or>
-            </and>
-        </condition>
-
-        <condition property="include.contracts">
-            <equals arg1="${use.contracts}" arg2="true" />
-        </condition>
-
-        <condition property="include.external">
-            <available file="${external.dir}"/>
-        </condition>
-
-        <!-- Construct display strings for the build properties print out -->
-
-        <condition property="include.scala.display.string" value="yes" else="no">
-            <isset property="include.scala" />
-        </condition>
-
-        <condition property="include.private.display.string" value="yes" else="no">
-            <isset property="include.private" />
-        </condition>
-
-        <condition property="include.protected.display.string" value="yes" else="no">
-            <isset property="include.protected" />
-        </condition>
-
-        <condition property="include.external.display.string" value="yes" else="no">
-            <isset property="include.external" />
-        </condition>
-
-        <condition property="include.contracts.display.string" value="yes" else="no">
-            <isset property="include.contracts" />
-        </condition>
-
-        <!-- Print out build properties -->
-        <echo message="BUILD PROPERTIES" />
-        <echo message="Include Scala?     : ${include.scala.display.string}" />
-        <echo message="Include Private?   : ${include.private.display.string}" />
-        <echo message="Include Protected? : ${include.protected.display.string}" />
-        <echo message="Include External?  : ${include.external.display.string}" />
-        <echo message="Include Contracts? : ${include.contracts.display.string}" />
-        <echo message="Source revision    : ${build.version}" />
-        <echo message="Build time         : ${build.timestamp}" />
-
-        <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${lib.dir}"/>
-        <mkdir dir="${java.classes}"/>
-        <mkdir dir="${java.contracts.dir}"/>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Java Compilation                                                                 -->
-    <!-- ******************************************************************************** -->
-
-    <target name="gatk.compile.internal.source" depends="init,resolve">
-        <javac fork="true" memoryMaximumSize="512m" destdir="${java.classes}" debug="true" debuglevel="lines,vars,source" classpathref="external.dependencies" tempdir="${java.io.tmpdir}">
-            <src refid="java.source.path" />
-            <compilerarg value="-proc:none" />
-        </javac>
-    </target>
-
-    <target name="gatk.compile.external.source" depends="gatk.compile.internal.source" if="include.external">
-        <subant target="compile" genericantfile="build.xml">
-            <property name="build.dir" refid="external.build.dir" />
-            <property name="dist.dir" refid="external.dist.dir" />
-            <property name="gatk.classpath" refid="external.gatk.classpath" />
-            <fileset dir="${external.dir}" includes="*/build.xml" erroronmissingdir="false" />
-        </subant>
-    </target>
-
-    <target name="gatk.compile.source" depends="gatk.compile.internal.source,gatk.compile.external.source" />
-
-    <target name="gatk.contracts" depends="gatk.compile.source" if="include.contracts">
-        <javac fork="true" memoryMaximumSize="512m" destdir="${java.contracts.dir}" debug="true" debuglevel="lines,vars,source" tempdir="${java.io.tmpdir}" >
-            <src refid="java.source.path" />
-            <classpath>
-                <path refid="external.dependencies" />
-                <pathelement path="${java.classes}" />
-            </classpath>
-            <compilerarg value="-Acom.google.java.contract.debug"/>
-            <compilerarg value="-Acom.google.java.contract.dump=${contract.dump.dir}"/>
-            <compilerarg value="-proc:only"/>
-        </javac>
-    </target>
-
-    <target name="gatk.compile" depends="init,resolve,gatk.compile.source,gatk.contracts" />
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Scala Compilation                                                                -->
-    <!-- ******************************************************************************** -->
-
-    <target name="init.queue-extensions.generate" depends="gatk.compile">
-        <condition property="uptodate.queue-extensions.generate">
-            <or>
-                <not>
-                    <isset property="include.scala"/>
-                </not>
-                <uptodate targetfile="${queue-extensions.source.dir}">
-                    <srcfiles refid="java.class.files"/>
-                    <srcfiles file="${queue-extensions.gatk.jar}"/>
-                </uptodate>
-            </or>
-        </condition>
-    </target>
-
-    <!-- NOTE: Extracting help first to avoid "Unable to load help text.  Help output will be sparse." warning message. -->
-    <target name="queue-extensions.generate" depends="gatk.compile,extracthelp,init.queue-extensions.generate" unless="uptodate.queue-extensions.generate">
-        <mkdir dir="${queue-extensions.source.dir}"/>
-        <echo>Generating Queue GATK extensions...</echo>
-        <java fork="true" failonerror="true" classname="org.broadinstitute.sting.queue.extensions.gatk.GATKExtensionsGenerator" >
-            <arg value="-outDir" />
-            <arg path="${queue-extensions.source.dir}" />
-            <arg value="-l" />
-            <arg value="WARN" />
-            <classpath>
-                <file file="${queue-extensions.gatk.jar}"/>
-                <path refid="scala.dependencies"/>
-            </classpath>
-        </java>
-        <touch>
-            <file file="${queue-extensions.source.dir}"/>
-        </touch>
-    </target>
-
-    <target name="init.scala.compile" depends="resolve">
-        <path id="scala.classpath">
-            <fileset dir="${lib.dir}">
-                <include name="scala-compiler-*.jar"/>
-                <include name="scala-library-*.jar"/>
-                <include name="scala-reflect-*.jar"/>
-            </fileset>
-        </path>
-        <taskdef resource="scala/tools/ant/antlib.xml">
-            <classpath refid="scala.classpath"/>
-        </taskdef>
-    </target>
-
-    <!-- Scala depends on the java compile -->
-    <target name="scala.compile" depends="init,resolve,gatk.compile,queue-extensions.generate,init.scala.compile" if="include.scala">
-        <mkdir dir="${scala.classes}"/>
-        <echo>Building Scala...</echo>
-        <scalac fork="true" jvmargs="-Xmx512m" destdir="${scala.classes}" classpathref="scala.dependencies" deprecation="yes" unchecked="yes" addparams="-feature">
-            <src refid="scala.source.path" />
-            <src path="${queue-extensions.source.dir}" />
-            <include name="**/*.scala" />
-        </scalac>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Sting Resource File Generation                                                   -->
-    <!-- ******************************************************************************** -->
-
-    <target name="init.extracthelp" depends="gatk.compile">
-        <loadfile property="properties.version" srcfile="${basedir}/${resource.path}" failonerror="false" quiet="true">
-            <filterchain>
-                <linecontains>
-                    <contains value="org.broadinstitute.sting.gatk.CommandLineGATK.version"/>
-                </linecontains>
-                <tokenfilter>
-                    <replaceregex pattern="^.*\.(.*?)$" replace="\1"/>
-                </tokenfilter>
-                <striplinebreaks/>
-            </filterchain>
-        </loadfile>
-
-        <!-- This fileset will contain only source files modified since the resource file was last generated,
-             or all source files if the resource file doesn't exist -->
-        <fileset dir="${basedir}" id="modified.source.files">
-            <patternset refid="java.source.files.pattern" />
-            <include name="${external.dir}/**/*.java"/>
-            <depend targetdir="${basedir}">
-                <mapper type="merge" to="${resource.path}"/>
-            </depend>
-        </fileset>
-
-        <!-- Set the sources.modified property only if our fileset of modified source files is non-empty -->
-        <pathconvert refid="modified.source.files" property="sources.modified" setonempty="false"/>
-
-        <!-- Due to a limitation in the doclet API, we always need to pass package-info files to javadoc -->
-        <fileset dir="${basedir}" id="package.info.files">
-            <include name="${java.public.source.dir}/**/package-info.java"/>
-            <include name="${java.private.source.dir}/**/package-info.java" if="include.private" />
-            <include name="${java.protected.source.dir}/**/package-info.java" if="include.protected" />
-            <include name="${external.dir}/**/package-info.java"/>
-        </fileset>
-
-        <condition property="uptodate.extracthelp">
-            <or>
-                <isset property="disable.help"/>
-                <and>
-                    <not>
-                        <isset property="sources.modified"/>
-                    </not>
-                    <equals arg1="${properties.version}" arg2="${build.version}"/>
-                </and>
-            </or>
-        </condition>
-    </target>
-
-    <target name="extracthelp" depends="init.extracthelp" unless="uptodate.extracthelp">
-        <path id="doclet.classpath">
-            <path refid="external.dependencies" />
-            <pathelement location="${java.classes}" />
-	    <pathelement location="${clover.jar}" />
-        </path>
-
-        <javadoc doclet="org.broadinstitute.sting.utils.help.ResourceBundleExtractorDoclet"
-                 docletpathref="doclet.classpath"
-                 classpathref="external.dependencies"
-                 classpath="${java.classes}"
-		 maxmemory="2g"
-                 additionalparam="-build-timestamp &quot;${build.timestamp}&quot; -absolute-version ${build.version} -out ${basedir}/${resource.path} -quiet">
-            <sourcefiles>
-                <union>
-                    <fileset refid="modified.source.files"/>
-                    <fileset refid="package.info.files"/>
-                </union>
-            </sourcefiles>
-        </javadoc>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Build Jars                                                                       -->
-    <!-- ******************************************************************************** -->
-
-    <target name="sting.compile" depends="gatk.compile, scala.compile" />
-
-    <target name="init.jar" depends="sting.compile,extracthelp">
-        <mkdir dir="${dist.dir}"/>
-        <copy todir="${dist.dir}">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-        </copy>
-    </target>
-
-    <target name="R.public.tar">
-        <mkdir dir="${R.tar.dir}/${R.package.path}" />
-        <tar compression="gzip" basedir="${R.public.src.dir}/${R.package.path}" includes="gsalib/**" destfile="${R.tar.dir}/${R.package.path}/gsalib.tar.gz" />
-    </target>
-
-    <target name="R.script.stage">
-        <mkdir dir="${R.script.staging.dir}" />
-        <copy todir="${R.script.staging.dir}" overwrite="true">
-            <fileset refid="R.script.source.files" />
-            <!-- remove the initial path components (eg., public/R/scripts) when doing the copy -->
-            <!-- ant 1.8.2 has a cutdirsmapper, but ant versions < 1.8.2 are too common to use it -->
-            <mapper type="regexp" from="^(${R.public.scripts.dir}|${R.private.scripts.dir}|${R.protected.scripts.dir})/(.*)" to="\2" />
-        </copy>
-    </target>
-
-    <target name="sting-utils.jar" depends="gatk.compile, init.jar, R.public.tar, R.script.stage">
-        <jar jarfile="${dist.dir}/StingUtils.jar">
-            <fileset dir="${java.classes}" includes="**/sting/utils/**/*.class"/>
-            <fileset dir="${java.classes}" includes="**/sting/commandline/**/*.class"/>
-            <fileset dir="${java.classes}" includes="**/sting/pipeline/**/*.class"/>
-            <fileset dir="${java.classes}" includes="**/sting/tools/**/*.class"/>
-            <fileset dir="${java.classes}" includes="**/sting/jna/**/*.class"/>
-            <fileset dir="${java.classes}" includes="net/sf/picard/**/*.class"/>
-            <fileset dir="${java.classes}" includes="net/sf/samtools/**/*.class"/>
-            <fileset dir="${R.tar.dir}">
-                <include name="**/${R.package.path}/**/*.tar.gz"/>
-            </fileset>
-            <fileset dir="${R.script.staging.dir}">
-                <include name="**/sting/utils/**/*.R"/>
-            </fileset>
-            <manifest>
-                <attribute name="Premain-Class" value="org.broadinstitute.sting.utils.instrumentation.Sizeof" />
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="na12878kb.jar" depends="gatk.compile,init.jar">
-        <jar jarfile="${dist.dir}/na12878kb.jar">
-            <fileset dir="${java.classes}">
-              <include name="org/broadinstitute/sting/utils/GenomeLocParser*.class"/>
-              <include name="org/broadinstitute/sting/utils/GenomeLoc.class"/>
-              <include name="org/broadinstitute/sting/utils/HasGenomeLocation.class"/>
-              <include name="org/broadinstitute/sting/utils/BaseUtils*.class"/>
-              <include name="org/broadinstitute/sting/utils/Utils.class"/>
-              <include name="org/broadinstitute/sting/utils/MRUCaching*.class"/>
-              <include name="org/broadinstitute/sting/utils/exceptions/**/*.class"/>
-              <include name="org/broadinstitute/sting/gatk/walkers/na12878kb/core/**/*.class"/>
-              <include name="net/sf/picard/reference/FastaSequenceFile.class"/>
-            </fileset>
-	    <fileset dir="${java.private.source.dir}">
-              <include name="org/broadinstitute/sting/gatk/walkers/na12878kb/core/resources/**/*"/>
-	    </fileset>
-        </jar>
-    </target>
-
-    <target name="gatk.jar" depends="gatk.compile, init.jar, R.script.stage">
-        <jar jarfile="${dist.dir}/GenomeAnalysisTK.jar">
-            <path refid="gatk.resources"/>
-            <fileset dir="${java.contracts.dir}" />
-            <fileset dir="${java.classes}">
-	          <include name="${resource.file}" />
-              <include name="**/sting/gatk/**/*.class" />
-              <include name="**/sting/alignment/**/*.class"/>
-            </fileset>
-            <fileset dir="${R.script.staging.dir}">
-                <include name="**/sting/gatk/**/*.R"/>
-                <include name="**/sting/alignment/**/*.R"/>
-            </fileset>
-            <fileset dir="${key.dir}">
-                <include name="**/*.key"/>
-            </fileset>
-            <manifest>
-                <attribute name="Main-Class" value="org.broadinstitute.sting.gatk.CommandLineGATK" />
-            </manifest>
-        </jar>
-
-        <jar jarfile="${dist.dir}/Aligner.jar">
-            <fileset dir="${java.classes}" includes="**/sting/alignment/**/*.class" />
-        </jar>
-
-        <subant target="dist" genericantfile="build.xml">
-            <property name="build.dir" refid="external.build.dir" />
-            <property name="dist.dir" refid="external.dist.dir" />
-            <property name="gatk.classpath" refid="external.gatk.classpath" />
-            <fileset dir="${external.dir}" includes="*/build.xml" erroronmissingdir="false" />
-        </subant>
-    </target>
-
-    <target name="scala.jar" depends="scala.compile, init.jar" if="include.scala">
-        <jar jarfile="${dist.dir}/GATKScala.jar">
-          <fileset dir="${scala.classes}">
-            <include name="org/broadinstitute/sting/scala/**/*.class"/>
-          </fileset>
-        </jar>
-    </target>
-
-    <target name="queue.jar" depends="scala.compile, init.jar, R.script.stage" if="include.scala">
-        <jar jarfile="${dist.dir}/Queue.jar">
-            <fileset dir="${scala.classes}">
-                <include name="org/broadinstitute/sting/queue/**/*.class"/>
-            </fileset>
-            <fileset dir="${java.classes}">
-              <include name="org/broadinstitute/sting/queue/**/*.class" />
-            </fileset>
-            <fileset dir="${R.script.staging.dir}">
-                <include name="org/broadinstitute/sting/queue/**/*.R"/>
-            </fileset>
-            <manifest>
-                <attribute name="Main-Class" value="org.broadinstitute.sting.queue.QCommandLine" />
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="sting.jar" depends="sting-utils.jar, gatk.jar, queue.jar" />
-
-    <target name="init.manifests" depends="sting.jar">
-        <pathconvert property="jar.classpath" pathsep=" ">
-            <flattenmapper/>
-            <fileset dir="${dist.dir}" includes="*.jar"/>
-            <filelist files="GATKScala.jar"/>
-        </pathconvert>
-    </target>
-
-    <target name="sting-utils.manifests" depends="sting-utils.jar, init.manifests">
-        <jar jarfile="${dist.dir}/StingUtils.jar" update="true">
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="gatk.manifests" depends="gatk.jar, init.manifests">
-        <jar jarfile="${dist.dir}/GenomeAnalysisTK.jar" update="true">
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="queue.manifests" depends="queue.jar, init.manifests" if="include.scala">
-        <jar jarfile="${dist.dir}/Queue.jar" update="true" >
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}" />
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="sting.manifests" depends="sting-utils.manifests, gatk.manifests, queue.manifests" />
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Top-Level Build Targets                                                          -->
-    <!-- ******************************************************************************** -->
-
-    <target name="dist" depends="sting.manifests" description="Build the GATK and Queue" />
-
-    <target name="gatk" depends="init.javaonly, sting.manifests" description="Build the GATK only" />
-
-    <target name="queue" depends="dist" />  <!-- Obsolete target. Now just an alias for dist -->
-
-    <target name="scala" depends="scala.jar" />
-
-
-    <!-- ******************************************************************************** -->
-    <!-- GATKDocs                                                                          -->
-    <!-- ******************************************************************************** -->
-
-    <target name="gatkdocs" depends="gatk.compile" description="Generate GATK HTML documentation">
-        <path id="doclet.classpath">
-            <path refid="external.dependencies" />
-            <pathelement location="${java.classes}" />
-        </path>
-
-        <!-- Run with -Dgatkdocs.include.hidden=true to include documentation for hidden features -->
-        <condition property="gatkdocs.include.hidden.arg" value="-include-hidden" else="">
-            <isset property="gatkdocs.include.hidden" />
-        </condition>
-
-        <javadoc doclet="org.broadinstitute.sting.utils.help.GATKDoclet"
-                 docletpathref="doclet.classpath"
-                 classpathref="external.dependencies"
-                 classpath="${java.classes}"
-		 maxmemory="2g"
-                 additionalparam="${gatkdocs.include.hidden.arg} -private -build-timestamp &quot;${build.timestamp}&quot; -absolute-version ${build.version} -quiet"> <!-- -test to only do DocumentationTest walker -->
-            <sourcefiles>
-                <fileset refid="java.source.files"/>
-            </sourcefiles>
-        </javadoc>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Javadoc                                                                          -->
-    <!-- ******************************************************************************** -->
-
-    <target name="init.javadoc">
-        <mkdir dir="${javadoc.dir}" />
-    </target>
-
-    <target name="javadoc" depends="init.javadoc,resolve" description="Generate Javadoc">
-        <javadoc destdir="${javadoc.dir}" classpathref="external.dependencies">
-            <fileset refid="java.source.files" />
-            <sourcepath path="${external.dir}" />
-        </javadoc>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Scaladoc                                                                         -->
-    <!-- ******************************************************************************** -->
-
-    <target name="init.scaladoc">
-        <mkdir dir="${scaladoc.dir}" />
-    </target>
-
-    <!-- NOTE: the scaladoc target requires that the environment variable ANT_OPTS has been set to "-Xmx1G" -->
-
-    <target name="scaladoc" depends="resolve,queue-extensions.generate,init.scala.compile,scala.compile,init.scaladoc" description="Generate Scaladoc">
-        <scaladoc srcdir="${basedir}" destdir="${scaladoc.dir}" classpathref="scala.dependencies" deprecation="yes" unchecked="yes">
-            <patternset refid="scala.source.files.pattern" />
-            <include name="${queue-extensions.source.dir}/**/*.scala" />
-        </scaladoc>
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- Release-related tasks                                                            -->
-    <!-- ******************************************************************************** -->
-
-    <target name="init.executable.gatkfull" depends="init.build.publicprotectedonly, init.javaonly">
-        <property name="executable" value="GenomeAnalysisTK" />
-    </target>
-
-    <target name="init.executable.gatkall" depends="init.build.all, init.javaonly">
-        <property name="executable" value="GenomeAnalysisTK" />
-    </target>
-
-    <target name="init.executable.queuefull" depends="init.build.publicprotectedonly, init.javaandscala">
-        <property name="executable" value="Queue" />
-    </target>
-
-    <target name="init.executable.queueall" depends="init.build.all, init.javaandscala">
-        <property name="executable" value="Queue" />
-    </target>
-
-    <target name="require.executable">
-        <condition property="no.executable.defined">
-            <or>
-                <equals arg1="${executable}" arg2="none" />
-                <equals arg1="${executable}" arg2="$${executable}" />
-            </or>
-        </condition>
-        <fail message="No executable defined. Call a more specific packaging/release target, or define an executable manually" if="no.executable.defined" />
-    </target>
-
-    <target name="require.bcel">
-        <fileset id="bcel.jar" dir="${user.home}/.ant/lib">
-            <include name="bcel-*.jar" />
-        </fileset>
-        <pathconvert refid="bcel.jar" property="bcel.jar.installed" setonempty="false" />
-
-        <fileset id="ant.bcel.jar" dir="${user.home}/.ant/lib">
-            <include name="ant-apache-bcel-*.jar" />
-        </fileset>
-        <pathconvert refid="ant.bcel.jar" property="ant.bcel.jar.installed" setonempty="false" />
-
-        <condition property="bcel.installed">
-            <and>
-                <isset property="bcel.jar.installed" />
-                <isset property="ant.bcel.jar.installed" />
-            </and>
-        </condition>
-        <fail unless="bcel.installed"
-              message="Required bcel libraries for GATK packaging not installed in ${user.home}/.ant/lib/${line.separator}The bcel jar can be found in the lib directory of a GATK clone after compiling, and the ant-apache-bcel jar can be downloaded from here: http://repo1.maven.org/maven2/ant/ant-apache-bcel/1.6.5/ant-apache-bcel-1.6.5.jar${line.separator}Please copy these two jar files to ${user.home}/.ant/lib/" />
-    </target>
-
-    <!-- Unzip all classes from their current locations and assemble them in a staging directory -->
-    <target name="stage">
-        <mkdir dir="${staging.dir}"/>
-        <!--
-            HACK: Create the edu directory before EDU on case-insensitive mac filesystems.
-            The ivy dependency colt -> concurrent contains an EDU.oswego package which
-            BCEL doesn't even pull in but messes up edu.mit.broad.
-          -->
-        <mkdir dir="${staging.dir}/edu"/>
-        <unjar dest="${staging.dir}" overwrite="false">
-          <fileset dir="${dist.dir}">
-            <patternset refid="dependency.mask" />
-          </fileset>
-        </unjar>
-
-        <!-- HACK: The GATK jar itself contains overrides for some core classes.  Make sure the GATK.jar is unrolled last. -->
-        <unjar dest="${staging.dir}" overwrite="true">
-          <fileset dir="${dist.dir}" includes="**/GenomeAnalysisTK.jar"/>
-        </unjar>
-    </target>
-
-
-    <!-- Build a package consisting of all supporting files. Don't call this target directly. Call one of the specific packaging targets below -->
-    <target name="package" depends="require.clean,require.bcel,dist,stage,require.executable">
-      <mkdir dir="${package.output.dir}" />
-      <xslt destdir="${package.output.dir}" style="${package.xml.dir}/CreatePackager.xsl" useImplicitFileset="false">
-          <flattenmapper/>
-          <fileset dir="${package.xml.dir}">
-              <include name="${executable}.xml" />
-          </fileset>
-          <fileset dir="${external.dir}" erroronmissingdir="false">
-              <include name="*/${executable}.xml" />
-          </fileset>
-      </xslt>
-      <ant antfile="${package.output.dir}/${executable}.xml" target="package" />
-    </target>
-
-    <!-- Package specific versions of the GATK/Queue. ALWAYS do an ant clean before invoking these! -->
-
-    <!-- GATK "full" == public + protected, ie., the standard binary release of the GATK  -->
-    <target name="package.gatk.full" depends="init.executable.gatkfull,package" description="Create a standalone GATK jar with public and protected code" />
-
-    <!-- GATK "all" == public + protected + private. Should never be publicly released -->
-    <target name="package.gatk.all" depends="init.executable.gatkall,package" description="Create a standalone GATK jar with public, protected, and private code" />
-
-    <target name="package.queue.full" depends="init.executable.queuefull,package" description="Create a standalone Queue jar with public and protected code" />
-
-    <target name="package.queue.all" depends="init.executable.queueall,package" description="Create a standalone Queue jar with public, protected, and private code" />
-
-    <!-- Release a build. Don't call this target directly. Call one of the specific release targets below -->
-    <target name="release" depends="require.executable">
-        <ant antfile="${package.output.dir}/${executable}.xml" target="release" />
-    </target>
-
-    <!-- Release specific versions of the GATK/Queue. ALWAYS do an ant clean before invoking these! -->
-    <target name="release.gatk.full" depends="package.gatk.full,release" />
-
-    <target name="release.queue.full" depends="package.queue.full,release" />
-
-    <!-- Build a subset of picard with only those classes we need by completely abusing the packaging system -->
-    <!-- TODO: Reuse as much as possible of the 'stage' and 'package' targets -->
-    <target name="build-picard-private" depends="resolve">
-      <!-- Build out a classpath -->
-      <pathconvert property="required.picard.jars" pathsep=":">
-        <fileset dir="${basedir}">
-	     <include name="${staging.dir}" />
-	     <include name="${lib.dir}/picard-*.*.*.jar" />
-	     <include name="${lib.dir}/sam-*.jar" />
-	   </fileset>
-      </pathconvert>
-      <echo message="required.picard.jars=${required.picard.jars}" />
-
-      <!-- Stage picard-private -->
-      <delete dir="${staging.dir}" />
-      <mkdir dir="${staging.dir}" />
-      <unjar src="${picard.dist.dir}/picard-private.jar" dest="${staging.dir}" overwrite="true" />
-
-      <!-- Use the packaging system to extract parts of picard-private we need -->
-      <mkdir dir="${package.output.dir}" />
-      <xslt in="${package.xml.dir}/PicardPrivate.xml" out="${package.output.dir}/BuildPicardPrivate.xml" style="${package.xml.dir}/CreatePackager.xsl" />
-      <ant antfile="${package.output.dir}/BuildPicardPrivate.xml">
-	    <property name="additional.jars" value="${required.picard.jars}" />
-      </ant>
-    </target>
-
-    <!-- Maven install a package consisting of all supporting files. Don't call this target directly. Call one of the specific packaging targets below -->
-    <target name="mvninstall" depends="package">
-        <property name="mvn.build.version" value="0.0.2" />
-        <!--
-        We should use the build version or better yet a git tag version, but tags are currently missing. Alternatively how do we then depend on the LATEST?
-        <property name="mvn.build.version" value="${build.version}" />
-        -->
-        <artifact:pom id="${executable}.pom" groupId="org.broadinstitute.sting" artifactId="${executable}" version="${mvn.build.version}" name="${executable}" />
-        <artifact:writepom pomRefId="${executable}.pom" file="${package.output.dir}/${executable}-${build.version}/${executable}.pom.xml"/>
-        <artifact:install file="${package.output.dir}/${executable}-${build.version}/${executable}.jar">
-            <artifact:pom file="${package.output.dir}/${executable}-${build.version}/${executable}.pom.xml" />
-        </artifact:install>
-    </target>
-
-    <!-- Maven install specific versions of the GATK/Queue. ALWAYS do an ant clean before invoking these! -->
-    <target name="mvninstall.gatk.full" depends="package.gatk.full,mvninstall" />
-
-    <target name="mvninstall.queue.all" depends="package.queue.all,mvninstall" />
-
-    <target name="mvninstall.queue.full" depends="package.queue.full,mvninstall" />
-
-    <!-- ******************************************************************************** -->
-    <!-- Clean                                                                            -->
-    <!-- ******************************************************************************** -->
-
-    <target name="clean.gatkdocs">
-        <delete dir="${gatkdocs.dir}"/>
-    </target>
-
-    <target name="clean.javadoc">
-        <delete dir="${javadoc.dir}" />
-    </target>
-
-    <target name="clean.scaladoc">
-        <delete dir="${scaladoc.dir}" />
-    </target>
-
-    <target name="-check.clover">
-      <available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
-    </target>
-
-    <target name="clean.clover" depends="-check.clover" if="clover.installed">
-      <clover-clean/>
-    </target>
-
-    <target name="clean.gsalib">
-        <!-- Currently not cleaning out the lib during 'ant clean' -->
-      <exec executable="R" failonerror="false">
-        <arg line="R CMD REMOVE gsalib" />
-      </exec>
-    </target>
-
-    <target name="clean" description="Clean up old build-related directories" depends="clean.javadoc,clean.scaladoc,clean.gatkdocs,clean.clover">
-        <delete dir="${build.dir}"/>
-        <delete dir="${lib.dir}"/>
-        <delete dir="${contract.dump.dir}"/>
-        <delete dir="${staging.dir}"/>
-        <delete dir="${dist.dir}"/>
-        <delete dir="${pipelinetest.dir}"/>
-        <delete dir="${integration.tests.dir}"/>
-    </target>
-
-    <!-- Depend on this target if your target requires a clean working directory but you don't want to depend on clean directly -->
-    <target name="require.clean">
-        <condition property="not.clean">
-            <or>
-                <available file="${build.dir}" />
-                <available file="${lib.dir}" />
-                <available file="${contract.dump.dir}" />
-                <available file="${staging.dir}" />
-                <available file="${dist.dir}" />
-                <available file="${pipelinetest.dir}" />
-                <available file="${integration.tests.dir}" />
-                <available file="${javadoc.dir}" />
-                <available file="${scaladoc.dir}" />
-                <available file="${gatkdocs.dir}" />
-            </or>
-        </condition>
-        <fail message="Selected build target requires a clean working directory. Run ant clean and then try again." if="not.clean" />
-    </target>
-
-
-    <!-- ******************************************************************************** -->
-    <!-- gsalib                                                                           -->
-    <!-- ******************************************************************************** -->
-
-    <!-- Build gsalib R module -->
-    <target name="gsalib" description="Build the gsalib R module">
-      <exec executable="R" failonerror="true">
-        <arg line="R CMD INSTALL --preclean ${R.public.src.dir}/${R.package.path}/gsalib" />
-      </exec>
-    </target>
-
-
-    <!-- ***************************************************************************** -->
-    <!-- ***********               Tests and associated tasks                ********* -->
-    <!-- ***************************************************************************** -->
-
-    <!-- Properties and Paths -->
-
-    <property name="java.test.classes" value="${build.dir}/java/testclasses"/>
-    <property name="java.public.test.sources" value="${public.dir}/java/test"/>
-    <property name="java.private.test.sources" value="${private.dir}/java/test"/>
-    <property name="java.protected.test.sources" value="${protected.dir}/java/test"/>
-    <property name="scala.test.classes" value="${build.dir}/scala/testclasses"/>
-    <property name="scala.public.test.sources" value="${public.dir}/scala/test"/>
-    <property name="scala.private.test.sources" value="${private.dir}/scala/test"/>
-    <property name="scala.protected.test.sources" value="${protected.dir}/scala/test"/>
-    <property name="integration.tests.dir" value="integrationtests" />
-    <property name="pipelinetest.dir" value="pipelinetests" />
-    <property name="report" value="${build.dir}/report"/>
-    <property name="iwww.report.dir" value="${user.home}/private_html/report"/>
-    <property name="test.output" value="${dist.dir}/test"/>
-    <property name="testng.jar" value="${lib.dir}/testng-6.8.jar"/>
-
-    <path id="java.test.source.path">
-        <dirset dir="${basedir}">
-            <include name="${java.public.test.sources}" />
-            <include name="${java.private.test.sources}" if="include.private" />
-            <include name="${java.protected.test.sources}" if="include.protected" />
-        </dirset>
-    </path>
-
-    <path id="scala.test.source.path">
-        <dirset dir="${basedir}">
-            <include name="${scala.public.test.sources}" />
-            <include name="${scala.private.test.sources}" if="include.private" />
-            <include name="${scala.protected.test.sources}" if="include.protected" />
-        </dirset>
-    </path>
-
-    <path id="testng.dependencies">
-        <fileset dir="${lib.dir}">
-            <include name="jcommander*.jar"/>
-            <include name="guice*.jar"/>
-            <include name="junit*.jar"/>
-            <include name="bsh*.jar"/>
-            <include name="snakeyaml*.jar"/>
-            <include name="reportng*.jar"/>
-        </fileset>
-    </path>
-
-    <path id="testng.default.classpath">
-        <path refid="build.results" />
-        <pathelement path="${clover.jar}"/>
-        <pathelement location="${java.contracts.dir}" />
-        <pathelement location="${java.test.classes}" />
-        <pathelement location="${scala.test.classes}" />
-    </path>
-
-    <!-- Test targets -->
-
-    <target name="clover.report">
-      <clover-report coverageCacheSize="nocache">
-      <current outfile="clover_html" title="GATK clover report" showUniqueCoverage="false" numThreads="4">
-	  <format type="html" filter="catch,static,property"/>
-	  <fileset dir="public">
-	    <patternset id="clover.excludes">
-	      <exclude name="**/*UnitTest.java"/>
-	      <exclude name="**/*TestProvider*.java"/>
-	      <exclude name="**/*PerformanceTest.java"/>
-	      <exclude name="**/*Benchmark.java"/>
-	      <exclude name="**/*LargeScaleTest.java"/>
-	      <exclude name="**/*IntegrationTest.java"/>
-	      <exclude name="**/jna/**/*.java"/>
-	      <exclude name="**/queue/extensions/**/*.java"/>
-	      <exclude name="**/sting/utils/help/*.java"/>
-	      <exclude name="**/sting/tools/*.java"/>
-	      <exclude name="**/datasources/reads/utilities/*.java"/>
-	      <exclude name="**/sting/alignment/**/*.java"/>
-	      <exclude name="**/examples/**/*.java"/>
-	    </patternset>
-	  </fileset>
-	  <fileset dir="private">
-	    <patternset refid="clover.excludes" />
-	  </fileset>
-	  <fileset dir="protected">
-	    <patternset refid="clover.excludes" />
-	  </fileset>
-	</current>
-      </clover-report>
-    </target>
-
-    <target name="with.clover">
-      <clover-setup fullyQualifyJavaLang="true" instrumentationLevel="${clover.instrument.level}">
-      </clover-setup>
-      <property name="compile.scala" value="false" /> <!-- currently doesn't work with scala -->
-      <property name="test.maxmemory" value="32g"/>  <!-- clover requires lots of memory -->
-      <echo message="Clover instrument level: ${clover.instrument.level}" />
-    </target>
-
-    <target name="test.init.compile">
-        <mkdir dir="${java.test.classes}"/>
-        <mkdir dir="${scala.test.classes}"/>
-    </target>
-
-   <target name="test.java.internal.compile" depends="dist,test.init.compile">
-        <echo message="Sting: Compiling java test cases!"/>
-        <javac fork="true" memoryMaximumSize="512m" destdir="${java.test.classes}" debug="true" optimize="on" tempdir="${java.io.tmpdir}">
-            <src refid="java.test.source.path" />
-            <classpath>
-                <path refid="build.results" />
-                <pathelement location="${java.contracts.dir}"/>
-            </classpath>
-            <compilerarg value="-proc:none"/>
-        </javac>
-    </target>
-
-    <target name="test.java.external.compile" depends="dist,test.init.compile,test.java.internal.compile" if="include.external">
-        <echo message="Sting: Compiling external java test cases!"/>
-        <javac fork="true" memoryMaximumSize="512m" destdir="${java.test.classes}" debug="true" optimize="on" tempdir="${java.io.tmpdir}" srcdir="${external.dir}">
-            <include name="*/test/**/*.java"/>
-            <classpath>
-                <path refid="build.results" />
-                <pathelement location="${java.test.classes}"/>
-                <pathelement location="${java.contracts.dir}"/>
-            </classpath>
-            <compilerarg value="-proc:none"/>
-        </javac>
-    </target>
-
-    <target name="test.java.compile" depends="test.java.internal.compile, test.java.external.compile"/>
-
-    <target name="test.scala.compile" depends="test.java.compile,scala.compile" if="include.scala">
-        <echo message="Scala: Compiling test cases!"/>
-        <scalac fork="true" jvmargs="-Xmx512m" destdir="${scala.test.classes}" deprecation="yes" unchecked="yes" addparams="-feature">
-	        <src refid="scala.test.source.path" />
-            <classpath>
-                <path refid="build.results"/>
-                <pathelement location="${java.test.classes}"/>
-            </classpath>
-        </scalac>
-    </target>
-
-    <!-- NOTE: contracts disabled for all tests now, since contracts don't work with Java 7 -->
-    <target name="test.compile" depends="dist,test.java.compile,test.scala.compile" />
-
-
-    <!-- Run test macro -->
-    <macrodef name="run-test">
-        <attribute name="testtype"/>
-        <attribute name="outputdir"/>
-        <attribute name="runfailed"/>
-
-        <sequential>
-            <condition property="run.failed.tests">
-                <equals arg1="@{runfailed}" arg2="true"/>
-            </condition>
-
-            <!-- Get the pipeline run type.  Default to dry.  -->
-            <condition property="pipeline.run" value="dry" else="${pipeline.run}">
-                <equals arg1="${pipeline.run}" arg2="$${pipeline.run}" />
-            </condition>
-
-            <condition property="cofoja.jvm.args" value="-javaagent:${cofoja.jar} -Dcom.google.java.contract.log.contract=false" else="">
-                <isset property="include.contracts" />
-            </condition>
-
-            <condition property="debug.jvm.args" value="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${test.debug.port}" else="">
-                <isset property="test.debug" />
-            </condition>
-
-            <mkdir dir="@{outputdir}"/>
-
-            <echo message="" />
-            <echo message="Test Classpath ID: ${testng.classpath}" />
-            <property name="test.classpath.display.string" refid="${testng.classpath}" />
-            <echo message="Test Classpath: ${test.classpath.display.string}" />
-            <echo message="" />
-            <echo message="Sting: Running @{testtype} test cases!"/>
-            <echo message="Test Memory : ${test.maxmemory}" />
-
-	    <!-- no test is allowed to run for more than 10 hours -->
-            <taskdef resource="testngtasks" classpath="${testng.jar}"/>
-            <testng outputDir="@{outputdir}"
-                    classpathref="${testng.classpath}"
-                    haltOnFailure="false" failureProperty="test.failure"
-                    verbose="2"
-		            timeout="36000000"
-                    workingDir="${basedir}"
-                    useDefaultListeners="false"
-                    listeners="org.testng.reporters.FailedReporter,org.testng.reporters.JUnitXMLReporter,org.broadinstitute.sting.TestNGTestTransformer,org.broadinstitute.sting.StingTextReporter,org.uncommons.reportng.HTMLReporter">
-                <jvmarg value="-Xmx${test.maxmemory}" />
-                <jvmarg value="-ea" />
-                <jvmarg value="-Dclover.pertest.coverage=diff" />
-                <jvmarg value="-Djava.awt.headless=true" />
-                <jvmarg value="-Dpipeline.run=${pipeline.run}" />
-                <jvmarg value="-Djava.io.tmpdir=${java.io.tmpdir}" />
-                <jvmarg line="${cofoja.jvm.args}"/>
-                <jvmarg line="${debug.jvm.args}"/>
-
-                <!-- NOTE: To run tests with debugging, use -Dtest.debug=true -Dtest.debug.port=XXXX on the command line -->
-
-                <classfileset dir="${java.test.classes}" includes="**/@{testtype}.class"/>
-                <classfileset dir="${java.external.test.classes}" erroronmissingdir="false">
-                    <include name="**/@{testtype}.class" if="include.external"/>
-                </classfileset>
-                <classfileset dir="${scala.test.classes}" erroronmissingdir="false">
-                    <include name="**/@{testtype}*.class" if="include.scala"/>
-                </classfileset>
-
-                <xmlfileset dir="${basedir}">
-                    <include name="@{testtype}" if="run.failed.tests"/>
-                </xmlfileset>
-            </testng>
-
-            <!-- generate a report for Bamboo or Hudson to read in -->
-            <junitreport todir="@{outputdir}">
-                <fileset dir="@{outputdir}">
-                    <include name="*/*.xml"/>
-                </fileset>
-                <report format="noframes" todir="@{outputdir}"/>
-            </junitreport>
-
-	    <!-- copy the report to our private_html directory for easy viewing in a broswer -->
-            <mkdir dir="${iwww.report.dir}/@{testtype}"/>
-            <copy todir="${iwww.report.dir}/@{testtype}" verbose="false">
-              <fileset dir="@{outputdir}"/>
-            </copy>
-
-            <fail message="test failed" if="test.failure" />
-        </sequential>
-    </macrodef>
-
-
-    <target name="test.init">
-        <property name="testng.classpath" value="testng.default.classpath" />
-        <property name="test.maxmemory" value="${test.default.maxmemory}"/>
-    </target>
-
-    <target name="init.testgatkjar">
-        <path id="gatk.binary.release.tests.classpath">
-            <path refid="testng.dependencies" />
-            <path>
-                <fileset dir="${package.output.dir}">
-                    <include name="**/${executable}.jar" />
-                </fileset>
-            </path>
-            <pathelement location="${java.contracts.dir}" />
-            <pathelement location="${java.test.classes}" />
-            <pathelement location="${scala.test.classes}" />
-            <pathelement location="${scala.classes}" />
-            <path>
-                <fileset dir="${lib.dir}">
-                    <include name="scala*.jar"/>
-                    <include name="jna*.jar"/>
-                    <include name="cofoja*.jar"/>
-                </fileset>
-            </path>
-        </path>
-        <property name="testng.classpath" value="gatk.binary.release.tests.classpath" />
-    </target>
-
-    <target name="init.testqueuejar">
-        <path id="queue.binary.release.tests.classpath">
-            <path refid="testng.dependencies" />
-            <path>
-                <fileset dir="${package.output.dir}">
-                    <include name="**/${executable}.jar" />
-                </fileset>
-            </path>
-            <pathelement location="${java.contracts.dir}" />
-            <pathelement location="${java.test.classes}" />
-            <pathelement location="${scala.test.classes}" />
-            <path>
-                <fileset dir="${lib.dir}">
-                    <include name="cofoja*.jar"/>
-                </fileset>
-            </path>
-        </path>
-        <property name="testng.classpath" value="queue.binary.release.tests.classpath" />
-    </target>
-
-
-    <target name="committests" depends="unittest,integrationtest,pipelinetest" description="Run unit tests, integration tests, and do a dry-run of the pipeline tests" />
-
-    <!-- Order of the dependencies is significant in the *.release.tests targets -->
-    <target name="gatkfull.binary.release.tests" depends="package.gatk.full,init.testgatkjar,unittest,integrationtest" />
-
-    <target name="queuefull.binary.release.tests" depends="package.queue.full,init.testqueuejar,pipelinetest" />
-
-    <!-- Our four different test types: UnitTest, IntegrationTest, LargeScaleTest, PipelineTest -->
-    <target name="unittest" depends="test.compile,test.init" description="Run unit tests">
-        <condition property="ttype" value="*UnitTest" else="${single}">
-            <not><isset property="single"/></not>
-        </condition>
-        <run-test testtype="${ttype}" outputdir="${report}/${ttype}" runfailed="false"/>
-    </target>
-
-    <!-- Keep the alias "test" for "unittest" for backwards compatibility -->
-    <target name="test" depends="unittest" />
-
-    <target name="integrationtest" depends="test.compile,test.init" description="Run integration tests">
-        <condition property="itype" value="*IntegrationTest" else="${single}">
-            <not><isset property="single"/></not>
-        </condition>
-        <run-test testtype="${itype}" outputdir="${report}/${itype}" runfailed="false"/>
-    </target>
-
-    <target name="largescaletest" depends="test.compile,test.init" description="Run large-scale tests">
-       <condition property="ptype" value="*LargeScaleTest" else="${single}">
-            <not><isset property="single"/></not>
-        </condition>
-        <run-test testtype="${ptype}" outputdir="${report}/${ptype}" runfailed="false"/>
-    </target>
-
-    <target name="pipelinetest" depends="test.compile,test.init" description="Dry-run pipeline tests">
-        <condition property="pipetype" value="*PipelineTest" else="${single}">
-            <not><isset property="single"/></not>
-        </condition>
-        <run-test testtype="${pipetype}" outputdir="${report}/${pipetype}" runfailed="false"/>
-    </target>
-
-    <target name="pipelinetestrun" depends="test.compile,test.init" description="Run pipeline tests">
-        <property name="pipeline.run" value="run"/>
-        <condition property="pipetype" value="*PipelineTest" else="${single}">
-            <not><isset property="single"/></not>
-        </condition>
-        <run-test testtype="${pipetype}" outputdir="${report}/${pipetype}" runfailed="false"/>
-    </target>
-
-    <target name="knowledgebasetest" depends="test.compile,test.init" description="Run knowledge base tests">
-        <condition property="ktype" value="*KnowledgeBaseTest" else="${single}">
-            <not><isset property="single"/></not>
-        </condition>
-        <run-test testtype="${ktype}" outputdir="${report}/${ktype}" runfailed="false"/>
-    </target>
-
-    <target name="failed-unit" depends="test.compile,test.init">
-        <run-test testtype="${report}/*UnitTest/testng-failed.xml" outputdir="${report}/failed_rerun" runfailed="true"/>
-    </target>
-
-    <target name="failed-integration" depends="test.compile,test.init">
-        <run-test testtype="${report}/*IntegrationTest/testng-failed.xml" outputdir="${report}/failed_rerun" runfailed="true"/>
-    </target>
-
-    <target name="failed-largescale" depends="test.compile,test.init">
-        <run-test testtype="${report}/*LargeScaleTest/testng-failed.xml" outputdir="${report}/failed_rerun" runfailed="true"/>
-    </target>
-
-    <target name="failed-pipeline" depends="test.compile,test.init">
-        <run-test testtype="${report}/*PipelineTest/testng-failed.xml" outputdir="${report}/failed_rerun" runfailed="true"/>
-    </target>
-
-
-    <!-- Fast test target that cuts major corners for speed. Requires that a full build has been done first. Java-only, single test class only -->
-    <!-- Usage: ant fasttest -Dsingle=TestClass -->
-    <target name="fasttest" depends="init.javaonly,init" description="Quickly run a single test">
-	<property name="test.maxmemory" value="${test.default.maxmemory}"/>
-        <condition property="not.clean">
-            <and>
-                <available file="${build.dir}" />
-                <available file="${lib.dir}" />
-                <available file="${dist.dir}" />
-                <available file="${java.test.classes}" />
-            </and>
-        </condition>
-        <fail message="fasttest requires a NON-CLEAN working directory (INCLUDING test classes). Do a full test build using ant test.compile first." unless="not.clean" />
-
-        <condition property="no.single.test.specified">
-            <equals arg1="${single}" arg2="$${single}" />
-        </condition>
-        <fail message="Must specify a specific test. Usage: ant fasttest -Dsingle=TestClass" if="no.single.test.specified" />
-
-        <javac fork="true" memoryMaximumSize="512m" destdir="${java.classes}" debug="true" debuglevel="lines,vars,source" classpathref="external.dependencies" tempdir="${java.io.tmpdir}">
-            <src refid="java.source.path" />
-            <compilerarg value="-proc:none" />
-        </javac>
-
-        <javac fork="true" memoryMaximumSize="512m" destdir="${java.test.classes}" debug="true" optimize="on" tempdir="${java.io.tmpdir}">
-            <src refid="java.test.source.path" />
-            <classpath>
-                <pathelement location="${java.classes}"/>
-                <path refid="external.dependencies" />
-            </classpath>
-            <compilerarg value="-proc:none"/>
-        </javac>
-
-        <!-- fasttest uses the unpackaged class files in its test classpath to avoid having to rebuild the jars in dist/ -->
-        <path id="testng.fasttest.classpath">
-            <pathelement location="${java.classes}" />
-            <pathelement location="${scala.classes}" />
-            <pathelement location="${java.contracts.dir}" />
-            <pathelement location="${java.test.classes}" />
-            <pathelement location="${scala.test.classes}" />
-            <pathelement location="${R.tar.dir}" />
-            <path refid="R.script.source.path" />
-            <pathelement location="${key.dir}" />
-            <path refid="external.dependencies" />
-            <path refid="java.source.path" />  <!-- Terrible hack to allow fasttest to see resource files stored in the source tree -->
-        </path>
-        <property name="testng.classpath" value="testng.fasttest.classpath" />
-
-        <run-test testtype="${single}" outputdir="${report}/${single}" runfailed="false"/>
-    </target>
-
-    <!-- A target that runs a test without doing ANY compilation or any extra work at all -->
-    <!-- Intended to enable parallel tests that share the same working directory and build -->
-    <target name="runtestonly">
-        <condition property="not.clean">
-            <and>
-                <available file="${build.dir}" />
-                <available file="${lib.dir}" />
-                <available file="${dist.dir}" />
-                <available file="${java.test.classes}" />
-            </and>
-        </condition>
-        <fail message="runtestonly target requires a NON-CLEAN working directory (INCLUDING test classes). Do a full test build using ant test.compile first." unless="not.clean" />
-
-        <condition property="no.single.test.specified">
-            <equals arg1="${single}" arg2="$${single}" />
-        </condition>
-        <fail message="Must specify a specific test. Usage: ant runtestonly -Dsingle=TestClass" if="no.single.test.specified" />
-
-        <property name="testng.classpath" value="testng.default.classpath" />
-        <property name="test.maxmemory" value="${test.default.maxmemory}"/>
-        <property name="include.scala" value="true" />
-
-        <run-test testtype="${single}" outputdir="${report}/${single}" runfailed="false"/>
-    </target>
-
-</project>
diff --git a/ivy.xml b/ivy.xml
deleted file mode 100644
index 2e45247ab..000000000
--- a/ivy.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--
-  ~ Copyright (c) 2012, The Broad Institute
-  ~
-  ~ Permission is hereby granted, free of charge, to any person
-  ~ obtaining a copy of this software and associated documentation
-  ~ files (the "Software"), to deal in the Software without
-  ~ restriction, including without limitation the rights to use,
-  ~ copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the
-  ~ Software is furnished to do so, subject to the following
-  ~ conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be
-  ~ included in all copies or substantial portions of the Software.
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  ~ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  ~ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  ~ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  ~ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  ~ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  ~ OTHER DEALINGS IN THE SOFTWARE.
-  -->
-
-<ivy-module version="1.0">
-    <info organisation="org.broadinstitute" module="Sting"/>
-    <configurations>
-        <conf name="default" description="the core dependencies for the GATK"/>
-    </configurations>
-    <dependencies defaultconf="default">
-        <dependency org="net.sf" name="sam" rev="latest.integration"/>
-        <dependency org="net.sf" name="picard" rev="latest.integration"/>
-        <dependency org="edu.mit.broad" name="picard-private-parts" rev="latest.integration"/>
-
-        <!-- Tribble -->
-        <dependency org="org.broad" name="tribble" rev="latest.integration"/>
-
-        <!-- Variant -->
-        <dependency org="org.broadinstitute" name="variant" rev="latest.integration"/>
-
-        <dependency org="log4j" name="log4j" rev="1.2.15"/>
-        <dependency org="javax.mail" name="mail" rev="1.4.4"/>
-        <dependency org="colt" name="colt" rev="1.2.0"/>
-        <dependency org="it.unimi.dsi" name="fastutil" rev="6.5.3" />
-
-        <!-- <dependency org="jboss" name="javassist" rev="3.7.ga"/> -->
-        <dependency org="org.simpleframework" name="simple-xml" rev="2.0.4"/>
-        <dependency org="org.apache.bcel" name="bcel" rev="5.2"/>
-
-        <!-- Dependencies for reflections mvn repository -->
-        <dependency org="org.reflections" name="reflections" rev="0.9.8"/>
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1"/>
-
-        <!-- Matrix package from math.nist.gov -->
-        <dependency org="gov.nist" name="Jama" rev="1.0.2"/>
-
-        <!-- Dependencies for the graph aligner -->
-        <dependency org="net.sf.jgrapht" name="jgrapht" rev="0.8.3"/>
-
-        <!-- Dependencies for the html walker documention -->
-        <dependency org="org.freemarker" name="freemarker" rev="2.3.18"/>
-
-        <!-- Commons Dependencies -->
-        <dependency org="org.apache.commons" name="commons-email" rev="1.2"/>
-        <dependency org="org.apache.commons" name="commons-jexl" rev="2.1.1"/>
-        <dependency org="commons-lang" name="commons-lang" rev="2.5"/>
-        <dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
-        <dependency org="commons-io" name="commons-io" rev="2.1"/>
-        <dependency org="commons-collections" name="commons-collections" rev="3.2.1"/>
-        <dependency org="org.apache.commons" name="commons-math" rev="2.2"/>
-
-        <!-- Lucene core utilities -->
-        <!-- <dependency org="org.apache.lucene" name="lucene-core" rev="3.0.3"/> -->
-
-        <!-- Dependencies for LSF, DRMAA, and other C libraries -->
-        <dependency org="net.java.dev.jna" name="jna" rev="3.2.7"/>
-
-        <!-- Dependencies for amazon.com S3 support -->
-        <dependency org="net.java.dev.jets3t" name="jets3t" rev="0.8.1"/>
-
-        <!-- Dependencies for GridEngine -->
-        <dependency org="net.sf.gridscheduler" name="drmaa" rev="latest.integration"/>
-
-        <!-- Scala dependancies -->
-        <dependency org="org.scala-lang" name="scala-compiler" rev="2.10.2"/>
-        <dependency org="org.scala-lang" name="scala-library" rev="2.10.2"/>
-
-        <!-- testing and evaluation dependencies -->
-        <dependency org="org.testng" name="testng" rev="6.8"/>
-        <dependency org="org.uncommons" name="reportng" rev="1.1.2"/>
-        <dependency org="com.google.caliper" name="caliper" rev="0.5-rc1"/>
-		<dependency org="com.google.inject" name="guice" rev="3.0"/>
-
-        <!-- Contracts for Java and dependencies -->
-        <dependency org="com.google.code.cofoja" name="cofoja" rev="1.0-r139"/>
-        <dependency org="asm" name="asm-all" rev="3.3.1"/>
-
-        <!-- POI, for reading pipeline files -->
-        <dependency org="org.apache.poi" name="poi" rev="3.8-beta3"/>
-        <dependency org="org.apache.poi" name="poi-ooxml" rev="3.8-beta3"/>
-
-        <!-- snpEff annotator for pipelines -->
-        <dependency org="net.sf.snpeff" name="snpeff" rev="2.0.5"/>
-
-        <!-- MongoDB for the GXDB project -->
-        <dependency org="org.mongodb" name="mongo-java-driver" rev="2.7.3"/>
-
-        <!-- GSON and HTTP for talking to the REST API on Vanilla Forums -->
-        <dependency org="com.google.code.gson" name="gson" rev="2.2.2"/>
-        <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.1"/>
-
-        <!-- Exclude dependencies on sun libraries where the downloads aren't available but included in the jvm. -->
-        <exclude org="javax.servlet"/>
-        <exclude org="javax.jms"/>
-        <exclude org="com.sun.*"/>
-    </dependencies>
-</ivy-module>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..60b19f1b2
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,778 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!--
+    This pom is the aggregator for all sting/gatk poms
+    See also:
+      http://maven.apache.org/pom.html#Inheritance_v
+      http://maven.apache.org/guides/introduction/introduction-to-the-pom.html#Project_Inheritance_vs_Project_Aggregation
+      http://stackoverflow.com/questions/1992213/maven-parent-pom-vs-modules-pom
+    -->
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-root</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>public/sting-root</relativePath>
+    </parent>
+
+    <artifactId>sting-aggregator</artifactId>
+    <packaging>pom</packaging>
+    <name>Sting Aggregator</name>
+
+    <modules>
+        <module>public</module>
+        <!-- private & protected optionally enabled as profiles -->
+    </modules>
+
+    <properties>
+        <sting.basedir>${project.basedir}</sting.basedir>
+        <resource.bundle.path>StingText.properties</resource.bundle.path>
+        <resource.bundle.skip>false</resource.bundle.skip>
+        <!-- TODO: Need a better a way to say "don't include hidden" by default -->
+        <gatkdocs.include.hidden>-build-timestamp "${maven.build.timestamp}"</gatkdocs.include.hidden>
+        <sting.jar.phase>package</sting.jar.phase>
+        <sting.test-utils.jar.phase>none</sting.test-utils.jar.phase>
+        <sting.packagecommittests.skipped>true</sting.packagecommittests.skipped>
+        <sting.packageunittests.skipped>${sting.packagecommittests.skipped}</sting.packageunittests.skipped>
+        <sting.packageintegrationtests.skipped>${sting.packagecommittests.skipped}</sting.packageintegrationtests.skipped>
+        <sting.packagepipelinetests.skipped>${sting.packagecommittests.skipped}</sting.packagepipelinetests.skipped>
+        <sting.packagelargescaletests.skipped>true</sting.packagelargescaletests.skipped>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <!-- Plugin configuration -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <configuration>
+                        <filesets>
+                            <!--
+                            TODO: Once GATKDoclet stops hard coding paths, we remove this and leave
+                            TODO: it to the standard maven conventions to clean up for us
+                            -->
+                            <fileset>
+                                <directory>gatkdocs</directory>
+                            </fileset>
+                            <fileset>
+                                <directory>${basedir}</directory>
+                                <includes>
+                                    <include>javadoc.sh</include>
+                                    <include>options</include>
+                                    <include>packages</include>
+                                </includes>
+                            </fileset>
+                            <!--
+                            Shade dumps this temp file in basedir, with no good way to reconfigure.
+                            https://jira.codehaus.org/browse/MSHADE-145
+                            -->
+                            <fileset>
+                                <directory>${basedir}</directory>
+                                <includes>
+                                    <include>dependency-reduced-pom.xml</include>
+                                </includes>
+                            </fileset>
+                        </filesets>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>unpack-direct-dependencies</id>
+                            <goals>
+                                <goal>unpack-dependencies</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <excludeTransitive>true</excludeTransitive>
+                                <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                                <includeTypes>jar</includeTypes>
+                                <excludeScope>system</excludeScope>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <!-- TODO: Change the ResourceBundleExtractorDoclet to not require log4j.properties file -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>copy-resource-bundle-log4j</id>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <outputDirectory>${project.reporting.outputDirectory}/apidocs</outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>${sting.basedir}/sting-utils/src/main/config/org/broadinstitute/sting/utils/help</directory>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>extract-resource-bundle</id>
+                            <goals>
+                                <goal>javadoc</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <!-- Allow skipping for "fasttest" -->
+                                <skip>${resource.bundle.skip}</skip>
+                                <doclet>org.broadinstitute.sting.utils.help.ResourceBundleExtractorDoclet</doclet>
+                                <!-- Required as doclet uses reflection to access classes for documentation, instead of source java-->
+                                <docletPath>${project.build.outputDirectory}</docletPath>
+                                <docletArtifact>
+                                    <groupId>${project.groupId}</groupId>
+                                    <!-- TODO: THIS IS SUPPOSED TO BE STING-UTILS! -->
+                                    <artifactId>gatk-framework</artifactId>
+                                    <version>${project.version}</version>
+                                </docletArtifact>
+                                <maxmemory>2g</maxmemory>
+                                <useStandardDocletOptions>false</useStandardDocletOptions>
+                                <quiet>true</quiet>
+                                <additionalparam>-build-timestamp "${maven.build.timestamp}" -absolute-version ${build.version} -out ${project.build.outputDirectory}/${resource.bundle.path}</additionalparam>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <proc>none</proc>
+                        <annotationProcessors>
+                            <annotationProcessor>com.google.java.contract.core.apt.AnnotationProcessor</annotationProcessor>
+                        </annotationProcessors>
+                        <compilerArguments>
+                            <!--
+                            For com.sun.istack.internal. Because bootclasspath is set to include rt.jar, now jce.jar must be set for the Oracle only javax.crypto also.
+                            TODO: This Sun internal tool usage needs to be removed ASAP!
+                            -->
+                            <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
+                        </compilerArguments>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>default-compile</id>
+                            <phase>none</phase>
+                        </execution>
+                        <execution>
+                            <id>default-testCompile</id>
+                            <phase>none</phase>
+                        </execution>
+                        <!--
+                        Explicit package-info creation to match existing ant output.
+                        -->
+                        <execution>
+                            <id>compile-package-info</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <phase>compile</phase>
+                            <configuration>
+                                <compilerArgs>
+                                    <arg>-Xpkginfo:always</arg>
+                                </compilerArgs>
+                                <includes>
+                                    <include>**/package-info.java</include>
+                                </includes>
+                            </configuration>
+                        </execution>
+                        <!--
+                        TODO: Currently disabled in build.xml. Here as well.
+                        <execution>
+                            <id>compile-annotations</id>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <proc>only</proc>
+                            </configuration>
+                        </execution>
+                        -->
+                        <execution>
+                            <id>compile-java</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <phase>compile</phase>
+                            <configuration>
+                                <!--
+                                Package info is supposed to be in source:
+                                    http://maven.apache.org/plugins/maven-javadoc-plugin/examples/javadoc-resources.html
+                                But maven-compile-plugin doesn't auto exclude these:
+                                    https://jira.codehaus.org/browse/MCOMPILER-205?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=326505#comment-326505
+                                So, explicitly exclude them
+                                -->
+                                <excludes>
+                                    <exclude>**/package-info.java</exclude>
+                                </excludes>
+                            </configuration>
+                        </execution>
+                        <!--
+                        TODO: Currently disabled in build.xml. Here as well.
+                        <execution>
+                            <id>testCompile-annotations</id>
+                            <phase>test-compile</phase>
+                            <goals>
+                                <goal>testCompile</goal>
+                            </goals>
+                            <configuration>
+                                <proc>only</proc>
+                            </configuration>
+                        </execution>
+                        -->
+                        <execution>
+                            <id>testCompile-java</id>
+                            <goals>
+                                <goal>testCompile</goal>
+                            </goals>
+                            <phase>test-compile</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.scala-tools</groupId>
+                    <artifactId>maven-scala-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>compile</goal>
+                                <goal>testCompile</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>default-jar</id>
+                            <phase>${sting.jar.phase}</phase>
+                        </execution>
+                        <execution>
+                            <id>test-utils</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                            <phase>${sting.test-utils-jar.phase}</phase>
+                            <configuration>
+                                <classesDirectory>${project.build.testOutputDirectory}</classesDirectory>
+                                <classifier>test-utils</classifier>
+                                <!--
+                                TODO: Excluding actual tests from tests-utils jar is required because the same test classes
+                                TODO: cannot be in both the test artifact AND the test classes directory.
+
+                                TODO: Otherwise maven throws an [ERROR] java.lang.RuntimeException: Duplicate test set
+
+                                TODO: This is due to AbstractSurefireMojo.scanForTestClasses() adding both scanDirectories() and scanDependencies().
+                                TODO: Pain to debug as exception is three maven invoker levels deep, outer maven, maven-inovker-plugin, then forked tests!
+
+                                TODO: See also: http://maven.apache.org/plugins/maven-jar-plugin/usage.html#The_preferred_way
+
+                                TODO: Then that dependency won't have test classes that will also run from the
+                                TODO: test classes directory during the invoked package test.
+                                -->
+                                <excludes>
+                                    <exclude>**/*UnitTest.class</exclude>
+                                    <exclude>**/*UnitTest$*.class</exclude>
+                                    <exclude>**/*IntegrationTest.class</exclude>
+                                    <exclude>**/*IntegrationTest$*.class</exclude>
+                                    <exclude>**/*PipelineTest.class</exclude>
+                                    <exclude>**/*PipelineTest$*.class</exclude>
+                                    <exclude>**/*LargeScaleTest.class</exclude>
+                                    <exclude>**/*LargeScaleTest.class</exclude>
+                                </excludes>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>sting-executable</id>
+                            <goals>
+                                <goal>shade</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <minimizeJar>true</minimizeJar>
+                                <artifactSet>
+                                    <excludes>
+                                        <exclude>org.broadinstitute.sting:gsalib:tar.gz:*</exclude>
+                                        <exclude>org.broadinstitute.sting:*:tar.bz2:example-resources</exclude>
+                                    </excludes>
+                                </artifactSet>
+                                <transformers>
+                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                        <manifestEntries>
+                                            <Main-Class>${app.main.class}</Main-Class>
+                                        </manifestEntries>
+                                    </transformer>
+                                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                        <resource>${resource.bundle.path}</resource>
+                                    </transformer>
+                                </transformers>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>example-resources</id>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/example-resources.xml</descriptor>
+                                </descriptors>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>binary-dist</id>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/binary-dist.xml</descriptor>
+                                </descriptors>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- TODO: Remove temporary symbolic link creation, after fixing test paths to use local resources. -->
+                <plugin>
+                    <groupId>com.pyx4j</groupId>
+                    <artifactId>maven-junction-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>link-public-testdata</id>
+                            <goals>
+                                <goal>link</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/public/testdata</dst>
+                                        <src>${sting.basedir}/public/gatk-framework/src/test/resources</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>unlink-public-testdata</id>
+                            <goals>
+                                <goal>unlink</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/public/testdata</dst>
+                                        <src>${sting.basedir}/public/gatk-framework/src/test/resources</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>link-private-testdata</id>
+                            <goals>
+                                <goal>link</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/private/testdata</dst>
+                                        <src>${sting.basedir}/private/gatk-private/src/test/resources</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>unlink-private-testdata</id>
+                            <goals>
+                                <goal>unlink</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/private/testdata</dst>
+                                        <src>${sting.basedir}/private/gatk-private/src/test/resources</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>link-public-qscript</id>
+                            <goals>
+                                <goal>link</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/public/scala/qscript</dst>
+                                        <src>${sting.basedir}/public/queue-framework/src/main/qscripts</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>unlink-public-qscript</id>
+                            <goals>
+                                <goal>unlink</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/public/scala/qscript</dst>
+                                        <src>${sting.basedir}/public/queue-framework/src/main/qscripts</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>link-private-qscript</id>
+                            <goals>
+                                <goal>link</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/private/scala/qscript</dst>
+                                        <src>${sting.basedir}/private/queue-private/src/main/qscripts</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>unlink-private-qscript</id>
+                            <goals>
+                                <goal>unlink</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${basedir}/private/scala/qscript</dst>
+                                        <src>${sting.basedir}/private/queue-private/src/main/qscripts</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>link-git-release</id>
+                            <goals>
+                                <goal>link</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <links>
+                                    <link>
+                                        <dst>${project.build.directory}/${sting.binary-dist.name}-${build.version}.tar.bz2</dst>
+                                        <src>${project.build.directory}/${project.build.finalName}-binary-dist.tar.bz2</src>
+                                    </link>
+                                </links>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-invoker-plugin</artifactId>
+                    <configuration>
+                        <skipInvocation>true</skipInvocation>
+                        <debug>false</debug>
+                        <pom>${sting.basedir}/public/package-tests/pom.xml</pom>
+                        <noLog>true</noLog>
+                        <streamLogs>true</streamLogs>
+                        <localRepositoryPath>${sting.basedir}/${maven.repo.local}</localRepositoryPath>
+                        <properties>
+                            <test>${test}</test>
+                            <it.test>${it.test}</it.test>
+                            <skip>false</skip>
+                            <maven.test.skip>false</maven.test.skip>
+                            <sting.packagetests.artifactId>${sting.packagetests.artifactId}</sting.packagetests.artifactId>
+                            <sting.packagetests.testClasses>${project.build.testOutputDirectory}</sting.packagetests.testClasses>
+                            <sting.packagetests.basedir>${project.basedir}</sting.packagetests.basedir>
+                            <sting.pipelinetests.run>${sting.pipelinetests.run}</sting.pipelinetests.run>
+                            <maven.surefire.debug>${maven.surefire.debug}</maven.surefire.debug>
+                            <maven.failsafe.debug>${maven.failsafe.debug}</maven.failsafe.debug>
+                        </properties>
+                        <!--
+                        To allow using separated integration-test and verify, each execution must use a separate reportsDirectory.
+
+                        Otherwise, when an empty "pipeline test" later runs on an IntegrationTest class,
+                        it overwrites the results of the previous invocation always with a zero exit status.
+
+                        Mixing in the test name into the reportsDirectory also avoids collisions, when different maven jobs run tests in parallel.
+
+                        Similarly generating unique failsafe summary reports to avoid collisions.
+                        -->
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>package-unittests</id>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                            <configuration>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <reportsDirectory>${project.build.directory}/invoker-reports/unit/${test}</reportsDirectory>
+                                <skipInvocation>${sting.packageunittests.skipped}</skipInvocation>
+                                <properties>
+                                    <unittests.profile.enabled>true</unittests.profile.enabled>
+                                    <sting.packageunittests.skipped>${sting.packageunittests.skipped}</sting.packageunittests.skipped>
+                                </properties>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>package-integrationtests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                                <reportsDirectory>${project.build.directory}/invoker-reports/integration/${it.test}</reportsDirectory>
+                                <skipInvocation>${sting.packageintegrationtests.skipped}</skipInvocation>
+                                <properties>
+                                    <integrationtests.profile.enabled>true</integrationtests.profile.enabled>
+                                    <sting.packageintegrationtests.skipped>${sting.packageintegrationtests.skipped}</sting.packageintegrationtests.skipped>
+                                    <failsafe.summaryFile>${project.build.directory}/failsafe-reports/integration/failsafe-summary-${it.test}.xml</failsafe.summaryFile>
+                                </properties>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>package-pipelinetests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                                <reportsDirectory>${project.build.directory}/invoker-reports/pipeline/${it.test}</reportsDirectory>
+                                <skipInvocation>${sting.packagepipelinetests.skipped}</skipInvocation>
+                                <properties>
+                                    <integrationtests.profile.enabled>true</integrationtests.profile.enabled>
+                                    <sting.packagepipelinetests.skipped>${sting.packagepipelinetests.skipped}</sting.packagepipelinetests.skipped>
+                                    <failsafe.summaryFile>${project.build.directory}/failsafe-reports/pipeline/failsafe-summary-${it.test}.xml</failsafe.summaryFile>
+                                </properties>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>package-largescaletests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                                <reportsDirectory>${project.build.directory}/invoker-reports/largescale/${it.test}</reportsDirectory>
+                                <skipInvocation>${sting.packagelargescaletests.skipped}</skipInvocation>
+                                <properties>
+                                    <integrationtests.profile.enabled>true</integrationtests.profile.enabled>
+                                    <sting.packagelargescaletests.skipped>${sting.packagelargescaletests.skipped}</sting.packagelargescaletests.skipped>
+                                    <failsafe.summaryFile>${project.build.directory}/failsafe-reports/largescale/failsafe-summary-${it.test}.xml</failsafe.summaryFile>
+                                </properties>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.5</version>
+                    <executions>
+                        <execution>
+                            <id>install-package</id>
+                            <goals>
+                                <goal>install-file</goal>
+                            </goals>
+                            <phase>none</phase>
+                            <configuration>
+                                <generatePom>true</generatePom>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.version}</version>
+                                <packaging>${project.packaging}</packaging>
+                                <file>${project.build.directory}/${project.build.finalName}.${project.packaging}</file>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <!-- Invoke plugins that always run -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.pyx4j</groupId>
+                <artifactId>maven-junction-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>link-public-testdata</id>
+                        <phase>process-test-resources</phase>
+                    </execution>
+                    <execution>
+                        <id>unlink-public-testdata</id>
+                        <phase>clean</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.sortpom</groupId>
+                <artifactId>maven-sortpom-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package-tests</id>
+                        <goals>
+                            <goal>sort</goal>
+                        </goals>
+                        <phase>verify</phase>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <pomFile>public/package-tests/pom.xml</pomFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <reportSets>
+                    <!-- By not specifying an id, shut off all default javadocs from mvn site -->
+                    <reportSet>
+                        <reports />
+                    </reportSet>
+                    <reportSet>
+                        <id>generate-gatk-docs</id>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                        <!-- Only generate the GATK Docs across the parent aggregation, not the children too. -->
+                        <inherited>false</inherited>
+                        <configuration>
+                            <doclet>org.broadinstitute.sting.utils.help.GATKDoclet</doclet>
+                            <docletArtifact>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>gatk-package</artifactId>
+                                <version>${project.version}</version>
+                            </docletArtifact>
+                            <useStandardDocletOptions>false</useStandardDocletOptions>
+                            <quiet>true</quiet>
+                            <show>private</show>
+                            <!--
+                            TODO: Stop GATKDoclet from hardcoding paths and start using parameters.
+                            For now... just run from the base directory, target/site/../..
+                            -->
+                            <destDir>../..</destDir>
+                            <additionalparam>-build-timestamp "${maven.build.timestamp}" -absolute-version ${build.version} ${gatkdocs.include.hidden}</additionalparam>
+                            <!--
+                            TODO: Leaving this true applies a patch to the git commited file
+                            TODO: private/resources/clover/api/index.html
+                            TODO: Determine if this file was generated and shoudldn't be touched,
+                            TODO: or patch the file and commit a new version.
+                            -->
+                            <applyJavadocSecurityFix>false</applyJavadocSecurityFix>
+                        </configuration>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <profiles>
+        <!-- Optionally include protected -->
+        <profile>
+            <id>protected</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/protected/pom.xml</exists>
+                </file>
+            </activation>
+            <modules>
+                <module>protected</module>
+            </modules>
+        </profile>
+
+        <!-- Optionally include private -->
+        <profile>
+            <id>private</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/private/pom.xml</exists>
+                </file>
+            </activation>
+            <modules>
+                <module>private</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/protected/gatk-protected/pom.xml b/protected/gatk-protected/pom.xml
new file mode 100644
index 000000000..c0074b8bc
--- /dev/null
+++ b/protected/gatk-protected/pom.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>gatk-protected</artifactId>
+    <packaging>jar</packaging>
+    <name>GATK Protected</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <sting.packagetests.artifactId>gatk-package</sting.packagetests.artifactId>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.jgrapht</groupId>
+            <artifactId>jgrapht</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>gov.nist</groupId>
+            <artifactId>Jama</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sting-utils</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.caliper</groupId>
+            <artifactId>caliper</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resource-bundle-log4j</id>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>extract-resource-bundle</id>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package-unittests</id>
+                    </execution>
+                    <execution>
+                        <id>package-integrationtests</id>
+                    </execution>
+                    <execution>
+                        <id>package-largescaletests</id>
+                    </execution>
+                    <execution>
+                        <id>package-pipelinetests</id>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>private</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../private/gatk-private/pom.xml</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- TODO: All tests require access to private. For now. -->
+                    <plugin>
+                        <groupId>com.pyx4j</groupId>
+                        <artifactId>maven-junction-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>link-private-testdata</id>
+                                <phase>process-test-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>unlink-private-testdata</id>
+                                <phase>clean</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/arguments/StandardCallerArgumentCollection.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/arguments/StandardCallerArgumentCollection.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/arguments/StandardCallerArgumentCollection.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/arguments/StandardCallerArgumentCollection.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/BaseQualityRankSumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/BaseQualityRankSumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/BaseQualityRankSumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/BaseQualityRankSumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCounts.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCounts.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCounts.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCounts.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ClippingRankSumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ClippingRankSumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ClippingRankSumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ClippingRankSumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/Coverage.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/Coverage.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/Coverage.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/Coverage.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerAlleleBySample.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerAlleleBySample.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerAlleleBySample.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerAlleleBySample.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerSampleHC.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerSampleHC.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerSampleHC.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/DepthPerSampleHC.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/FisherStrand.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/FisherStrand.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/FisherStrand.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/FisherStrand.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/GCContent.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/GCContent.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/GCContent.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/GCContent.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/HaplotypeScore.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/HaplotypeScore.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/HaplotypeScore.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/HaplotypeScore.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/HardyWeinberg.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/HardyWeinberg.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/HardyWeinberg.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/HardyWeinberg.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/HomopolymerRun.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/HomopolymerRun.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/HomopolymerRun.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/HomopolymerRun.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/InbreedingCoeff.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/InbreedingCoeff.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/InbreedingCoeff.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/InbreedingCoeff.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/LikelihoodRankSumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/LikelihoodRankSumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/LikelihoodRankSumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/LikelihoodRankSumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MVLikelihoodRatio.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MVLikelihoodRatio.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MVLikelihoodRatio.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MVLikelihoodRatio.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityRankSumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityRankSumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityRankSumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityRankSumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZero.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZero.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZero.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZero.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/QualByDepth.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/QualByDepth.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/QualByDepth.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/QualByDepth.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/RMSMappingQuality.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/RMSMappingQuality.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/RMSMappingQuality.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/RMSMappingQuality.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/RankSumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/RankSumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/RankSumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/RankSumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ReadPosRankSumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ReadPosRankSumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ReadPosRankSumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ReadPosRankSumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SampleList.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SampleList.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SampleList.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SampleList.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SpanningDeletions.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SpanningDeletions.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SpanningDeletions.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SpanningDeletions.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/StrandBiasBySample.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/StrandBiasBySample.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/StrandBiasBySample.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/StrandBiasBySample.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/TandemRepeatAnnotator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/TandemRepeatAnnotator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/TandemRepeatAnnotator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/TandemRepeatAnnotator.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/TransmissionDisequilibriumTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/TransmissionDisequilibriumTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/TransmissionDisequilibriumTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/TransmissionDisequilibriumTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantType.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantType.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantType.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantType.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariates.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariates.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariates.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariates.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGatherer.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGatherer.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGatherer.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGatherer.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BaseRecalibrator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/BaseRecalibrator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BaseRecalibrator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/BaseRecalibrator.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfo.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfo.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfo.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfo.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationArgumentCollection.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationArgumentCollection.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationArgumentCollection.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationArgumentCollection.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/bqsr/RecalibrationEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseAndQualsCounts.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseAndQualsCounts.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseAndQualsCounts.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseAndQualsCounts.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCounts.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCounts.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCounts.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCounts.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseIndex.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseIndex.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseIndex.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseIndex.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/CompressionStash.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/CompressionStash.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/CompressionStash.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/CompressionStash.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/Compressor.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/Compressor.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/Compressor.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/Compressor.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/FinishedGenomeLoc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/FinishedGenomeLoc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/FinishedGenomeLoc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/FinishedGenomeLoc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElement.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElement.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElement.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElement.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/MultiSampleCompressor.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/MultiSampleCompressor.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/MultiSampleCompressor.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/MultiSampleCompressor.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReads.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReads.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReads.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReads.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsStash.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsStash.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsStash.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsStash.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SingleSampleCompressor.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SingleSampleCompressor.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SingleSampleCompressor.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SingleSampleCompressor.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindow.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindow.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindow.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindow.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SyntheticRead.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SyntheticRead.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SyntheticRead.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SyntheticRead.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistribution.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistribution.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistribution.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistribution.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/FindCoveredIntervals.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/FindCoveredIntervals.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/FindCoveredIntervals.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/FindCoveredIntervals.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/AbstractStratification.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/AbstractStratification.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/AbstractStratification.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/AbstractStratification.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/CallableStatus.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/CallableStatus.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/CallableStatus.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/CallableStatus.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargets.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargets.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargets.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargets.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalMetric.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalMetric.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalMetric.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalMetric.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalStratification.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalStratification.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalStratification.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/IntervalStratification.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetric.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetric.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetric.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetric.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricCoverageGap.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricCoverageGap.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricCoverageGap.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricCoverageGap.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricExcessiveCoverage.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricExcessiveCoverage.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricExcessiveCoverage.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricExcessiveCoverage.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricLowCoverage.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricLowCoverage.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricLowCoverage.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricLowCoverage.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricPoorQuality.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricPoorQuality.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricPoorQuality.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusMetricPoorQuality.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStratification.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStratification.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStratification.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStratification.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/Metric.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/Metric.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/Metric.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/Metric.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/PluginUtils.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/PluginUtils.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/PluginUtils.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/PluginUtils.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetric.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetric.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetric.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetric.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricBadMates.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricBadMates.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricBadMates.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricBadMates.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricNoReads.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricNoReads.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricNoReads.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleMetricNoReads.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleStratification.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleStratification.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleStratification.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/SampleStratification.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/ThresHolder.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/ThresHolder.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/ThresHolder.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/ThresHolder.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/Metrics.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/Metrics.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/Metrics.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/Metrics.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervals.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervals.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervals.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervals.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/BaseMismatchModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/BaseMismatchModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/BaseMismatchModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/BaseMismatchModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ConsensusAlleleCounter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/ConsensusAlleleCounter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ConsensusAlleleCounter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/ConsensusAlleleCounter.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/DiploidSNPGenotypeLikelihoods.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/DiploidSNPGenotypeLikelihoods.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/DiploidSNPGenotypeLikelihoods.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/DiploidSNPGenotypeLikelihoods.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ErrorModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/ErrorModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ErrorModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/ErrorModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoods.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoods.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoods.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoods.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsCalculationModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsCalculationModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsCalculationModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsCalculationModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoods.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoods.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoods.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoods.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoodsCalculationModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoodsCalculationModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoodsCalculationModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyIndelGenotypeLikelihoodsCalculationModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoods.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoods.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoods.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoods.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoodsCalculationModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoodsCalculationModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoodsCalculationModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidySNPGenotypeLikelihoodsCalculationModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoodsCalculationModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoodsCalculationModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoodsCalculationModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypeLikelihoodsCalculationModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypePriors.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypePriors.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypePriors.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/GenotypePriors.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsCalculationModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsCalculationModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsCalculationModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsCalculationModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/PoolGenotypePriors.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/PoolGenotypePriors.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/PoolGenotypePriors.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/PoolGenotypePriors.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ProbabilityVector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/ProbabilityVector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/ProbabilityVector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/ProbabilityVector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/SNPGenotypeLikelihoodsCalculationModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedArgumentCollection.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyper.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/VariantCallContext.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/VariantCallContext.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/VariantCallContext.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/VariantCallContext.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcFactory.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcFactory.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcFactory.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcFactory.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceTest.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceTest.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceTest.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceTest.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResult.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResult.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResult.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResult.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcTestBuilder.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcTestBuilder.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcTestBuilder.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcTestBuilder.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/DiploidExactAFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/DiploidExactAFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/DiploidExactAFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/DiploidExactAFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACcounts.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACcounts.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACcounts.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACcounts.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACset.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACset.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACset.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactACset.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactAFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactAFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactAFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactAFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactCallLogger.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactCallLogger.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactCallLogger.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ExactCallLogger.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyExactAFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyExactAFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyExactAFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyExactAFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/OriginalDiploidExactAFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/OriginalDiploidExactAFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/OriginalDiploidExactAFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/OriginalDiploidExactAFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ReferenceDiploidExactAFCalc.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ReferenceDiploidExactAFCalc.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ReferenceDiploidExactAFCalc.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/ReferenceDiploidExactAFCalc.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/StateTracker.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/StateTracker.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/StateTracker.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/StateTracker.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTrimmer.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTrimmer.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTrimmer.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTrimmer.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResult.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResult.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResult.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResult.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSet.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSet.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSet.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSet.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlock.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlock.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlock.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlock.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlockFinder.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlockFinder.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlockFinder.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/EventBlockFinder.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngineInstance.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngineInstance.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngineInstance.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GraphBasedLikelihoodCalculationEngineInstance.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCaller.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCaller.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCaller.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCaller.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeResolver.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeResolver.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeResolver.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeResolver.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeRoute.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeRoute.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeRoute.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeRoute.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HeterogeneousKmerSizeResolution.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HeterogeneousKmerSizeResolution.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HeterogeneousKmerSizeResolution.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HeterogeneousKmerSizeResolution.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounter.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Kmer.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Kmer.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Kmer.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Kmer.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequence.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequence.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequence.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequence.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequenceGraphMap.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequenceGraphMap.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequenceGraphMap.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerSequenceGraphMap.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LikelihoodCalculationEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LikelihoodCalculationEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LikelihoodCalculationEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LikelihoodCalculationEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RandomLikelihoodCalculationEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RandomLikelihoodCalculationEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RandomLikelihoodCalculationEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RandomLikelihoodCalculationEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadAnchoring.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadAnchoring.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadAnchoring.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadAnchoring.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadCost.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadCost.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadCost.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadCost.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentComparator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentComparator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentComparator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentComparator.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentCost.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentCost.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentCost.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadSegmentCost.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RefVsAnyResult.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RefVsAnyResult.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RefVsAnyResult.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/RefVsAnyResult.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdge.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdge.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdge.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdge.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphIterator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphIterator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphIterator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphIterator.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertex.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertex.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertex.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertex.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitter.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertex.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertex.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertex.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertex.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtils.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtils.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtils.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtils.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPaths.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPaths.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPaths.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPaths.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KmerSearchableGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KmerSearchableGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KmerSearchableGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KmerSearchableGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPruner.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPruner.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPruner.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPruner.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdge.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdge.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdge.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdge.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Path.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Path.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Path.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Path.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Route.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Route.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Route.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/Route.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteFinder.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteFinder.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteFinder.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteFinder.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertex.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertex.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertex.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertex.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedSequenceMerger.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedSequenceMerger.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedSequenceMerger.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedSequenceMerger.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitter.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/TestGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/TestGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/TestGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/TestGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/VertexOrder.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/VertexOrder.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/VertexOrder.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/VertexOrder.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/HaplotypeGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/HaplotypeGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/HaplotypeGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/HaplotypeGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/MultiDeBruijnVertex.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/MultiDeBruijnVertex.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/MultiDeBruijnVertex.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/MultiDeBruijnVertex.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssembler.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssembler.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssembler.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssembler.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmers.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmers.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmers.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmers.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/HaplotypeIndelErrorModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/HaplotypeIndelErrorModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/HaplotypeIndelErrorModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/HaplotypeIndelErrorModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/IndelRealigner.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealigner.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/IndelRealigner.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealigner.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/LeftAlignIndels.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/LeftAlignIndels.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/LeftAlignIndels.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/LeftAlignIndels.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/ReadBin.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ReadBin.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/ReadBin.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ReadBin.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreator.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/AllelePair.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/AllelePair.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/AllelePair.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/AllelePair.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/BaseArray.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/BaseArray.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/BaseArray.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/BaseArray.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/CardinalityCounter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/CardinalityCounter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/CardinalityCounter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/CardinalityCounter.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/CloneableIteratorLinkedList.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/CloneableIteratorLinkedList.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/CloneableIteratorLinkedList.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/CloneableIteratorLinkedList.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/DisjointSet.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/DisjointSet.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/DisjointSet.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/DisjointSet.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/Haplotype.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/Haplotype.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/Haplotype.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/Haplotype.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/MergeSegregatingAlternateAllelesVCFWriter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/MergeSegregatingAlternateAllelesVCFWriter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/MergeSegregatingAlternateAllelesVCFWriter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/MergeSegregatingAlternateAllelesVCFWriter.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmission.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmission.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmission.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmission.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraph.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraph.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraph.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraph.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraphEdge.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraphEdge.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraphEdge.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingGraphEdge.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingRead.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingRead.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingRead.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingRead.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingUtils.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingUtils.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PhasingUtils.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PhasingUtils.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PreciseNonNegativeDouble.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PreciseNonNegativeDouble.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/PreciseNonNegativeDouble.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/PreciseNonNegativeDouble.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasing.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasing.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasing.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasing.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBase.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBase.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBase.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBase.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBasesAtPosition.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBasesAtPosition.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/ReadBasesAtPosition.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBasesAtPosition.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/SNPallelePair.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/SNPallelePair.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/phasing/SNPallelePair.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/phasing/SNPallelePair.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedCoverage.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedCoverage.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedCoverage.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedCoverage.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedQuals.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedQuals.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedQuals.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/AssessReducedQuals.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReads.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReads.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReads.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReads.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariants.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariants.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariants.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariants.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/GenotypeAndValidate.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/FrequencyModeSelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/FrequencyModeSelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/FrequencyModeSelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/FrequencyModeSelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GLBasedSampleSelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GLBasedSampleSelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GLBasedSampleSelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GLBasedSampleSelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GTBasedSampleSelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GTBasedSampleSelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GTBasedSampleSelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GTBasedSampleSelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GenomeEvent.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GenomeEvent.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GenomeEvent.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/GenomeEvent.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/KeepAFSpectrumFrequencySelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/KeepAFSpectrumFrequencySelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/KeepAFSpectrumFrequencySelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/KeepAFSpectrumFrequencySelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/NullSampleSelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/NullSampleSelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/NullSampleSelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/NullSampleSelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/SampleSelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/SampleSelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/SampleSelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/SampleSelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/UniformSamplingFrequencySelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/UniformSamplingFrequencySelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/UniformSamplingFrequencySelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/UniformSamplingFrequencySelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/ValidationSiteSelector.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/ValidationSiteSelector.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/ValidationSiteSelector.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/validationsiteselector/ValidationSiteSelector.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibration.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibration.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibration.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibration.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/GaussianMixtureModel.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/GaussianMixtureModel.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/GaussianMixtureModel.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/GaussianMixtureModel.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/MultivariateGaussian.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/MultivariateGaussian.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/MultivariateGaussian.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/MultivariateGaussian.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrainingSet.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrainingSet.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrainingSet.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrainingSet.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/Tranche.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/Tranche.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/Tranche.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/Tranche.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrancheManager.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrancheManager.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrancheManager.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/TrancheManager.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManager.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManager.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManager.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManager.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDatum.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDatum.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDatum.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDatum.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrator.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorArgumentCollection.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorArgumentCollection.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorArgumentCollection.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorArgumentCollection.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorEngine.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorEngine.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorEngine.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibratorEngine.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/CalculateGenotypePosteriors.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/CalculateGenotypePosteriors.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/CalculateGenotypePosteriors.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/CalculateGenotypePosteriors.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariants.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariants.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariants.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariants.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtils.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtils.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtils.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtils.java
diff --git a/protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariants.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariants.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariants.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariants.java
diff --git a/protected/java/src/org/broadinstitute/sting/package-info.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/package-info.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/package-info.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/package-info.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/SequenceComplexity.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/SequenceComplexity.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/SequenceComplexity.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/SequenceComplexity.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/collections/CountSet.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/collections/CountSet.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/collections/CountSet.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/collections/CountSet.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/gvcf/GVCFWriter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/gvcf/GVCFWriter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/gvcf/GVCFWriter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/gvcf/GVCFWriter.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/gvcf/HomRefBlock.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/gvcf/HomRefBlock.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/gvcf/HomRefBlock.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/gvcf/HomRefBlock.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculator.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculator.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculator.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculator.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotype/LDMerger.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotype/LDMerger.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotype/LDMerger.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotype/LDMerger.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotype/MergeVariantsAcrossHaplotypes.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotype/MergeVariantsAcrossHaplotypes.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotype/MergeVariantsAcrossHaplotypes.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotype/MergeVariantsAcrossHaplotypes.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/AllHaplotypeBAMWriter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/AllHaplotypeBAMWriter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/AllHaplotypeBAMWriter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/AllHaplotypeBAMWriter.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/CalledHaplotypeBAMWriter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/CalledHaplotypeBAMWriter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/CalledHaplotypeBAMWriter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/CalledHaplotypeBAMWriter.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriter.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriter.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriter.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriter.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/ReadDestination.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/ReadDestination.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/haplotypeBAMWriter/ReadDestination.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/ReadDestination.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/pairhmm/ArrayLoglessPairHMM.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/ArrayLoglessPairHMM.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/pairhmm/ArrayLoglessPairHMM.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/ArrayLoglessPairHMM.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/pairhmm/CnyPairHMM.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/CnyPairHMM.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/pairhmm/CnyPairHMM.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/CnyPairHMM.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMM.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMM.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMM.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMM.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/pairhmm/FlexibleHMM.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/FlexibleHMM.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/pairhmm/FlexibleHMM.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/FlexibleHMM.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/pairhmm/LoglessPairHMM.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/LoglessPairHMM.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/pairhmm/LoglessPairHMM.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/pairhmm/LoglessPairHMM.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/BQSRReadTransformer.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/BQSRReadTransformer.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/BQSRReadTransformer.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/BQSRReadTransformer.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/BaseRecalibration.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/BaseRecalibration.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/BaseRecalibration.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/BaseRecalibration.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/QualQuantizer.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/QualQuantizer.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/QualQuantizer.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/QualQuantizer.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/QuantizationInfo.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/QuantizationInfo.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/QuantizationInfo.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/QuantizationInfo.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/ReadCovariates.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/ReadCovariates.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/ReadCovariates.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/ReadCovariates.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalDatum.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalDatum.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalDatum.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalDatum.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalDatumNode.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalDatumNode.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalDatumNode.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalDatumNode.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalUtils.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalUtils.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalUtils.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalUtils.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalibrationReport.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalibrationReport.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalibrationReport.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalibrationReport.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalibrationTables.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalibrationTables.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/RecalibrationTables.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/RecalibrationTables.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/ContextCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/ContextCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/ContextCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/ContextCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/Covariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/Covariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/Covariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/Covariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/CycleCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/CycleCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/CycleCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/CycleCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/ExperimentalCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/ExperimentalCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/ExperimentalCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/ExperimentalCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/QualityScoreCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/QualityScoreCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/QualityScoreCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/QualityScoreCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/ReadGroupCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/ReadGroupCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/ReadGroupCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/ReadGroupCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatLengthCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatLengthCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatLengthCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatLengthCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitAndLengthCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitAndLengthCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitAndLengthCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitAndLengthCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RepeatUnitCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RequiredCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RequiredCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/RequiredCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/RequiredCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/StandardCovariate.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/StandardCovariate.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/recalibration/covariates/StandardCovariate.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/recalibration/covariates/StandardCovariate.java
diff --git a/protected/java/src/org/broadinstitute/sting/utils/sam/ClippedGATKSAMRecord.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/sam/ClippedGATKSAMRecord.java
similarity index 100%
rename from protected/java/src/org/broadinstitute/sting/utils/sam/ClippedGATKSAMRecord.java
rename to protected/gatk-protected/src/main/java/org/broadinstitute/sting/utils/sam/ClippedGATKSAMRecord.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/WalkerTestIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/WalkerTestIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/WalkerTestIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/WalkerTestIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/RankSumUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/RankSumUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/RankSumUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/RankSumUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotatorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotatorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotatorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotatorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/beagle/BeagleIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariatesIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariatesIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariatesIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/AnalyzeCovariatesIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGathererUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGathererUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGathererUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRGathererUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfoUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfoUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfoUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/bqsr/ReadRecalibrationInfoUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCountsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCountsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCountsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/BaseCountsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElementUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElementUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElementUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/HeaderElementUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/ReduceReadsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindowUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindowUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindowUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/compression/reducereads/SlidingWindowUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistributionIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistributionIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistributionIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/BaseCoverageDistributionIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycleIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycleIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycleIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycleIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupPropertiesIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupPropertiesIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupPropertiesIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupPropertiesIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargetsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargetsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargetsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/DiagnoseTargetsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStatisticsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStatisticsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStatisticsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/diagnosetargets/LocusStatisticsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervalsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervalsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervalsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diagnostics/missing/QualifyMissingIntervalsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngineUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngineUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngineUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngineUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNodeUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNodeUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNodeUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNodeUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjectsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjectsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjectsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjectsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReaderUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReaderUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReaderUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReaderUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DifferenceUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DifferenceUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/diffengine/DifferenceUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/diffengine/DifferenceUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltrationIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltrationIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltrationIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltrationIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/ArtificialReadPileupTestProvider.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/ArtificialReadPileupTestProvider.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/ArtificialReadPileupTestProvider.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/ArtificialReadPileupTestProvider.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/BiasedDownsamplingIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/BiasedDownsamplingIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/BiasedDownsamplingIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/BiasedDownsamplingIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/GeneralPloidyGenotypeLikelihoodsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/IndelGenotypeLikelihoodsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngineUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngineUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngineUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperEngineUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite1IntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite1IntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite1IntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite1IntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite2IntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite2IntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite2IntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidySuite2IntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidyTestExecutor.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidyTestExecutor.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidyTestExecutor.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperGeneralPloidyTestExecutor.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIndelCallingIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIndelCallingIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIndelCallingIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIndelCallingIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperLargeScaleTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperNormalCallingIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperNormalCallingIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperNormalCallingIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperNormalCallingIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperReducedReadsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperReducedReadsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperReducedReadsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/UnifiedGenotyperReducedReadsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcPerformanceUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResultUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResultUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResultUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcResultUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/AFCalcUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyAFCalculationModelUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyAFCalculationModelUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyAFCalculationModelUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/GeneralPloidyAFCalculationModelUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalcUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalcUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalcUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/genotyper/afcalc/IndependentAllelesDiploidExactAFCalcUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTestDataSetUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTestDataSetUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTestDataSetUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ActiveRegionTestDataSetUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSetUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSetUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSetUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/AssemblyResultSetUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Civar.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Civar.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Civar.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/Civar.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/CivarUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/CivarUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/CivarUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/CivarUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngineUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngineUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngineUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/GenotypingEngineUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCLikelihoodCalculationEnginesBenchmark.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCLikelihoodCalculationEnginesBenchmark.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCLikelihoodCalculationEnginesBenchmark.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCLikelihoodCalculationEnginesBenchmark.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerComplexAndSymbolicVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerComplexAndSymbolicVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerComplexAndSymbolicVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerComplexAndSymbolicVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerGVCFIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerGVCFIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerGVCFIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerGVCFIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerModesIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerModesIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerModesIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerModesIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerParallelIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerParallelIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerParallelIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HaplotypeCallerParallelIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounterCaseFixUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounterCaseFixUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounterCaseFixUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KMerCounterCaseFixUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/KmerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngineUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngineUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngineUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/LocalAssemblyEngineUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngineUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngineUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngineUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/PairHMMLikelihoodCalculationEngineUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrectorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrectorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrectorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadErrorCorrectorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadThreadingLikelihoodCalculationEngineUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadThreadingLikelihoodCalculationEngineUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadThreadingLikelihoodCalculationEngineUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReadThreadingLikelihoodCalculationEngineUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModelUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModelUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModelUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/ReferenceConfidenceModelUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdgeUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdgeUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdgeUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseEdgeUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseGraphUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertexUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertexUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertexUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/BaseVertexUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixMergerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixMergerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixMergerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixMergerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitterUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitterUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitterUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/CommonSuffixSplitterUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertexUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertexUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertexUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/DeBruijnVertexUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtilsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtilsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtilsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/GraphUtilsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/HaplotypeGraphUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/HaplotypeGraphUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/HaplotypeGraphUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/HaplotypeGraphUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPathsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPathsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPathsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/KBestPathsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPrunerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPrunerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPrunerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/LowWeightChainPrunerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdgeUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdgeUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdgeUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/MultiSampleEdgeUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/PathUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/PathUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/PathUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/PathUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/RouteUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraphUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraphUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraphUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqGraphUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertexUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertexUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertexUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SeqVertexUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitterUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitterUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitterUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/graphs/SharedVertexSequenceSplitterUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssemblerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssemblerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssemblerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingAssemblerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraphUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraphUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraphUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/ReadThreadingGraphUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmersUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmersUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmersUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/readthreading/SequenceForKmersUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManagerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManagerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManagerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManagerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerLargeScaleTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModelUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModelUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModelUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/PairHMMIndelErrorModelUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/ReadBinUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/ReadBinUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/ReadBinUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/ReadBinUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/RealignerTargetCreatorLargeScaleTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmissionIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmissionIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmissionIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/phasing/PhaseByTransmissionIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/phasing/ReadBackedPhasingIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsIntegrationTests.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsIntegrationTests.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsIntegrationTests.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsIntegrationTests.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/rnaseq/SplitNCigarReadsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/simulatereads/SimulateReadsForVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmpliconsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmpliconsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmpliconsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmpliconsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/validation/ValidationSiteSelectorIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/validation/ValidationSiteSelectorIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/validation/ValidationSiteSelectorIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/validation/ValidationSiteSelectorIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalWalkerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalWalkerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalWalkerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalWalkerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManagerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManagerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManagerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManagerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManagerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManagerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManagerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantDataManagerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantGaussianMixtureModelUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantGaussianMixtureModelUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantGaussianMixtureModelUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantGaussianMixtureModelUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrationWalkersIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrationWalkersIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrationWalkersIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VariantRecalibrationWalkersIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineReferenceCalculationVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariantsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetricsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetricsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetricsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetricsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordanceIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordanceIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordanceIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordanceIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariantsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/RegenotypeVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VCFStreamingIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VCFStreamingIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VCFStreamingIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VCFStreamingIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariantsIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariantsIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariantsIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitivesIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitivesIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitivesIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitivesIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPedIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPedIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPedIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPedIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTableIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTableIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTableIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTableIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCFIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCFIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCFIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCFIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/ContigComparatorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/ContigComparatorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/ContigComparatorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/ContigComparatorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/RandomDNA.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/RandomDNA.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/RandomDNA.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/RandomDNA.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/collections/CountSetUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/collections/CountSetUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/collections/CountSetUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/collections/CountSetUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/genotyper/DiploidGenotypeUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/genotyper/DiploidGenotypeUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/genotyper/DiploidGenotypeUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/genotyper/DiploidGenotypeUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/genotyper/MostLikelyAlleleUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/genotyper/MostLikelyAlleleUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/genotyper/MostLikelyAlleleUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/genotyper/MostLikelyAlleleUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMapUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMapUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMapUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMapUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/gvcf/GVCFWriterUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/gvcf/GVCFWriterUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/gvcf/GVCFWriterUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/gvcf/GVCFWriterUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/gvcf/HomRefBlockUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/gvcf/HomRefBlockUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/gvcf/HomRefBlockUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/gvcf/HomRefBlockUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparatorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparatorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparatorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparatorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculatorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculatorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculatorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeLDCalculatorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparatorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparatorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparatorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparatorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparatorUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparatorUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparatorUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparatorUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/haplotype/LDMergerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/LDMergerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/haplotype/LDMergerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotype/LDMergerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriterUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriterUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriterUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/haplotypeBAMWriter/HaplotypeBAMWriterUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/ActiveRegionTestDataSet.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/ActiveRegionTestDataSet.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/ActiveRegionTestDataSet.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/ActiveRegionTestDataSet.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/CnyPairHMMUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/CnyPairHMMUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/CnyPairHMMUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/CnyPairHMMUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMMUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMMUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMMUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/FastLoglessPairHMMUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMEmpiricalBenchmark.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMEmpiricalBenchmark.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMEmpiricalBenchmark.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMEmpiricalBenchmark.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMModelUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMModelUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMModelUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMModelUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMProbabilityBugIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMProbabilityBugIntegrationTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMProbabilityBugIntegrationTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMProbabilityBugIntegrationTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMSyntheticBenchmark.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMSyntheticBenchmark.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMSyntheticBenchmark.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMSyntheticBenchmark.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMTestData.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMTestData.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMTestData.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMTestData.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/pairhmm/PairHMMUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/pairhmm/PairHMMUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/ContextCovariateUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/ContextCovariateUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/ContextCovariateUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/ContextCovariateUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/CycleCovariateUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/CycleCovariateUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/CycleCovariateUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/CycleCovariateUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/QualQuantizerUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/QualQuantizerUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/QualQuantizerUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/QualQuantizerUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/ReadCovariatesUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/ReadCovariatesUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/ReadCovariatesUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/ReadCovariatesUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/ReadGroupCovariateUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/ReadGroupCovariateUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/ReadGroupCovariateUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/ReadGroupCovariateUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalDatumUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalDatumUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalDatumUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalDatumUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalUtilsUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalUtilsUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalUtilsUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalUtilsUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalibrationReportUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalibrationReportUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalibrationReportUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalibrationReportUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalibrationTablesUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalibrationTablesUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalibrationTablesUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalibrationTablesUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalibrationTestUtils.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalibrationTestUtils.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/RecalibrationTestUtils.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RecalibrationTestUtils.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/recalibration/RepeatCovariatesUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RepeatCovariatesUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/recalibration/RepeatCovariatesUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/recalibration/RepeatCovariatesUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignmentUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignmentUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignmentUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignmentUnitTest.java
diff --git a/protected/java/test/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentUnitTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentUnitTest.java
similarity index 100%
rename from protected/java/test/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentUnitTest.java
rename to protected/gatk-protected/src/test/java/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentUnitTest.java
diff --git a/protected/pom.xml b/protected/pom.xml
new file mode 100644
index 000000000..4b165d477
--- /dev/null
+++ b/protected/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-root</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../public/sting-root</relativePath>
+    </parent>
+
+    <artifactId>sting-protected</artifactId>
+    <packaging>pom</packaging>
+    <name>Sting Protected</name>
+
+    <modules>
+        <module>gatk-protected</module>
+    </modules>
+
+    <properties>
+        <sting.basedir>${project.basedir}/..</sting.basedir>
+    </properties>
+
+</project>
diff --git a/public/external-example/pom.xml b/public/external-example/pom.xml
new file mode 100644
index 000000000..0f5e3934e
--- /dev/null
+++ b/public/external-example/pom.xml
@@ -0,0 +1,259 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- Properties for your assembly -->
+    <groupId>org.mycompany.app</groupId>
+    <artifactId>external-example</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>external-example</name>
+
+    <properties>
+        <sting.version>2.8-SNAPSHOT</sting.version>
+        <!--
+        sting.basedir property must point to your checkout of Sting/GATK until we can get all the
+        dependencies out of the committed sting repo and into central.
+        The installed pom for sting-root looks for this property.
+        Alternatively, one can install all the sting files into their local ~/.m2/repository repo.
+        http://maven.apache.org/plugins/maven-install-plugin/examples/custom-pom-installation.html
+        -->
+        <sting.basedir>../..</sting.basedir>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.build.timestamp.format>yyyy/MM/dd HH:mm:ss</maven.build.timestamp.format>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>sting.public.repo.local</id>
+            <name>Sting Public Local Repository</name>
+            <url>file:${sting.basedir}/public/repo</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.broadinstitute.sting</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${sting.version}</version>
+        </dependency>
+
+        <!--
+        Test dependencies are not transitive,
+        so must include each explicit test artifact.
+
+        TODO: switch from test-utils classifier to a tests-utils artifact
+        TODO: see also http://maven.apache.org/plugins/maven-jar-plugin/usage.html#The_preferred_way
+        -->
+        <dependency>
+            <groupId>org.broadinstitute.sting</groupId>
+            <artifactId>sting-utils</artifactId>
+            <version>${sting.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.broadinstitute.sting</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${sting.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <!-- Copy test resources to your classes directory -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.broadinstitute.sting</groupId>
+                                    <artifactId>gatk-framework</artifactId>
+                                    <version>${sting.version}</version>
+                                    <classifier>example-resources</classifier>
+                                    <type>tar.bz2</type>
+                                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Generate help text -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <executions>
+                    <execution>
+                        <id>extract-resource-bundle</id>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <doclet>org.broadinstitute.sting.utils.help.ResourceBundleExtractorDoclet</doclet>
+                            <!-- Required as doclet uses reflection to access classes for documentation, instead of source java-->
+                            <docletPath>${project.build.outputDirectory}</docletPath>
+                            <docletArtifact>
+                                <groupId>org.broadinstitute.sting</groupId>
+                                <!-- TODO: THIS IS SUPPOSED TO BE STING-UTILS! -->
+                                <artifactId>gatk-framework</artifactId>
+                                <version>${sting.version}</version>
+                            </docletArtifact>
+                            <maxmemory>2g</maxmemory>
+                            <useStandardDocletOptions>false</useStandardDocletOptions>
+                            <quiet>true</quiet>
+                            <additionalparam>-build-timestamp "${maven.build.timestamp}" -absolute-version "${project.version}" -out ${project.build.outputDirectory}/StingText.properties</additionalparam>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Create packaged jar, containing only your walker and required classes -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <!-- Explicitly include classes loaded via reflection from artifacts below -->
+                            <filters>
+                                <filter>
+                                    <artifact>commons-logging:commons-logging</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.broad:tribble</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.broadinstitute:variant</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                            <!-- Stop shade from trying to unzip these indirect dependencies -->
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.broadinstitute.sting:gsalib:tar.gz:*</exclude>
+                                    <exclude>org.broadinstitute.sting:*:tar.bz2:example-resources</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <transformers>
+                                <!-- Set the main class to the GATK -->
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.broadinstitute.sting.gatk.CommandLineGATK</mainClass>
+                                </transformer>
+                                <!-- Include and append to the existing gatk help text in StingText.properties -->
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>StingText.properties</resource>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- surefire runs fast, small (aka unit) tests -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <!-- See explicit executions below -->
+                    <skip>true</skip>
+                    <systemPropertyVariables>
+                        <!-- TODO: Fix BaseTest to not error out if this property is missing. -->
+                        <pipeline.run>false</pipeline.run>
+                    </systemPropertyVariables>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <!-- run all non integration tests -->
+                        <id>unit-tests</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <includes>
+                                <include>**/*UnitTest.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- failsafe runs all other tests that may take longer, and may require pre/post test setup and teardown -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <!-- See explicit executions below -->
+                    <skip>true</skip>
+                    <systemPropertyVariables>
+                        <!-- TODO: Fix BaseTest to not error out if this property is missing. -->
+                        <pipeline.run>false</pipeline.run>
+                    </systemPropertyVariables>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <!-- run integration tests -->
+                        <configuration>
+                            <skip>false</skip>
+                            <includes>
+                                <include>**/*IntegrationTest.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/public/external-example/src/main/java/org/mycompany/app/MyExampleWalker.java b/public/external-example/src/main/java/org/mycompany/app/MyExampleWalker.java
new file mode 100644
index 000000000..d65c47c99
--- /dev/null
+++ b/public/external-example/src/main/java/org/mycompany/app/MyExampleWalker.java
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2012 The Broad Institute
+* 
+* Permission is hereby granted, free of charge, to any person
+* obtaining a copy of this software and associated documentation
+* files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use,
+* copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following
+* conditions:
+* 
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+package org.mycompany.app;
+
+import org.broadinstitute.sting.commandline.Output;
+import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
+import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
+import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
+import org.broadinstitute.sting.gatk.walkers.LocusWalker;
+
+import java.io.PrintStream;
+
+/**
+ * An example walker that looks surprisingly like CountLoci.
+ */
+public class MyExampleWalker extends LocusWalker<Integer, Long> {
+    @Output
+    PrintStream out;
+
+    public Integer map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) {
+        return 1;
+    }
+
+    public Long reduceInit() { return 0l; }
+
+    public Long reduce(Integer value, Long sum) {
+        return value + sum;
+    }
+
+    public void onTraversalDone( Long c ) {
+        out.println(c);
+    }
+}
diff --git a/public/external-example/src/test/java/org/mycompany/app/MyExampleWalkerIntegrationTest.java b/public/external-example/src/test/java/org/mycompany/app/MyExampleWalkerIntegrationTest.java
new file mode 100644
index 000000000..777079426
--- /dev/null
+++ b/public/external-example/src/test/java/org/mycompany/app/MyExampleWalkerIntegrationTest.java
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2012 The Broad Institute
+* 
+* Permission is hereby granted, free of charge, to any person
+* obtaining a copy of this software and associated documentation
+* files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use,
+* copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following
+* conditions:
+* 
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+package org.mycompany.app;
+
+import org.broadinstitute.sting.WalkerTest;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.MissingResourceException;
+
+/**
+ * NOTE: Currently the testing infrastructure for walkers does not support running outside the Broad.
+ */
+public class MyExampleWalkerIntegrationTest extends WalkerTest {
+    @Test
+    public void testMyExampleWalker() throws URISyntaxException {
+        String gatk_args = String.format("-T MyExampleWalker -I %s -R %s", getResource("/exampleBAM.bam"), getResource("/exampleFASTA.fasta"));
+        WalkerTestSpec spec = new WalkerTestSpec(gatk_args, Collections.<String>emptyList());
+        executeTest("Testing count on the example bam", spec);
+    }
+
+    private File getResource(String path) throws URISyntaxException {
+        URL resourceUrl = getClass().getResource(path);
+        if (resourceUrl == null)
+            throw new MissingResourceException("Resource not found: " + path, getClass().getSimpleName(), path);
+        return new File(resourceUrl.toURI());
+    }
+}
diff --git a/public/external-example/src/test/java/org/mycompany/app/MyExampleWalkerUnitTest.java b/public/external-example/src/test/java/org/mycompany/app/MyExampleWalkerUnitTest.java
new file mode 100644
index 000000000..e3e0c81ea
--- /dev/null
+++ b/public/external-example/src/test/java/org/mycompany/app/MyExampleWalkerUnitTest.java
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) 2012 The Broad Institute
+* 
+* Permission is hereby granted, free of charge, to any person
+* obtaining a copy of this software and associated documentation
+* files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use,
+* copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following
+* conditions:
+* 
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+package org.mycompany.app;
+
+import org.broadinstitute.sting.BaseTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * NOTE: Currently the testing infrastructure for walkers does not support running outside the Broad.
+ */
+public class MyExampleWalkerUnitTest extends BaseTest {
+    @Test
+    public void testMyExampleWalker() {
+        MyExampleWalker walker = new MyExampleWalker();
+        Assert.assertEquals((long)walker.reduce(1, 1L), 2L);
+    }
+}
diff --git a/public/gatk-framework/pom.xml b/public/gatk-framework/pom.xml
new file mode 100644
index 000000000..bf46e8951
--- /dev/null
+++ b/public/gatk-framework/pom.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>gatk-framework</artifactId>
+    <packaging>jar</packaging>
+    <name>GATK Framework</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <sting.packagetests.artifactId>gatk-package</sting.packagetests.artifactId>
+        <sting.test-utils-jar.phase>${sting.jar.phase}</sting.test-utils-jar.phase>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sting-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sting-utils</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.caliper</groupId>
+            <artifactId>caliper</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>example-resources</id>
+                        <phase>generate-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resource-bundle-log4j</id>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>extract-resource-bundle</id>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                </executions>
+            </plugin>
+-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package-unittests</id>
+                    </execution>
+                    <execution>
+                        <id>package-integrationtests</id>
+                    </execution>
+                    <execution>
+                        <id>package-largescaletests</id>
+                    </execution>
+                    <execution>
+                        <id>package-pipelinetests</id>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>private</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../private/gatk-private/pom.xml</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- TODO: All tests require access to private. For now. -->
+                    <plugin>
+                        <groupId>com.pyx4j</groupId>
+                        <artifactId>maven-junction-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>link-private-testdata</id>
+                                <phase>process-test-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>unlink-private-testdata</id>
+                                <phase>clean</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/public/gatk-framework/src/main/assembly/example-resources.xml b/public/gatk-framework/src/main/assembly/example-resources.xml
new file mode 100644
index 000000000..b285cc05f
--- /dev/null
+++ b/public/gatk-framework/src/main/assembly/example-resources.xml
@@ -0,0 +1,37 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>example-resources</id>
+    <formats>
+        <format>tar.bz2</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.sourceDirectory}/org/broadinstitute/sting/gatk/walkers/qc</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>Pileup.java</include>
+                <include>CountLoci.java</include>
+                <include>CountReads.java</include>
+                <include>CheckPileup.java</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.sourceDirectory}/org/broadinstitute/sting/gatk/walkers/readutils</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>PrintReads.java</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/test/resources</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>exampleBAM.bam</include>
+                <include>exampleBAM.bam.bai</include>
+                <include>exampleFASTA.fasta</include>
+                <include>exampleFASTA.fasta.fai</include>
+                <include>exampleFASTA.dict</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/public/java/src/net/sf/samtools/GATKBAMFileSpan.java b/public/gatk-framework/src/main/java/net/sf/samtools/GATKBAMFileSpan.java
similarity index 100%
rename from public/java/src/net/sf/samtools/GATKBAMFileSpan.java
rename to public/gatk-framework/src/main/java/net/sf/samtools/GATKBAMFileSpan.java
diff --git a/public/java/src/net/sf/samtools/GATKBin.java b/public/gatk-framework/src/main/java/net/sf/samtools/GATKBin.java
similarity index 100%
rename from public/java/src/net/sf/samtools/GATKBin.java
rename to public/gatk-framework/src/main/java/net/sf/samtools/GATKBin.java
diff --git a/public/java/src/net/sf/samtools/GATKChunk.java b/public/gatk-framework/src/main/java/net/sf/samtools/GATKChunk.java
similarity index 100%
rename from public/java/src/net/sf/samtools/GATKChunk.java
rename to public/gatk-framework/src/main/java/net/sf/samtools/GATKChunk.java
diff --git a/public/java/src/net/sf/samtools/PicardNamespaceUtils.java b/public/gatk-framework/src/main/java/net/sf/samtools/PicardNamespaceUtils.java
similarity index 100%
rename from public/java/src/net/sf/samtools/PicardNamespaceUtils.java
rename to public/gatk-framework/src/main/java/net/sf/samtools/PicardNamespaceUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/Aligner.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/Aligner.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/Aligner.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/Aligner.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/Alignment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/Alignment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/Alignment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/Alignment.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/CheckAlignment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/CheckAlignment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/CheckAlignment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/CheckAlignment.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/BWAAligner.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/BWAAligner.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/BWAAligner.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/BWAAligner.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/BWAConfiguration.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/BWAConfiguration.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/BWAConfiguration.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/BWAConfiguration.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/BWTFiles.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/BWTFiles.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/BWTFiles.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/BWTFiles.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/c/BWACAligner.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/c/BWACAligner.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/c/BWACAligner.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/c/BWACAligner.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/c/BWAPath.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/c/BWAPath.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/c/BWAPath.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/c/BWAPath.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/java/AlignerTestHarness.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/AlignerTestHarness.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/java/AlignerTestHarness.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/AlignerTestHarness.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/java/AlignmentMatchSequence.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/AlignmentMatchSequence.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/java/AlignmentMatchSequence.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/AlignmentMatchSequence.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/java/AlignmentState.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/AlignmentState.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/java/AlignmentState.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/AlignmentState.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/java/BWAAlignment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/BWAAlignment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/java/BWAAlignment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/BWAAlignment.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/java/BWAJavaAligner.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/BWAJavaAligner.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/java/BWAJavaAligner.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/BWAJavaAligner.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/bwa/java/LowerBound.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/LowerBound.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/bwa/java/LowerBound.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/bwa/java/LowerBound.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/AMBWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/AMBWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/AMBWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/AMBWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/ANNWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/ANNWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/ANNWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/ANNWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWT.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWT.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWT.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWT.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWTReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWTReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWTReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWTReader.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWTSupplementaryFileGenerator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWTSupplementaryFileGenerator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWTSupplementaryFileGenerator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWTSupplementaryFileGenerator.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWTWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWTWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/BWTWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/BWTWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/Bases.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/Bases.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/Bases.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/Bases.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/Counts.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/Counts.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/Counts.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/Counts.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/CreateBWTFromReference.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/CreateBWTFromReference.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/CreateBWTFromReference.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/CreateBWTFromReference.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SequenceBlock.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SequenceBlock.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SequenceBlock.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SequenceBlock.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SuffixArray.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SuffixArray.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SuffixArray.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SuffixArray.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayReader.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/bwt/SuffixArrayWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/packing/BasePackedInputStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/BasePackedInputStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/packing/BasePackedInputStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/BasePackedInputStream.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/packing/BasePackedOutputStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/BasePackedOutputStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/packing/BasePackedOutputStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/BasePackedOutputStream.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/packing/CreatePACFromReference.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/CreatePACFromReference.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/packing/CreatePACFromReference.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/CreatePACFromReference.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/packing/PackUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/PackUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/packing/PackUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/PackUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedInputStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedInputStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedInputStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedInputStream.java
diff --git a/public/java/src/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedOutputStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedOutputStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedOutputStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/alignment/reference/packing/UnsignedIntPackedOutputStream.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Advanced.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Advanced.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Advanced.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Advanced.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Argument.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Argument.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Argument.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Argument.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentDefinition.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentDefinition.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentDefinition.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentDefinition.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentDefinitionGroup.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentDefinitionGroup.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentDefinitionGroup.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentDefinitionGroup.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentDefinitions.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentDefinitions.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentDefinitions.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentDefinitions.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentException.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentIOType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentIOType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentIOType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentIOType.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatch.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatch.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatch.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatch.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchFileValue.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchFileValue.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchFileValue.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchFileValue.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchSite.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchSite.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchSite.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchSite.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchSource.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchSourceType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchSourceType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchSourceType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchSourceType.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchStringValue.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchStringValue.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchStringValue.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchStringValue.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchValue.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchValue.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatchValue.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatchValue.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentMatches.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatches.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentMatches.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentMatches.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentSource.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ArgumentTypeDescriptor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentTypeDescriptor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ArgumentTypeDescriptor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ArgumentTypeDescriptor.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ClassType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ClassType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ClassType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ClassType.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/CommandLineProgram.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/CommandLineProgram.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/CommandLineProgram.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/CommandLineProgram.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/CommandLineUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/CommandLineUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/CommandLineUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/CommandLineUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/EnumerationArgumentDefault.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/EnumerationArgumentDefault.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/EnumerationArgumentDefault.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/EnumerationArgumentDefault.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Gather.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Gather.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Gather.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Gather.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Gatherer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Gatherer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Gatherer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Gatherer.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Hidden.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Hidden.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Hidden.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Hidden.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Input.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Input.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Input.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Input.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/IntervalArgumentCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/IntervalArgumentCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/IntervalArgumentCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/IntervalArgumentCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/IntervalBinding.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/IntervalBinding.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/IntervalBinding.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/IntervalBinding.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/MissingArgumentValueException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/MissingArgumentValueException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/MissingArgumentValueException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/MissingArgumentValueException.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Output.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Output.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Output.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Output.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ParsedArgs.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsedArgs.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ParsedArgs.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsedArgs.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ParsedListArgs.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsedListArgs.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ParsedListArgs.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsedListArgs.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ParsingEngine.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingEngine.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ParsingEngine.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingEngine.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ParsingEngineArgumentFiles.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingEngineArgumentFiles.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ParsingEngineArgumentFiles.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingEngineArgumentFiles.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ParsingEngineArgumentProvider.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingEngineArgumentProvider.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ParsingEngineArgumentProvider.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingEngineArgumentProvider.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/ParsingMethod.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingMethod.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/ParsingMethod.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/ParsingMethod.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/RodBinding.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/RodBinding.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/RodBinding.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/RodBinding.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/RodBindingCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/RodBindingCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/RodBindingCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/RodBindingCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/Tags.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Tags.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/Tags.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/Tags.java
diff --git a/public/java/src/org/broadinstitute/sting/commandline/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/commandline/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/commandline/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/CommandLineExecutable.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/CommandLineExecutable.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/CommandLineExecutable.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/CommandLineExecutable.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/CommandLineGATK.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/CommandLineGATK.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/CommandLineGATK.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/ReadMetrics.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/ReadMetrics.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/ReadMetrics.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/ReadMetrics.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/ReadProperties.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/ReadProperties.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/ReadProperties.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/ReadProperties.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/WalkerManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/WalkerManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/WalkerManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/WalkerManager.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/arguments/DbsnpArgumentCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/DbsnpArgumentCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/arguments/DbsnpArgumentCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/DbsnpArgumentCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/arguments/GATKArgumentCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/GATKArgumentCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/arguments/GATKArgumentCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/GATKArgumentCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/arguments/StandardVariantContextInputArgumentCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/StandardVariantContextInputArgumentCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/arguments/StandardVariantContextInputArgumentCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/StandardVariantContextInputArgumentCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/arguments/ValidationExclusion.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/ValidationExclusion.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/arguments/ValidationExclusion.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/arguments/ValidationExclusion.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/contexts/AlignmentContext.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/contexts/AlignmentContext.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/contexts/AlignmentContext.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/contexts/AlignmentContext.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/contexts/AlignmentContextUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/contexts/AlignmentContextUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/contexts/AlignmentContextUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/contexts/AlignmentContextUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/contexts/ReferenceContext.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/contexts/ReferenceContext.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/contexts/ReferenceContext.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/contexts/ReferenceContext.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/AllLocusView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/AllLocusView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/AllLocusView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/AllLocusView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/IntervalOverlappingRODsFromStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/IntervalOverlappingRODsFromStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/IntervalOverlappingRODsFromStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/IntervalOverlappingRODsFromStream.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/InvalidPositionException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/InvalidPositionException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/InvalidPositionException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/InvalidPositionException.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/LocusShardDataProvider.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/LocusShardDataProvider.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/LocusShardDataProvider.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/LocusShardDataProvider.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/LocusView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/LocusView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/LocusView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/LocusView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ManagingReferenceOrderedView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ManagingReferenceOrderedView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ManagingReferenceOrderedView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ManagingReferenceOrderedView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/RODMetaDataContainer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/RODMetaDataContainer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/RODMetaDataContainer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/RODMetaDataContainer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadBasedReferenceOrderedView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadBasedReferenceOrderedView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadBasedReferenceOrderedView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadBasedReferenceOrderedView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadShardDataProvider.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadShardDataProvider.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadShardDataProvider.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadShardDataProvider.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReadView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReadView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReferenceView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ReferenceView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/RodLocusView.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProvider.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProvider.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProvider.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProvider.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/View.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/View.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/View.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/View.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/providers/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/providers/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/providers/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BAMAccessPlan.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BAMAccessPlan.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BAMAccessPlan.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BAMAccessPlan.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BAMSchedule.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BAMSchedule.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BAMSchedule.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BAMSchedule.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BAMScheduler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BAMScheduler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BAMScheduler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BAMScheduler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BGZFBlockLoadingDispatcher.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BGZFBlockLoadingDispatcher.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BGZFBlockLoadingDispatcher.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BGZFBlockLoadingDispatcher.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BlockInputStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BlockInputStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BlockInputStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BlockInputStream.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BlockLoader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BlockLoader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/BlockLoader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/BlockLoader.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/FileHandleCache.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/FileHandleCache.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/FileHandleCache.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/FileHandleCache.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/FilePointer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/FilePointer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/FilePointer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/FilePointer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndex.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndex.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndex.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndex.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexData.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexData.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexData.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexData.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/IntervalSharder.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/IntervalSharder.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/IntervalSharder.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/IntervalSharder.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/LocusShard.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/LocusShard.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/LocusShard.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/LocusShard.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/LocusShardBalancer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/LocusShardBalancer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/LocusShardBalancer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/LocusShardBalancer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ReadShard.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ReadShard.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ReadShard.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ReadShard.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSource.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderID.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderID.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderID.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderID.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/Shard.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/Shard.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/Shard.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/Shard.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ShardBalancer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ShardBalancer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/ShardBalancer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/ShardBalancer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMFileStat.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMFileStat.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMFileStat.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMFileStat.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMTagRenamer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMTagRenamer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMTagRenamer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/BAMTagRenamer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/FindLargeShards.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/FindLargeShards.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/FindLargeShards.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/FindLargeShards.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBAMRegion.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBAMRegion.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBAMRegion.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBAMRegion.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBGZFBounds.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBGZFBounds.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBGZFBounds.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/PrintBGZFBounds.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/UnzipSingleBlock.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/UnzipSingleBlock.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/UnzipSingleBlock.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/UnzipSingleBlock.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reads/utilities/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reads/utilities/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSource.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/reference/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reference/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/reference/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/reference/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/DataStreamSegment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/DataStreamSegment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/DataStreamSegment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/DataStreamSegment.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/EntireStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/EntireStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/EntireStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/EntireStream.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/MappedStreamSegment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/MappedStreamSegment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/MappedStreamSegment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/MappedStreamSegment.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPool.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPool.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPool.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPool.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataSource.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/ResourcePool.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/ResourcePool.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/ResourcePool.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/ResourcePool.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/datasources/rmd/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/datasources/rmd/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsampleType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsampleType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsampleType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsampleType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/Downsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/Downsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/Downsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/Downsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsamplingMethod.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingMethod.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsamplingMethod.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingMethod.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsamplingUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/DownsamplingUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/FractionalDownsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/FractionalDownsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/FractionalDownsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/FractionalDownsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/LevelingDownsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/LevelingDownsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/LevelingDownsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/LevelingDownsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/PassThroughDownsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/PassThroughDownsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/PassThroughDownsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/PassThroughDownsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/ReadsDownsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReadsDownsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/ReadsDownsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReadsDownsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/ReadsDownsamplerFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReadsDownsamplerFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/ReadsDownsamplerFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReadsDownsamplerFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsampler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsampler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsampler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsampler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/examples/GATKDocsExample.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/examples/GATKDocsExample.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/examples/GATKDocsExample.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/examples/GATKDocsExample.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/examples/GATKPaperGenotyper.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/examples/GATKPaperGenotyper.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/examples/GATKPaperGenotyper.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/examples/GATKPaperGenotyper.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/Accumulator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/Accumulator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/Accumulator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/Accumulator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/HierarchicalMicroScheduler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroSchedulerMBean.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/HierarchicalMicroSchedulerMBean.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/HierarchicalMicroSchedulerMBean.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/HierarchicalMicroSchedulerMBean.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/LinearMicroScheduler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/MicroScheduler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/MicroScheduler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/MicroScheduler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/MicroScheduler.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/MicroSchedulerMBean.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/MicroSchedulerMBean.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/MicroSchedulerMBean.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/MicroSchedulerMBean.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/OutputMergeTask.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/OutputMergeTask.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/OutputMergeTask.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/OutputMergeTask.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/ReduceTree.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/ReduceTree.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/ReduceTree.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/ReduceTree.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/ShardTraverser.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/ShardTraverser.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/ShardTraverser.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/ShardTraverser.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/TreeReducer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/TreeReducer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/TreeReducer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/TreeReducer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/WindowMaker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/WindowMaker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/WindowMaker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/WindowMaker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/executive/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/executive/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/executive/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/BadCigarFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/BadCigarFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/BadCigarFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/BadCigarFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/BadMateFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/BadMateFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/BadMateFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/BadMateFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/CountingFilteringIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/CountingFilteringIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/CountingFilteringIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/CountingFilteringIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/DuplicateReadFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/DuplicateReadFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/DuplicateReadFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/DuplicateReadFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/FailsVendorQualityCheckFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/FailsVendorQualityCheckFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/FailsVendorQualityCheckFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/FailsVendorQualityCheckFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/FilterManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/FilterManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/FilterManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/FilterManager.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/LibraryReadFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/LibraryReadFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/LibraryReadFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/LibraryReadFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MalformedReadFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MalformedReadFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MalformedReadFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MalformedReadFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MappingQualityFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MappingQualityFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MappingQualityFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MappingQualityFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MappingQualityUnavailableFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MappingQualityUnavailableFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MappingQualityUnavailableFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MappingQualityUnavailableFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MappingQualityZeroFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MappingQualityZeroFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MappingQualityZeroFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MappingQualityZeroFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MateSameStrandFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MateSameStrandFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MateSameStrandFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MateSameStrandFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MaxInsertSizeFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MaxInsertSizeFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MaxInsertSizeFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MaxInsertSizeFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/MissingReadGroupFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MissingReadGroupFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/MissingReadGroupFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/MissingReadGroupFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/NoOriginalQualityScoresFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/NoOriginalQualityScoresFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/NoOriginalQualityScoresFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/NoOriginalQualityScoresFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/NotPrimaryAlignmentFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/NotPrimaryAlignmentFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/NotPrimaryAlignmentFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/NotPrimaryAlignmentFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/Platform454Filter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/Platform454Filter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/Platform454Filter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/Platform454Filter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/PlatformFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/PlatformFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/PlatformFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/PlatformFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/PlatformUnitFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/PlatformUnitFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/PlatformUnitFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/PlatformUnitFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/PlatformUnitFilterHelper.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/PlatformUnitFilterHelper.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/PlatformUnitFilterHelper.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/PlatformUnitFilterHelper.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReadFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReadFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReadLengthFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadLengthFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReadLengthFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadLengthFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReadNameFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadNameFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReadNameFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadNameFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReadStrandFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadStrandFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReadStrandFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReadStrandFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReassignMappingQualityFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReassignMappingQualityFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReassignMappingQualityFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReassignMappingQualityFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/ReassignOneMappingQualityFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReassignOneMappingQualityFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/ReassignOneMappingQualityFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/ReassignOneMappingQualityFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/SampleFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/SampleFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/SampleFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/SampleFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/SingleReadGroupFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/SingleReadGroupFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/SingleReadGroupFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/SingleReadGroupFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/UnmappedReadFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/UnmappedReadFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/UnmappedReadFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/UnmappedReadFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/filters/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/filters/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/filters/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/DirectOutputTracker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/DirectOutputTracker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/DirectOutputTracker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/DirectOutputTracker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/FastqFileWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/FastqFileWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/FastqFileWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/FastqFileWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/OutputTracker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/OutputTracker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/OutputTracker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/OutputTracker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/StingSAMFileWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/StingSAMFileWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/StingSAMFileWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/StingSAMFileWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/ThreadGroupOutputTracker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/ThreadGroupOutputTracker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/ThreadGroupOutputTracker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/ThreadGroupOutputTracker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/storage/OutputStreamStorage.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/OutputStreamStorage.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/storage/OutputStreamStorage.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/OutputStreamStorage.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/storage/SAMFileWriterStorage.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/SAMFileWriterStorage.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/storage/SAMFileWriterStorage.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/SAMFileWriterStorage.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/storage/Storage.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/Storage.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/storage/Storage.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/Storage.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/storage/StorageFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/StorageFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/storage/StorageFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/StorageFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/storage/VariantContextWriterStorage.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/VariantContextWriterStorage.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/storage/VariantContextWriterStorage.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/storage/VariantContextWriterStorage.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/OutputStreamArgumentTypeDescriptor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/OutputStreamArgumentTypeDescriptor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/OutputStreamArgumentTypeDescriptor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/OutputStreamArgumentTypeDescriptor.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/OutputStreamStub.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/OutputStreamStub.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/OutputStreamStub.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/OutputStreamStub.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/SAMFileReaderArgumentTypeDescriptor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/SAMFileReaderArgumentTypeDescriptor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/SAMFileReaderArgumentTypeDescriptor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/SAMFileReaderArgumentTypeDescriptor.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterArgumentTypeDescriptor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterArgumentTypeDescriptor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterArgumentTypeDescriptor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterArgumentTypeDescriptor.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterStub.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterStub.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterStub.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/SAMFileWriterStub.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/Stub.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/Stub.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/Stub.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/Stub.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/VCFWriterArgumentTypeDescriptor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/VCFWriterArgumentTypeDescriptor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/VCFWriterArgumentTypeDescriptor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/VCFWriterArgumentTypeDescriptor.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/io/stubs/VariantContextWriterStub.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/VariantContextWriterStub.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/io/stubs/VariantContextWriterStub.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/io/stubs/VariantContextWriterStub.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/BoundedReadIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/BoundedReadIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/BoundedReadIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/BoundedReadIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/GATKSAMIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/GATKSAMIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/GATKSAMIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/GATKSAMIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/GenomeLocusIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/GenomeLocusIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/GenomeLocusIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/GenomeLocusIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/IterableIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/IterableIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/IterableIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/IterableIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/MalformedBAMErrorReformatingIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/MalformedBAMErrorReformatingIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/MalformedBAMErrorReformatingIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/MalformedBAMErrorReformatingIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/NullSAMIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/NullSAMIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/NullSAMIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/NullSAMIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/PeekingIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/PeekingIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/PeekingIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/PeekingIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/PositionTrackingIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/PositionTrackingIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/PositionTrackingIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/PositionTrackingIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/PushbackIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/PushbackIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/PushbackIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/PushbackIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/ReadFormattingIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/ReadFormattingIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/ReadFormattingIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/ReadFormattingIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/ReadTransformer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/ReadTransformer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/ReadTransformer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/ReadTransformer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/ReadTransformersMode.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/ReadTransformersMode.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/ReadTransformersMode.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/ReadTransformersMode.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/StingSAMIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/StingSAMIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/StingSAMIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/StingSAMIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/VerifyingSamIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/VerifyingSamIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/VerifyingSamIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/VerifyingSamIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/iterators/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/iterators/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/iterators/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/phonehome/GATKRunReport.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/phonehome/GATKRunReport.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/phonehome/GATKRunReport.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/phonehome/GATKRunReport.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/phonehome/GATKRunReportException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/phonehome/GATKRunReportException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/phonehome/GATKRunReportException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/phonehome/GATKRunReportException.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/RODRecordListImpl.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/RODRecordListImpl.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/RODRecordListImpl.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/RODRecordListImpl.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/RefMetaDataTracker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/RefMetaDataTracker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/RefMetaDataTracker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/RefMetaDataTracker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/ReferenceDependentFeatureCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/ReferenceDependentFeatureCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/ReferenceDependentFeatureCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/ReferenceDependentFeatureCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/ReferenceOrderedDatum.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/ReferenceOrderedDatum.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/ReferenceOrderedDatum.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/ReferenceOrderedDatum.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/SeekableRODIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/SeekableRODIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/SeekableRODIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/SeekableRODIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/VariantContextAdaptors.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/VariantContextAdaptors.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/VariantContextAdaptors.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/VariantContextAdaptors.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManager.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/IndexDictionaryUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/IndexDictionaryUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/IndexDictionaryUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/IndexDictionaryUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrack.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrack.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrack.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrack.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilder.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilder.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilder.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilder.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/utils/GATKFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/GATKFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/utils/GATKFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/GATKFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/utils/LocationAwareSeekableRODIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/LocationAwareSeekableRODIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/utils/LocationAwareSeekableRODIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/LocationAwareSeekableRODIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/utils/RMDTriplet.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/RMDTriplet.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/utils/RMDTriplet.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/RMDTriplet.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/refdata/utils/RODRecordList.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/RODRecordList.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/refdata/utils/RODRecordList.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/refdata/utils/RODRecordList.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReport.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReport.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReport.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReport.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReportColumn.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportColumn.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReportColumn.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportColumn.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReportColumnFormat.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportColumnFormat.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReportColumnFormat.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportColumnFormat.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReportDataType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportDataType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReportDataType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportDataType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReportGatherer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportGatherer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReportGatherer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportGatherer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReportTable.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportTable.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReportTable.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportTable.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/report/GATKReportVersion.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportVersion.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/report/GATKReportVersion.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/report/GATKReportVersion.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/resourcemanagement/ThreadAllocation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/resourcemanagement/ThreadAllocation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/resourcemanagement/ThreadAllocation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/resourcemanagement/ThreadAllocation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/Affection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Affection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/Affection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Affection.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/Gender.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Gender.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/Gender.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Gender.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/PedReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/PedReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/PedReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/PedReader.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/PedigreeValidationType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/PedigreeValidationType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/PedigreeValidationType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/PedigreeValidationType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/Sample.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Sample.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/Sample.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Sample.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/SampleDB.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/SampleDB.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/SampleDB.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/SampleDB.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/SampleDBBuilder.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/SampleDBBuilder.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/SampleDBBuilder.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/SampleDBBuilder.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/samples/Trio.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Trio.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/samples/Trio.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/samples/Trio.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCache.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCache.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCache.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCache.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegions.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegions.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegions.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegions.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseDuplicates.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseDuplicates.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseDuplicates.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseDuplicates.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseLociNano.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseLociNano.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseLociNano.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseLociNano.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReadPairs.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseReadPairs.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReadPairs.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseReadPairs.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReadsNano.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseReadsNano.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/TraverseReadsNano.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/TraverseReadsNano.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/traversals/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/traversals/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/traversals/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/ActiveRegionTraversalParameters.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ActiveRegionTraversalParameters.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/ActiveRegionTraversalParameters.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ActiveRegionTraversalParameters.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/ActiveRegionWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ActiveRegionWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/ActiveRegionWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ActiveRegionWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Allows.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Allows.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Allows.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Allows.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Attribution.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Attribution.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Attribution.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Attribution.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/BAQMode.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/BAQMode.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/BAQMode.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/BAQMode.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/By.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/By.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/By.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/By.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/DataSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/DataSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/DataSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/DataSource.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Downsample.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Downsample.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Downsample.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Downsample.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/DuplicateWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/DuplicateWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/DuplicateWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/DuplicateWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/LocusWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/LocusWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/LocusWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/LocusWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Multiplex.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Multiplex.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Multiplex.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Multiplex.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Multiplexer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Multiplexer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Multiplexer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Multiplexer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/NanoSchedulable.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/NanoSchedulable.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/NanoSchedulable.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/NanoSchedulable.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/PartitionBy.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/PartitionBy.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/PartitionBy.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/PartitionBy.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/PartitionType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/PartitionType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/PartitionType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/PartitionType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/RMD.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RMD.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/RMD.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RMD.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/ReadFilters.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ReadFilters.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/ReadFilters.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ReadFilters.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/ReadPairWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ReadPairWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/ReadPairWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ReadPairWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/ReadWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ReadWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/ReadWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/ReadWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/RefWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RefWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/RefWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RefWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Reference.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Reference.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Reference.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Reference.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/RemoveProgramRecords.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RemoveProgramRecords.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/RemoveProgramRecords.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RemoveProgramRecords.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Requires.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Requires.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Requires.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Requires.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/RodWalker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RodWalker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/RodWalker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/RodWalker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/TreeReducible.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/TreeReducible.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/TreeReducible.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/TreeReducible.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Walker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Walker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Walker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Walker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/WalkerName.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/WalkerName.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/WalkerName.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/WalkerName.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/Window.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Window.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/Window.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/Window.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalance.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalance.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalance.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalance.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalanceBySample.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalanceBySample.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalanceBySample.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/AlleleBalanceBySample.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/BaseCounts.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/BaseCounts.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/BaseCounts.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/BaseCounts.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCountConstants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCountConstants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCountConstants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/ChromosomeCountConstants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/LowMQ.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/LowMQ.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/LowMQ.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/LowMQ.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZeroBySample.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZeroBySample.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZeroBySample.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/MappingQualityZeroBySample.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/NBaseCount.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/NBaseCount.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/NBaseCount.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/NBaseCount.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SnpEff.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEff.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SnpEff.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEff.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtil.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtil.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtil.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtil.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorEngine.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorEngine.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorEngine.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorEngine.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/VariantOverlapAnnotator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ActiveRegionBasedAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ActiveRegionBasedAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ActiveRegionBasedAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ActiveRegionBasedAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationInterfaceManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationInterfaceManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationInterfaceManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationInterfaceManager.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotationType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotatorCompatible.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotatorCompatible.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotatorCompatible.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/AnnotatorCompatible.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ExperimentalAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ExperimentalAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ExperimentalAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/ExperimentalAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/GenotypeAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/GenotypeAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/GenotypeAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/GenotypeAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/InfoFieldAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/InfoFieldAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/InfoFieldAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/InfoFieldAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/RodRequiringAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/RodRequiringAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/RodRequiringAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/RodRequiringAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/StandardAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/StandardAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/StandardAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/StandardAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/VariantAnnotatorAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/VariantAnnotatorAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/VariantAnnotatorAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/VariantAnnotatorAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/WorkInProgressAnnotation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/WorkInProgressAnnotation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/WorkInProgressAnnotation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/annotator/interfaces/WorkInProgressAnnotation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/beagle/BeagleOutputToVCF.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/beagle/ProduceBeagleInput.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/beagle/VariantsToBeagleUnphased.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/CallableLoci.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLoci.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CoverageUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/CoverageUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/CoverageUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/CoverageUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverage.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverage.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverage.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverage.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageStats.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageStats.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageStats.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageStats.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DoCOutputType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/DoCOutputType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/DoCOutputType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/DoCOutputType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/GCContentByInterval.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/GCContentByInterval.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/coverage/GCContentByInterval.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/coverage/GCContentByInterval.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/CoveredByNSamplesSites.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/CoveredByNSamplesSites.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/CoveredByNSamplesSites.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/CoveredByNSamplesSites.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycle.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycle.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycle.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ErrorRatePerCycle.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupProperties.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupProperties.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupProperties.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadGroupProperties.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadLengthDistribution.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadLengthDistribution.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadLengthDistribution.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diagnostics/ReadLengthDistribution.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/BAMDiffableReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/BAMDiffableReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/BAMDiffableReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/BAMDiffableReader.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffElement.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffElement.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffElement.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffElement.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngine.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngine.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngine.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffEngine.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNode.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNode.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNode.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffNode.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjects.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjects.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjects.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffObjects.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffValue.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffValue.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffValue.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffValue.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/DiffableReader.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/Difference.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/Difference.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/Difference.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/Difference.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/GATKReportDiffableReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/GATKReportDiffableReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/GATKReportDiffableReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/GATKReportDiffableReader.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/VCFDiffableReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/VCFDiffableReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/diffengine/VCFDiffableReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/diffengine/VCFDiffableReader.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceMaker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceMaker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceMaker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceMaker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaReferenceMaker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaReferenceMaker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaReferenceMaker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaReferenceMaker.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaSequence.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaSequence.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaSequence.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaSequence.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaStats.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaStats.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaStats.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/fasta/FastaStats.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/filters/ClusteredSnps.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/ClusteredSnps.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/filters/ClusteredSnps.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/ClusteredSnps.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContext.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContext.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContext.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContext.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContextWindow.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContextWindow.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContextWindow.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/FiltrationContextWindow.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltration.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltration.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltration.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/filters/VariantFiltration.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCMappingQualityFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCMappingQualityFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCMappingQualityFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/haplotypecaller/HCMappingQualityFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CheckPileup.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CheckPileup.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CheckPileup.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CheckPileup.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountBases.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountBases.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountBases.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountBases.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountIntervals.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountIntervals.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountIntervals.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountIntervals.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountLoci.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountLoci.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountLoci.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountLoci.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountMales.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountMales.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountMales.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountMales.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODs.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountRODs.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODs.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountRODs.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRef.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRef.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRef.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRef.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountReadEvents.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountReadEvents.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountReadEvents.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountReadEvents.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountReads.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountReads.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountReads.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountReads.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountTerminusEvent.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountTerminusEvent.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountTerminusEvent.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/CountTerminusEvent.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/DocumentationTest.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/DocumentationTest.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/DocumentationTest.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/DocumentationTest.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/ErrorThrowing.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/FlagStat.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/FlagStat.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/FlagStat.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/FlagStat.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/Pileup.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/Pileup.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/Pileup.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/Pileup.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/PrintRODs.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/PrintRODs.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/PrintRODs.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/PrintRODs.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/QCRef.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/QCRef.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/QCRef.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/QCRef.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ReadClippingStats.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/ReadClippingStats.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/ReadClippingStats.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/ReadClippingStats.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/RodSystemValidation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/RodSystemValidation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/qc/RodSystemValidation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/qc/RodSystemValidation.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/ClipReads.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/ClipReads.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/ClipReads.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/ClipReads.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/PrintReads.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReads.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/PrintReads.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReads.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmer.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/SplitSamFile.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/SplitSamFile.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/SplitSamFile.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/readutils/SplitSamFile.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmplicons.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmplicons.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmplicons.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/validation/ValidationAmplicons.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEval.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEval.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEval.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEval.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalReportWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalReportWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalReportWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/VariantEvalReportWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CompOverlap.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CompOverlap.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CompOverlap.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CompOverlap.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CountVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CountVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CountVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/CountVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelLengthHistogram.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelLengthHistogram.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelLengthHistogram.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelLengthHistogram.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelSummary.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelSummary.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelSummary.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/IndelSummary.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MendelianViolationEvaluator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MendelianViolationEvaluator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MendelianViolationEvaluator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MendelianViolationEvaluator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MultiallelicSummary.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MultiallelicSummary.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MultiallelicSummary.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/MultiallelicSummary.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/PrintMissingComp.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/PrintMissingComp.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/PrintMissingComp.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/PrintMissingComp.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/StandardEval.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/StandardEval.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/StandardEval.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/StandardEval.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ThetaVariantEvaluator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ThetaVariantEvaluator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ThetaVariantEvaluator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ThetaVariantEvaluator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/TiTvVariantEvaluator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/TiTvVariantEvaluator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/TiTvVariantEvaluator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/TiTvVariantEvaluator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ValidationReport.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ValidationReport.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ValidationReport.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/ValidationReport.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantEvaluator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantEvaluator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantEvaluator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantEvaluator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantSummary.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantSummary.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantSummary.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/evaluators/VariantSummary.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleCount.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleCount.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleCount.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleCount.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleFrequency.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleFrequency.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleFrequency.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/AlleleFrequency.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CompRod.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CompRod.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CompRod.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CompRod.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Contig.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Contig.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Contig.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Contig.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CpG.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CpG.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CpG.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/CpG.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Degeneracy.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Degeneracy.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Degeneracy.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Degeneracy.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/DynamicStratification.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/DynamicStratification.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/DynamicStratification.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/DynamicStratification.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/EvalRod.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/EvalRod.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/EvalRod.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/EvalRod.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Filter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Filter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Filter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Filter.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/FunctionalClass.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/FunctionalClass.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/FunctionalClass.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/FunctionalClass.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IndelSize.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IndelSize.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IndelSize.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IndelSize.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IntervalStratification.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IntervalStratification.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IntervalStratification.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/IntervalStratification.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/JexlExpression.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/JexlExpression.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/JexlExpression.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/JexlExpression.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Novelty.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Novelty.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Novelty.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Novelty.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/OneBPIndel.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/OneBPIndel.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/OneBPIndel.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/OneBPIndel.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/RequiredStratification.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/RequiredStratification.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/RequiredStratification.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/RequiredStratification.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Sample.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Sample.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Sample.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/Sample.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/SnpEffPositionModifier.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/SnpEffPositionModifier.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/SnpEffPositionModifier.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/SnpEffPositionModifier.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/StandardStratification.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/StandardStratification.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/StandardStratification.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/StandardStratification.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/TandemRepeat.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/TandemRepeat.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/TandemRepeat.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/TandemRepeat.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantStratifier.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantStratifier.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantStratifier.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantStratifier.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/VariantType.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNode.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNode.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNode.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNode.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNodeIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNodeIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNodeIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratNodeIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/StratificationManager.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/Stratifier.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/Stratifier.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/Stratifier.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/stratifications/manager/Stratifier.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/Analysis.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/Analysis.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/Analysis.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/Analysis.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/AnalysisModuleScanner.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/AnalysisModuleScanner.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/AnalysisModuleScanner.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/AnalysisModuleScanner.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/DataPoint.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/DataPoint.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/DataPoint.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/DataPoint.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/EvaluationContext.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/EvaluationContext.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/EvaluationContext.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/EvaluationContext.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/Molten.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/Molten.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/Molten.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/Molten.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/SortableJexlVCMatchExp.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/SortableJexlVCMatchExp.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/SortableJexlVCMatchExp.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/SortableJexlVCMatchExp.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/VariantEvalUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/VariantEvalUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/varianteval/util/VariantEvalUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/varianteval/util/VariantEvalUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VQSRCalibrationCurve.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VQSRCalibrationCurve.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VQSRCalibrationCurve.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantrecalibration/VQSRCalibrationCurve.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/CombineVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetrics.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetrics.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetrics.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/ConcordanceMetrics.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordance.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordance.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordance.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/GenotypeConcordance.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/LeftAlignAndTrimVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/LiftoverVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/RandomlySplitVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/RandomlySplitVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/RandomlySplitVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/RandomlySplitVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectHeaders.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectHeaders.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectHeaders.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectHeaders.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/ValidateVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantValidationAssessor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantValidationAssessor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantValidationAssessor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantValidationAssessor.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitives.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitives.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitives.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToAllelicPrimitives.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPed.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPed.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPed.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToBinaryPed.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTable.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTable.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTable.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToTable.java
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCF.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCF.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCF.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/gatk/walkers/variantutils/VariantsToVCF.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/clibrary/JNAUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/clibrary/JNAUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/clibrary/JNAUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/clibrary/JNAUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/clibrary/LibC.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/clibrary/LibC.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/clibrary/LibC.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/clibrary/LibC.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobInfo.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobInfo.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobInfo.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobInfo.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobTemplate.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobTemplate.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobTemplate.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaJobTemplate.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSession.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSession.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSession.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSession.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaa.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaa.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaa.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaa.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBat.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBat.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBat.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBat.java
diff --git a/public/java/src/org/broadinstitute/sting/jna/lsf/v7_0_6/LibLsf.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/lsf/v7_0_6/LibLsf.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/jna/lsf/v7_0_6/LibLsf.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/jna/lsf/v7_0_6/LibLsf.java
diff --git a/public/java/src/org/broadinstitute/sting/tools/CatVariants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/tools/CatVariants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/tools/CatVariants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/tools/CatVariants.java
diff --git a/public/java/src/org/broadinstitute/sting/tools/ListAnnotations.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/tools/ListAnnotations.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/tools/ListAnnotations.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/tools/ListAnnotations.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/AutoFormattingTime.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/AutoFormattingTime.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/AutoFormattingTime.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/AutoFormattingTime.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/BaseUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/BaseUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/BaseUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/BaseUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/BitSetUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/BitSetUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/BitSetUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/BitSetUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/ContigComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/ContigComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/ContigComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/ContigComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/DeprecatedToolChecks.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/DeprecatedToolChecks.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/DeprecatedToolChecks.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/DeprecatedToolChecks.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/GenomeLoc.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/GenomeLoc.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/GenomeLoc.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/GenomeLoc.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/GenomeLocParser.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/GenomeLocParser.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/GenomeLocParser.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/GenomeLocParser.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/GenomeLocSortedSet.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/GenomeLocSortedSet.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/GenomeLocSortedSet.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/GenomeLocSortedSet.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/HasGenomeLocation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/HasGenomeLocation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/HasGenomeLocation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/HasGenomeLocation.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/HeapSizeMonitor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/HeapSizeMonitor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/HeapSizeMonitor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/HeapSizeMonitor.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/IndelUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/IndelUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/IndelUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/IndelUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/LRUCache.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/LRUCache.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/LRUCache.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/LRUCache.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/MRUCachingSAMSequenceDictionary.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MRUCachingSAMSequenceDictionary.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/MRUCachingSAMSequenceDictionary.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MRUCachingSAMSequenceDictionary.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/MannWhitneyU.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MannWhitneyU.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/MannWhitneyU.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MannWhitneyU.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/MathUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MathUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/MathUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MathUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/Median.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/Median.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/Median.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/Median.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/MendelianViolation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MendelianViolation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/MendelianViolation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MendelianViolation.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/MultiThreadedErrorTracker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MultiThreadedErrorTracker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/MultiThreadedErrorTracker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/MultiThreadedErrorTracker.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/NGSPlatform.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/NGSPlatform.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/NGSPlatform.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/NGSPlatform.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/PathUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/PathUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/PathUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/PathUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/QualityUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/QualityUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/QualityUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/QualityUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RScriptExecutor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RScriptExecutor.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutorException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RScriptExecutorException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutorException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RScriptExecutorException.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/R/RScriptLibrary.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RScriptLibrary.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/R/RScriptLibrary.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RScriptLibrary.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/R/RUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/R/RUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/R/RUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/SampleUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/SampleUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/SampleUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/SampleUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/SequenceDictionaryUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/SequenceDictionaryUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/SequenceDictionaryUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/SequenceDictionaryUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/SimpleTimer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/SimpleTimer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/SimpleTimer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/SimpleTimer.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/UnvalidatingGenomeLoc.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/UnvalidatingGenomeLoc.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/UnvalidatingGenomeLoc.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/UnvalidatingGenomeLoc.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/Utils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/Utils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/Utils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/Utils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/activeregion/ActiveRegion.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActiveRegion.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/activeregion/ActiveRegion.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActiveRegion.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/activeregion/ActiveRegionReadState.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActiveRegionReadState.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/activeregion/ActiveRegionReadState.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActiveRegionReadState.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/activeregion/ActivityProfile.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActivityProfile.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/activeregion/ActivityProfile.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActivityProfile.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/activeregion/ActivityProfileState.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActivityProfileState.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/activeregion/ActivityProfileState.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/ActivityProfileState.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfile.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfile.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfile.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfile.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/analysis/AminoAcid.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/analysis/AminoAcid.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/analysis/AminoAcid.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/analysis/AminoAcid.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/analysis/AminoAcidTable.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/analysis/AminoAcidTable.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/analysis/AminoAcidTable.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/analysis/AminoAcidTable.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/analysis/AminoAcidUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/analysis/AminoAcidUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/analysis/AminoAcidUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/analysis/AminoAcidUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/baq/BAQ.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/baq/BAQ.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/baq/BAQ.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/baq/BAQ.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/baq/BAQReadTransformer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/baq/BAQReadTransformer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/baq/BAQReadTransformer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/baq/BAQReadTransformer.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/baq/ReadTransformingIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/baq/ReadTransformingIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/baq/ReadTransformingIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/baq/ReadTransformingIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/classloader/JVMUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/JVMUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/classloader/JVMUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/JVMUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/classloader/PluginManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/PluginManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/classloader/PluginManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/PluginManager.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/classloader/ProtectedPackageSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/ProtectedPackageSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/classloader/ProtectedPackageSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/ProtectedPackageSource.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/classloader/PublicPackageSource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/PublicPackageSource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/classloader/PublicPackageSource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/classloader/PublicPackageSource.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/clipping/ClippingOp.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/clipping/ClippingOp.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/clipping/ClippingOp.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/clipping/ClippingOp.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/clipping/ClippingRepresentation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/clipping/ClippingRepresentation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/clipping/ClippingRepresentation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/clipping/ClippingRepresentation.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/clipping/ReadClipper.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/clipping/ReadClipper.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/clipping/ReadClipper.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/clipping/ReadClipper.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/beagle/BeagleCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/beagle/BeagleCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/beagle/BeagleCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/beagle/BeagleCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/beagle/BeagleFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/beagle/BeagleFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/beagle/BeagleFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/beagle/BeagleFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/hapmap/RawHapMapFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/refseq/RefSeqCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/refseq/RefSeqCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/refseq/RefSeqCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/refseq/RefSeqCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/refseq/RefSeqFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/refseq/RefSeqFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/refseq/RefSeqFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/refseq/RefSeqFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/refseq/Transcript.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/refseq/Transcript.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/refseq/Transcript.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/refseq/Transcript.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/sampileup/SAMPileupFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/samread/SAMReadCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/samread/SAMReadCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/samread/SAMReadCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/samread/SAMReadCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/samread/SAMReadFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/samread/SAMReadFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/samread/SAMReadFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/samread/SAMReadFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/table/BedTableCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/table/BedTableCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/table/BedTableCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/table/BedTableCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/table/TableCodec.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/table/TableCodec.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/table/TableCodec.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/table/TableCodec.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/codecs/table/TableFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/table/TableFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/codecs/table/TableFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/codecs/table/TableFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/DefaultHashMap.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/DefaultHashMap.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/DefaultHashMap.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/DefaultHashMap.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/ExpandingArrayList.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/ExpandingArrayList.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/ExpandingArrayList.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/ExpandingArrayList.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/LoggingNestedIntegerArray.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/LoggingNestedIntegerArray.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/LoggingNestedIntegerArray.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/LoggingNestedIntegerArray.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/NestedIntegerArray.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/NestedIntegerArray.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/NestedIntegerArray.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/NestedIntegerArray.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/Pair.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/Pair.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/Pair.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/Pair.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/PrimitivePair.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/PrimitivePair.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/PrimitivePair.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/PrimitivePair.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/collections/RODMergingIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/RODMergingIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/collections/RODMergingIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/collections/RODMergingIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/crypt/CryptUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/crypt/CryptUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/crypt/CryptUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/crypt/CryptUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/crypt/GATKKey.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/crypt/GATKKey.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/crypt/GATKKey.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/crypt/GATKKey.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/duplicates/DupUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/duplicates/DupUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/duplicates/DupUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/duplicates/DupUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/duplicates/DuplicateComp.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/duplicates/DuplicateComp.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/duplicates/DuplicateComp.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/duplicates/DuplicateComp.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/exceptions/DynamicClassResolutionException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/DynamicClassResolutionException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/exceptions/DynamicClassResolutionException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/DynamicClassResolutionException.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/exceptions/ReviewedStingException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/ReviewedStingException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/exceptions/ReviewedStingException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/ReviewedStingException.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/exceptions/StingException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/StingException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/exceptions/StingException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/StingException.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/exceptions/UserException.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/UserException.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/exceptions/UserException.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/exceptions/UserException.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/fasta/ArtificialFastaUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fasta/ArtificialFastaUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/fasta/ArtificialFastaUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fasta/ArtificialFastaUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFile.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFile.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFile.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFile.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/fasta/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fasta/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/fasta/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fasta/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/file/FSLockWithShared.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/file/FSLockWithShared.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/file/FSLockWithShared.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/file/FSLockWithShared.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/fragments/FragmentCollection.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fragments/FragmentCollection.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/fragments/FragmentCollection.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fragments/FragmentCollection.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/fragments/FragmentUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fragments/FragmentUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/fragments/FragmentUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/fragments/FragmentUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/genotyper/DiploidGenotype.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/genotyper/DiploidGenotype.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/genotyper/DiploidGenotype.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/genotyper/DiploidGenotype.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/genotyper/MostLikelyAllele.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/genotyper/MostLikelyAllele.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/genotyper/MostLikelyAllele.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/genotyper/MostLikelyAllele.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMap.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMap.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMap.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/genotyper/PerReadAlleleLikelihoodMap.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/haplotype/EventMap.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/EventMap.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/haplotype/EventMap.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/EventMap.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/haplotype/Haplotype.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/Haplotype.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/haplotype/Haplotype.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/Haplotype.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeBaseComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeScoreComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/haplotype/HaplotypeSizeAndBaseComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/ApplicationDetails.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ApplicationDetails.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/ApplicationDetails.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ApplicationDetails.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/DocletUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocletUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/DocletUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocletUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/DocumentedGATKFeature.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocumentedGATKFeature.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/DocumentedGATKFeature.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocumentedGATKFeature.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureHandler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureHandler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureHandler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureHandler.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureObject.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureObject.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureObject.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/DocumentedGATKFeatureObject.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/ForumAPIUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ForumAPIUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/ForumAPIUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ForumAPIUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/ForumDiscussion.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ForumDiscussion.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/ForumDiscussion.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ForumDiscussion.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/GATKDocUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GATKDocUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/GATKDocUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GATKDocUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/GATKDocWorkUnit.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GATKDocWorkUnit.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/GATKDocWorkUnit.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GATKDocWorkUnit.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GATKDoclet.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/GATKDoclet.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GATKDoclet.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/GenericDocumentationHandler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GenericDocumentationHandler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/GenericDocumentationHandler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/GenericDocumentationHandler.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/HelpConstants.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/HelpConstants.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/HelpConstants.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/HelpConstants.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/HelpFormatter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/HelpFormatter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/HelpFormatter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/HelpFormatter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/HelpUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/HelpUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/HelpUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/HelpUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/help/ResourceBundleExtractorDoclet.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ResourceBundleExtractorDoclet.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/help/ResourceBundleExtractorDoclet.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/help/ResourceBundleExtractorDoclet.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/instrumentation/Sizeof.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/instrumentation/Sizeof.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/instrumentation/Sizeof.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/instrumentation/Sizeof.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/interval/IntervalMergingRule.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/interval/IntervalMergingRule.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/interval/IntervalMergingRule.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/interval/IntervalMergingRule.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/interval/IntervalSetRule.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/interval/IntervalSetRule.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/interval/IntervalSetRule.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/interval/IntervalSetRule.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/interval/IntervalUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/interval/IntervalUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/interval/IntervalUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/interval/IntervalUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/io/FileExtension.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/FileExtension.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/io/FileExtension.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/FileExtension.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/io/HardThresholdingOutputStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/HardThresholdingOutputStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/io/HardThresholdingOutputStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/HardThresholdingOutputStream.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/io/IOUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/IOUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/io/IOUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/IOUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/io/Resource.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/Resource.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/io/Resource.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/io/Resource.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachine.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachine.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachine.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachine.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/LIBSDownsamplingInfo.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LIBSDownsamplingInfo.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/LIBSDownsamplingInfo.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LIBSDownsamplingInfo.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/LIBSPerformance.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LIBSPerformance.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/LIBSPerformance.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LIBSPerformance.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/LocusIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LocusIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/LocusIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LocusIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByState.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByState.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByState.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByState.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManager.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/ReadStateManager.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/ReadStateManager.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/ReadStateManager.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/ReadStateManager.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/locusiterator/SamplePartitioner.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/SamplePartitioner.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/locusiterator/SamplePartitioner.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/locusiterator/SamplePartitioner.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/EOFMarkedValue.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/EOFMarkedValue.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/EOFMarkedValue.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/EOFMarkedValue.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/InputProducer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/InputProducer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/InputProducer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/InputProducer.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/MapResult.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/MapResult.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/MapResult.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/MapResult.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/MapResultsQueue.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/MapResultsQueue.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/MapResultsQueue.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/MapResultsQueue.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NSMapFunction.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NSMapFunction.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NSMapFunction.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NSMapFunction.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NSProgressFunction.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NSProgressFunction.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NSProgressFunction.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NSProgressFunction.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NSReduceFunction.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NSReduceFunction.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NSReduceFunction.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NSReduceFunction.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NanoScheduler.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NanoScheduler.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/NanoScheduler.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/NanoScheduler.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/nanoScheduler/Reducer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/Reducer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/nanoScheduler/Reducer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/nanoScheduler/Reducer.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pairhmm/BatchPairHMM.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/BatchPairHMM.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pairhmm/BatchPairHMM.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/BatchPairHMM.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pairhmm/Log10PairHMM.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/Log10PairHMM.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pairhmm/Log10PairHMM.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/Log10PairHMM.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pairhmm/N2MemoryPairHMM.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/N2MemoryPairHMM.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pairhmm/N2MemoryPairHMM.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/N2MemoryPairHMM.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pairhmm/PairHMM.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/PairHMM.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pairhmm/PairHMM.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/PairHMM.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pairhmm/PairHMMModel.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/PairHMMModel.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pairhmm/PairHMMModel.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/PairHMMModel.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pairhmm/PairHMMReadyHaplotypes.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/PairHMMReadyHaplotypes.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pairhmm/PairHMMReadyHaplotypes.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pairhmm/PairHMMReadyHaplotypes.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup/MergingPileupElementIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/MergingPileupElementIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup/MergingPileupElementIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/MergingPileupElementIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup/PileupElement.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/PileupElement.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup/PileupElement.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/PileupElement.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup/PileupElementFilter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/PileupElementFilter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup/PileupElementFilter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/PileupElementFilter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup/PileupElementTracker.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/PileupElementTracker.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup/PileupElementTracker.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/PileupElementTracker.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup/ReadBackedPileup.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/ReadBackedPileup.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup/ReadBackedPileup.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/ReadBackedPileup.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup/ReadBackedPileupImpl.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/ReadBackedPileupImpl.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup/ReadBackedPileupImpl.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup/ReadBackedPileupImpl.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/pileup2/Notes b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup2/Notes
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/pileup2/Notes
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/pileup2/Notes
diff --git a/public/java/src/org/broadinstitute/sting/utils/progressmeter/ProgressMeter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/progressmeter/ProgressMeter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemon.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemon.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemon.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemon.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/progressmeter/ProgressMeterData.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterData.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/progressmeter/ProgressMeterData.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterData.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/recalibration/BQSRArgumentSet.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/recalibration/BQSRArgumentSet.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/recalibration/BQSRArgumentSet.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/recalibration/BQSRArgumentSet.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/recalibration/BQSRMode.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/recalibration/BQSRMode.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/recalibration/BQSRMode.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/recalibration/BQSRMode.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/recalibration/EventType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/recalibration/EventType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/recalibration/EventType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/recalibration/EventType.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/CapturedStreamOutput.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/CapturedStreamOutput.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/CapturedStreamOutput.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/CapturedStreamOutput.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/InputStreamSettings.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/InputStreamSettings.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/InputStreamSettings.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/InputStreamSettings.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/OutputStreamSettings.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/OutputStreamSettings.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/OutputStreamSettings.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/OutputStreamSettings.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/ProcessController.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/ProcessController.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/ProcessController.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/ProcessController.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/ProcessOutput.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/ProcessOutput.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/ProcessOutput.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/ProcessOutput.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/ProcessSettings.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/ProcessSettings.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/ProcessSettings.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/ProcessSettings.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/RuntimeUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/RuntimeUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/RuntimeUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/RuntimeUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/StreamLocation.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/StreamLocation.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/StreamLocation.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/StreamLocation.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/runtime/StreamOutput.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/StreamOutput.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/runtime/StreamOutput.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/runtime/StreamOutput.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/AlignmentStartComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/AlignmentStartComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/AlignmentStartComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/AlignmentStartComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/AlignmentStartWithNoTiesComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/AlignmentStartWithNoTiesComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/AlignmentStartWithNoTiesComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/AlignmentStartWithNoTiesComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/AlignmentUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/AlignmentUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/AlignmentUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/AlignmentUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilder.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilder.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilder.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilder.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialMultiSampleReadStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialMultiSampleReadStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialMultiSampleReadStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialMultiSampleReadStream.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialReadsTraversal.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialReadsTraversal.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialReadsTraversal.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialReadsTraversal.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMFileReader.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIterator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIterator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIterator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIterator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSAMUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSAMUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStream.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStream.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStream.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStream.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamAnalyzer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamAnalyzer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamAnalyzer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamAnalyzer.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ArtificialStingSAMFileWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialStingSAMFileWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ArtificialStingSAMFileWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ArtificialStingSAMFileWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/BySampleSAMFileWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/BySampleSAMFileWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/BySampleSAMFileWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/BySampleSAMFileWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/CigarUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/CigarUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/CigarUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/CigarUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/GATKSAMReadGroupRecord.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/GATKSAMReadGroupRecord.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/GATKSAMReadGroupRecord.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/GATKSAMReadGroupRecord.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/GATKSAMRecord.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/GATKSAMRecord.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/GATKSAMRecord.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/GATKSAMRecord.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/GATKSamRecordFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/GATKSamRecordFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/GATKSamRecordFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/GATKSamRecordFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityReadTransformer.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityReadTransformer.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityReadTransformer.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityReadTransformer.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/NWaySAMFileWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/NWaySAMFileWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/NWaySAMFileWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/NWaySAMFileWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ReadUnclippedStartWithNoTiesComparator.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ReadUnclippedStartWithNoTiesComparator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ReadUnclippedStartWithNoTiesComparator.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ReadUnclippedStartWithNoTiesComparator.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/ReadUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ReadUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/ReadUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/ReadUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/SAMFileReaderBuilder.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/SAMFileReaderBuilder.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/SAMFileReaderBuilder.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/SAMFileReaderBuilder.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/SimplifyingSAMFileWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/SimplifyingSAMFileWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/SimplifyingSAMFileWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/SimplifyingSAMFileWriter.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/sam/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/sam/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/sam/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/GlobalEdgeGreedySWPairwiseAlignment.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/smithwaterman/Parameters.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/Parameters.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/smithwaterman/Parameters.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/Parameters.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignment.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignment.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignment.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignment.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentMain.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentMain.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentMain.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SWPairwiseAlignmentMain.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/smithwaterman/SWParameterSet.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SWParameterSet.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/smithwaterman/SWParameterSet.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SWParameterSet.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/smithwaterman/SmithWaterman.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SmithWaterman.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/smithwaterman/SmithWaterman.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/smithwaterman/SmithWaterman.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/text/ListFileUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/text/ListFileUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/text/ListFileUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/text/ListFileUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/text/TextFormattingUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/text/TextFormattingUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/text/TextFormattingUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/text/TextFormattingUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/text/XReadLines.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/text/XReadLines.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/text/XReadLines.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/text/XReadLines.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/threading/NamedThreadFactory.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/NamedThreadFactory.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/threading/NamedThreadFactory.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/NamedThreadFactory.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/threading/ThreadEfficiencyMonitor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/ThreadEfficiencyMonitor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/threading/ThreadEfficiencyMonitor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/ThreadEfficiencyMonitor.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/threading/ThreadLocalArray.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/ThreadLocalArray.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/threading/ThreadLocalArray.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/ThreadLocalArray.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/threading/ThreadPoolMonitor.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/ThreadPoolMonitor.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/threading/ThreadPoolMonitor.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/ThreadPoolMonitor.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/threading/package-info.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/threading/package-info.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/threading/package-info.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/variant/GATKVCFIndexType.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/variant/GATKVCFIndexType.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/variant/GATKVCFIndexType.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/variant/GATKVCFIndexType.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/variant/GATKVCFUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/variant/GATKVCFUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/variant/GATKVCFUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/variant/GATKVCFUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/variant/GATKVariantContextUtils.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/variant/GATKVariantContextUtils.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/variant/GATKVariantContextUtils.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/variant/GATKVariantContextUtils.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/wiggle/WiggleHeader.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/wiggle/WiggleHeader.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/wiggle/WiggleHeader.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/wiggle/WiggleHeader.java
diff --git a/public/java/src/org/broadinstitute/sting/utils/wiggle/WiggleWriter.java b/public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/wiggle/WiggleWriter.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/utils/wiggle/WiggleWriter.java
rename to public/gatk-framework/src/main/java/org/broadinstitute/sting/utils/wiggle/WiggleWriter.java
diff --git a/public/keys/GATK_public.key b/public/gatk-framework/src/main/resources/GATK_public.key
similarity index 100%
rename from public/keys/GATK_public.key
rename to public/gatk-framework/src/main/resources/GATK_public.key
diff --git a/public/java/src/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_access.key b/public/gatk-framework/src/main/resources/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_access.key
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_access.key
rename to public/gatk-framework/src/main/resources/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_access.key
diff --git a/public/java/src/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_secret.key b/public/gatk-framework/src/main/resources/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_secret.key
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_secret.key
rename to public/gatk-framework/src/main/resources/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_secret.key
diff --git a/public/R/scripts/org/broadinstitute/sting/gatk/walkers/variantrecalibration/plot_Tranches.R b/public/gatk-framework/src/main/resources/org/broadinstitute/sting/gatk/walkers/variantrecalibration/plot_Tranches.R
similarity index 100%
rename from public/R/scripts/org/broadinstitute/sting/gatk/walkers/variantrecalibration/plot_Tranches.R
rename to public/gatk-framework/src/main/resources/org/broadinstitute/sting/gatk/walkers/variantrecalibration/plot_Tranches.R
diff --git a/public/R/scripts/org/broadinstitute/sting/utils/recalibration/BQSR.R b/public/gatk-framework/src/main/resources/org/broadinstitute/sting/utils/recalibration/BQSR.R
similarity index 100%
rename from public/R/scripts/org/broadinstitute/sting/utils/recalibration/BQSR.R
rename to public/gatk-framework/src/main/resources/org/broadinstitute/sting/utils/recalibration/BQSR.R
diff --git a/public/java/test/net/sf/samtools/GATKBAMFileSpanUnitTest.java b/public/gatk-framework/src/test/java/net/sf/samtools/GATKBAMFileSpanUnitTest.java
similarity index 100%
rename from public/java/test/net/sf/samtools/GATKBAMFileSpanUnitTest.java
rename to public/gatk-framework/src/test/java/net/sf/samtools/GATKBAMFileSpanUnitTest.java
diff --git a/public/java/test/net/sf/samtools/GATKChunkUnitTest.java b/public/gatk-framework/src/test/java/net/sf/samtools/GATKChunkUnitTest.java
similarity index 100%
rename from public/java/test/net/sf/samtools/GATKChunkUnitTest.java
rename to public/gatk-framework/src/test/java/net/sf/samtools/GATKChunkUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/BaseTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/BaseTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/BaseTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/BaseTest.java
diff --git a/public/java/test/org/broadinstitute/sting/ExampleToCopyUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/ExampleToCopyUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/ExampleToCopyUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/ExampleToCopyUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/MD5DB.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/MD5DB.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/MD5DB.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/MD5DB.java
diff --git a/public/java/test/org/broadinstitute/sting/MD5Mismatch.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/MD5Mismatch.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/MD5Mismatch.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/MD5Mismatch.java
diff --git a/public/java/test/org/broadinstitute/sting/StingTextReporter.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/StingTextReporter.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/StingTextReporter.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/StingTextReporter.java
diff --git a/public/java/test/org/broadinstitute/sting/TestNGTestTransformer.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/TestNGTestTransformer.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/TestNGTestTransformer.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/TestNGTestTransformer.java
diff --git a/public/java/test/org/broadinstitute/sting/WalkerTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/WalkerTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/WalkerTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/WalkerTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/ArgumentMatchSiteUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ArgumentMatchSiteUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/ArgumentMatchSiteUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ArgumentMatchSiteUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/ArgumentMatchSourceUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ArgumentMatchSourceUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/ArgumentMatchSourceUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ArgumentMatchSourceUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/ArgumentTypeDescriptorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ArgumentTypeDescriptorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/ArgumentTypeDescriptorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ArgumentTypeDescriptorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/InvalidArgumentIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/InvalidArgumentIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/InvalidArgumentIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/InvalidArgumentIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/ParsingEngineUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ParsingEngineUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/ParsingEngineUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/ParsingEngineUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/RodBindingCollectionUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/RodBindingCollectionUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/RodBindingCollectionUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/RodBindingCollectionUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/commandline/RodBindingUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/RodBindingUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/commandline/RodBindingUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/commandline/RodBindingUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/CommandLineGATKUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/CommandLineGATKUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/CommandLineGATKUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/CommandLineGATKUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/EngineFeaturesIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/GenomeAnalysisEngineUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/GenomeAnalysisEngineUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/GenomeAnalysisEngineUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/GenomeAnalysisEngineUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/MaxRuntimeIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/ReadMetricsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/ReadMetricsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/ReadMetricsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/ReadMetricsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/WalkerManagerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/WalkerManagerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/WalkerManagerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/WalkerManagerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/AllLocusViewUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/AllLocusViewUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/AllLocusViewUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/AllLocusViewUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusViewUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusViewUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusViewUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/CoveredLocusViewUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedViewUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedViewUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedViewUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/IntervalReferenceOrderedViewUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceViewUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceViewUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceViewUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/LocusReferenceViewUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/LocusViewTemplate.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/LocusViewTemplate.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/LocusViewTemplate.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/LocusViewTemplate.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceViewUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceViewUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceViewUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ReadReferenceViewUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedViewUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedViewUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedViewUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceOrderedViewUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ReferenceViewTemplate.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceViewTemplate.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ReferenceViewTemplate.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ReferenceViewTemplate.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProviderUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProviderUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProviderUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/providers/ShardDataProviderUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/ActiveRegionShardBalancerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/DownsamplerBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/FilePointerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/FilePointerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/FilePointerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/FilePointerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/GATKBAMIndexUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/GATKWalkerBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/IntervalOverlapFilteringIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/MockLocusShard.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/MockLocusShard.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/MockLocusShard.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/MockLocusShard.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/PicardBaselineBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/ReadProcessingBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/ReadShardBalancerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSourceUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSourceUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSourceUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/SAMDataSourceUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderIDUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderIDUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderIDUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/SAMReaderIDUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/SeekableBufferedStreamUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/SeekableBufferedStreamUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/SeekableBufferedStreamUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/SeekableBufferedStreamUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reads/TheoreticalMinimaBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSourceIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSourceIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSourceIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/reference/ReferenceDataSourceIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPoolUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPoolUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPoolUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedDataPoolUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedQueryDataPoolUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedQueryDataPoolUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedQueryDataPoolUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/datasources/rmd/ReferenceOrderedQueryDataPoolUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/AlleleBiasedDownsamplingUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/DownsamplingIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/DownsamplingIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/DownsamplingReadsIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/FractionalDownsamplerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/LevelingDownsamplerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/LevelingDownsamplerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/LevelingDownsamplerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/LevelingDownsamplerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/PerSampleDownsamplingReadsIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/PositionallyDownsampledArtificialSingleSampleReadStreamAnalyzer.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/PositionallyDownsampledArtificialSingleSampleReadStreamAnalyzer.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/PositionallyDownsampledArtificialSingleSampleReadStreamAnalyzer.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/PositionallyDownsampledArtificialSingleSampleReadStreamAnalyzer.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/ReservoirDownsamplerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/downsampling/SimplePositionalDownsamplerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/executive/ReduceTreeUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/executive/ReduceTreeUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/executive/ReduceTreeUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/executive/ReduceTreeUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/AllowNCigarMalformedReadFilterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/AllowNCigarMalformedReadFilterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/AllowNCigarMalformedReadFilterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/AllowNCigarMalformedReadFilterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/BadCigarFilterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/BadCigarFilterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/BadCigarFilterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/BadCigarFilterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/BadReadGroupsIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/BadReadGroupsIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/BadReadGroupsIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/BadReadGroupsIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/MalformedReadFilterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/MalformedReadFilterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/MalformedReadFilterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/MalformedReadFilterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/ReadFilterTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/ReadFilterTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/ReadFilterTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/ReadFilterTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/ReadGroupBlackListFilterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/filters/UnsafeMalformedReadFilterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/UnsafeMalformedReadFilterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/filters/UnsafeMalformedReadFilterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/filters/UnsafeMalformedReadFilterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/iterators/BoundedReadIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/BoundedReadIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/iterators/BoundedReadIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/BoundedReadIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/iterators/ReadFormattingIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/ReadFormattingIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/iterators/ReadFormattingIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/ReadFormattingIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/StingSAMIteratorAdapterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/iterators/VerifyingSamIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/VerifyingSamIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/iterators/VerifyingSamIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/iterators/VerifyingSamIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/RefMetaDataTrackerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/RefMetaDataTrackerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/RefMetaDataTrackerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/RefMetaDataTrackerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManagerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManagerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManagerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/tracks/FeatureManagerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilderUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilderUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilderUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/tracks/RMDTrackBuilderUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/utils/CheckableCloseableTribbleIterator.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/CheckableCloseableTribbleIterator.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/utils/CheckableCloseableTribbleIterator.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/CheckableCloseableTribbleIterator.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/FeatureToGATKFeatureIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/FlashBackIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/utils/TestFeatureReader.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/TestFeatureReader.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/utils/TestFeatureReader.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/TestFeatureReader.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/refdata/utils/TestRMDTrackBuilder.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/TestRMDTrackBuilder.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/refdata/utils/TestRMDTrackBuilder.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/refdata/utils/TestRMDTrackBuilder.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/report/GATKReportUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/report/GATKReportUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/report/GATKReportUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/report/GATKReportUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/samples/PedReaderUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/samples/PedReaderUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/samples/PedReaderUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/samples/PedReaderUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/samples/SampleDBUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/samples/SampleDBUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/samples/SampleDBUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/samples/SampleDBUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/samples/SampleUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/samples/SampleUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/samples/SampleUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/samples/SampleUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/traversals/DummyActiveRegionWalker.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/DummyActiveRegionWalker.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/traversals/DummyActiveRegionWalker.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/DummyActiveRegionWalker.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCacheUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCacheUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCacheUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TAROrderedReadCacheUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegionsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegionsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegionsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TraverseActiveRegionsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/traversals/TraverseDuplicatesUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TraverseDuplicatesUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/traversals/TraverseDuplicatesUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TraverseDuplicatesUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/traversals/TraverseReadsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TraverseReadsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/traversals/TraverseReadsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/traversals/TraverseReadsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/BAQIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/BAQIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/BAQIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/BAQIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/CNV/SymbolicAllelesIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/CNV/SymbolicAllelesIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/CNV/SymbolicAllelesIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/CNV/SymbolicAllelesIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtilUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtilUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtilUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/annotator/SnpEffUtilUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/CallableLociIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalkerIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalkerIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalkerIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/CompareCallableLociWalkerIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageB36IntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageB36IntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageB36IntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageB36IntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/coverage/DepthOfCoverageIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/CheckPileupIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/CheckPileupIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/qc/CheckPileupIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/CheckPileupIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/CountReadsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/CountReadsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/qc/CountReadsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/CountReadsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/DictionaryConsistencyIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/FlagStatIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/FlagStatIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/qc/FlagStatIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/FlagStatIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/qc/PileupWalkerIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/PileupWalkerIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/qc/PileupWalkerIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/qc/PileupWalkerIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/ClipReadsWalkersIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/ClipReadsWalkersIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/ClipReadsWalkersIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/ClipReadsWalkersIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsLargeScaleTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsLargeScaleTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsLargeScaleTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsLargeScaleTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/PrintReadsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmerIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmerIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmerIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/readutils/ReadAdaptorTrimmerIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariantsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariantsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariantsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/FilterLiftedVariantsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/jna/clibrary/LibCUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/clibrary/LibCUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/jna/clibrary/LibCUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/clibrary/LibCUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionPipelineTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionPipelineTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionPipelineTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionPipelineTest.java
diff --git a/public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaaPipelineTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaaPipelineTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaaPipelineTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/drmaa/v1_0/LibDrmaaPipelineTest.java
diff --git a/public/java/test/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBatPipelineTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBatPipelineTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBatPipelineTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/jna/lsf/v7_0_6/LibBatPipelineTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/AutoFormattingTimeUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/AutoFormattingTimeUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/AutoFormattingTimeUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/AutoFormattingTimeUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/BaseUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/BaseUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/BaseUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/BaseUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/BitSetUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/BitSetUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/BitSetUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/BitSetUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/GenomeLocParserBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocParserBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/GenomeLocParserBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocParserBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/GenomeLocParserUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocParserUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/GenomeLocParserUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocParserUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/GenomeLocSortedSetUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocSortedSetUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/GenomeLocSortedSetUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocSortedSetUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/GenomeLocUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/GenomeLocUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/GenomeLocUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/MRUCachingSAMSequencingDictionaryUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MRUCachingSAMSequencingDictionaryUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/MRUCachingSAMSequencingDictionaryUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MRUCachingSAMSequencingDictionaryUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/MWUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MWUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/MWUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MWUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/MathUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MathUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/MathUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MathUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/MedianUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MedianUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/MedianUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/MedianUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/NGSPlatformUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/NGSPlatformUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/NGSPlatformUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/NGSPlatformUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/PathUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/PathUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/PathUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/PathUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/QualityUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/QualityUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/QualityUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/QualityUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/R/RScriptExecutorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/R/RScriptExecutorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/R/RScriptExecutorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/R/RScriptExecutorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/R/RScriptLibraryUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/R/RScriptLibraryUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/R/RScriptLibraryUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/R/RScriptLibraryUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/R/RUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/R/RUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/R/RUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/R/RUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/SequenceDictionaryUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/SequenceDictionaryUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/SequenceDictionaryUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/SequenceDictionaryUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/SimpleTimerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/SimpleTimerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/SimpleTimerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/SimpleTimerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/UtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/UtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/UtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/UtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/activeregion/ActiveRegionUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/ActiveRegionUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/activeregion/ActiveRegionUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/ActiveRegionUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/activeregion/ActivityProfileStateUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/ActivityProfileStateUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/activeregion/ActivityProfileStateUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/ActivityProfileStateUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/activeregion/ActivityProfileUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/ActivityProfileUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/activeregion/ActivityProfileUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/ActivityProfileUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfileUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfileUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfileUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/activeregion/BandPassActivityProfileUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/baq/BAQUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/baq/BAQUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/baq/BAQUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/baq/BAQUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/classloader/JVMUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/classloader/JVMUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/classloader/JVMUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/classloader/JVMUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/clipping/ReadClipperTestUtils.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/clipping/ReadClipperTestUtils.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/clipping/ReadClipperTestUtils.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/clipping/ReadClipperTestUtils.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/clipping/ReadClipperUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/clipping/ReadClipperUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/clipping/ReadClipperUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/clipping/ReadClipperUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/codecs/hapmap/HapMapUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/codecs/hapmap/HapMapUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/codecs/hapmap/HapMapUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/codecs/hapmap/HapMapUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/collections/DefaultHashMapUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/collections/DefaultHashMapUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/collections/DefaultHashMapUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/collections/DefaultHashMapUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/collections/ExpandingArrayListUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/collections/ExpandingArrayListUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/collections/ExpandingArrayListUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/collections/ExpandingArrayListUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/crypt/CryptUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/crypt/CryptUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/crypt/CryptUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/crypt/CryptUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/crypt/GATKKeyIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/crypt/GATKKeyIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/crypt/GATKKeyIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/crypt/GATKKeyIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/crypt/GATKKeyUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/crypt/GATKKeyUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/crypt/GATKKeyUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/crypt/GATKKeyUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFileUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFileUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFileUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/fasta/CachingIndexedFastaSequenceFileUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/file/FSLockWithSharedUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/file/FSLockWithSharedUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/file/FSLockWithSharedUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/file/FSLockWithSharedUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/fragments/FragmentUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/fragments/FragmentUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/haplotype/EventMapUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/haplotype/EventMapUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/haplotype/EventMapUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/haplotype/EventMapUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/haplotype/HaplotypeUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/haplotype/HaplotypeUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/interval/IntervalIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/interval/IntervalIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/interval/IntervalIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/interval/IntervalIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/interval/IntervalUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/interval/IntervalUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/interval/IntervalUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/interval/IntervalUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/io/IOUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/io/IOUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/io/IOUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/io/IOUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachineUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachineUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachineUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/AlignmentStateMachineUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/locusiterator/LIBS_position.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LIBS_position.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/locusiterator/LIBS_position.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LIBS_position.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/locusiterator/LocusIteratorBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/locusiterator/LocusIteratorBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateBaseTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateBaseTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateBaseTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateBaseTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/LocusIteratorByStateUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManagerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManagerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManagerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/locusiterator/PerSampleReadStateManagerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/nanoScheduler/InputProducerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/InputProducerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/nanoScheduler/InputProducerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/InputProducerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/nanoScheduler/MapResultUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/MapResultUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/nanoScheduler/MapResultUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/MapResultUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/NanoSchedulerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/nanoScheduler/ReducerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/ReducerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/nanoScheduler/ReducerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/nanoScheduler/ReducerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/pileup/PileupElementUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/pileup/PileupElementUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/pileup/PileupElementUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/pileup/PileupElementUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/pileup/ReadBackedPileupUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/pileup/ReadBackedPileupUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/pileup/ReadBackedPileupUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/pileup/ReadBackedPileupUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDataUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDataUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDataUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDataUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/recalibration/EventTypeUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/recalibration/EventTypeUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/recalibration/EventTypeUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/recalibration/EventTypeUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/report/ReportMarshallerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/report/ReportMarshallerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/report/ReportMarshallerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/report/ReportMarshallerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/runtime/ProcessControllerUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/runtime/ProcessControllerUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/runtime/ProcessControllerUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/runtime/ProcessControllerUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/runtime/RuntimeUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/runtime/RuntimeUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/runtime/RuntimeUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/runtime/RuntimeUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/AlignmentUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/AlignmentUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/AlignmentUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/AlignmentUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilderUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilderUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilderUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialBAMBuilderUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialPatternedSAMIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSAMFileWriterUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSAMFileWriterUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSAMFileWriterUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSAMFileWriterUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIteratorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIteratorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIteratorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSAMQueryIteratorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSAMUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSAMUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSAMUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSAMUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ArtificialSingleSampleReadStreamUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/GATKSAMRecordUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/GATKSAMRecordUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/GATKSAMRecordUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/GATKSAMRecordUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/MisencodedBaseQualityUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/sam/ReadUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ReadUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/sam/ReadUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/sam/ReadUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/smithwaterman/SmithWatermanBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/smithwaterman/SmithWatermanBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/smithwaterman/SmithWatermanBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/smithwaterman/SmithWatermanBenchmark.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/text/ListFileUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/text/ListFileUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/text/ListFileUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/text/ListFileUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/text/TextFormattingUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/text/TextFormattingUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/text/TextFormattingUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/text/TextFormattingUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactoryUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactoryUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactoryUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/threading/EfficiencyMonitoringThreadFactoryUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/threading/ThreadPoolMonitorUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/threading/ThreadPoolMonitorUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/threading/ThreadPoolMonitorUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/threading/ThreadPoolMonitorUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/variant/GATKVCFUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/GATKVCFUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/variant/GATKVCFUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/GATKVCFUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/variant/GATKVariantContextUtilsUnitTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/GATKVariantContextUtilsUnitTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/variant/GATKVariantContextUtilsUnitTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/GATKVariantContextUtilsUnitTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/variant/VCFIntegrationTest.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/VCFIntegrationTest.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/variant/VCFIntegrationTest.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/VCFIntegrationTest.java
diff --git a/public/java/test/org/broadinstitute/sting/utils/variant/VariantContextBenchmark.java b/public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/VariantContextBenchmark.java
similarity index 100%
rename from public/java/test/org/broadinstitute/sting/utils/variant/VariantContextBenchmark.java
rename to public/gatk-framework/src/test/java/org/broadinstitute/sting/utils/variant/VariantContextBenchmark.java
diff --git a/public/testdata/exampleBAM.bam b/public/gatk-framework/src/test/resources/exampleBAM.bam
similarity index 100%
rename from public/testdata/exampleBAM.bam
rename to public/gatk-framework/src/test/resources/exampleBAM.bam
diff --git a/public/testdata/exampleBAM.bam.bai b/public/gatk-framework/src/test/resources/exampleBAM.bam.bai
similarity index 100%
rename from public/testdata/exampleBAM.bam.bai
rename to public/gatk-framework/src/test/resources/exampleBAM.bam.bai
diff --git a/public/testdata/exampleBAM.simple.bai b/public/gatk-framework/src/test/resources/exampleBAM.simple.bai
similarity index 100%
rename from public/testdata/exampleBAM.simple.bai
rename to public/gatk-framework/src/test/resources/exampleBAM.simple.bai
diff --git a/public/testdata/exampleBAM.simple.bam b/public/gatk-framework/src/test/resources/exampleBAM.simple.bam
similarity index 100%
rename from public/testdata/exampleBAM.simple.bam
rename to public/gatk-framework/src/test/resources/exampleBAM.simple.bam
diff --git a/public/testdata/exampleDBSNP.vcf b/public/gatk-framework/src/test/resources/exampleDBSNP.vcf
similarity index 100%
rename from public/testdata/exampleDBSNP.vcf
rename to public/gatk-framework/src/test/resources/exampleDBSNP.vcf
diff --git a/public/testdata/exampleDBSNP.vcf.idx b/public/gatk-framework/src/test/resources/exampleDBSNP.vcf.idx
similarity index 100%
rename from public/testdata/exampleDBSNP.vcf.idx
rename to public/gatk-framework/src/test/resources/exampleDBSNP.vcf.idx
diff --git a/public/testdata/exampleFASTA-3contigs.fasta b/public/gatk-framework/src/test/resources/exampleFASTA-3contigs.fasta
similarity index 100%
rename from public/testdata/exampleFASTA-3contigs.fasta
rename to public/gatk-framework/src/test/resources/exampleFASTA-3contigs.fasta
diff --git a/public/testdata/exampleFASTA-combined.fasta b/public/gatk-framework/src/test/resources/exampleFASTA-combined.fasta
similarity index 100%
rename from public/testdata/exampleFASTA-combined.fasta
rename to public/gatk-framework/src/test/resources/exampleFASTA-combined.fasta
diff --git a/public/testdata/exampleFASTA-windows.fasta b/public/gatk-framework/src/test/resources/exampleFASTA-windows.fasta
similarity index 100%
rename from public/testdata/exampleFASTA-windows.fasta
rename to public/gatk-framework/src/test/resources/exampleFASTA-windows.fasta
diff --git a/public/testdata/exampleFASTA.dict b/public/gatk-framework/src/test/resources/exampleFASTA.dict
similarity index 100%
rename from public/testdata/exampleFASTA.dict
rename to public/gatk-framework/src/test/resources/exampleFASTA.dict
diff --git a/public/testdata/exampleFASTA.fasta b/public/gatk-framework/src/test/resources/exampleFASTA.fasta
similarity index 100%
rename from public/testdata/exampleFASTA.fasta
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta
diff --git a/public/testdata/exampleFASTA.fasta.amb b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.amb
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.amb
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.amb
diff --git a/public/testdata/exampleFASTA.fasta.ann b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.ann
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.ann
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.ann
diff --git a/public/testdata/exampleFASTA.fasta.bwt b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.bwt
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.bwt
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.bwt
diff --git a/public/testdata/exampleFASTA.fasta.fai b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.fai
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.fai
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.fai
diff --git a/public/testdata/exampleFASTA.fasta.pac b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.pac
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.pac
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.pac
diff --git a/public/testdata/exampleFASTA.fasta.rbwt b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.rbwt
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.rbwt
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.rbwt
diff --git a/public/testdata/exampleFASTA.fasta.rpac b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.rpac
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.rpac
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.rpac
diff --git a/public/testdata/exampleFASTA.fasta.rsa b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.rsa
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.rsa
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.rsa
diff --git a/public/testdata/exampleFASTA.fasta.sa b/public/gatk-framework/src/test/resources/exampleFASTA.fasta.sa
similarity index 100%
rename from public/testdata/exampleFASTA.fasta.sa
rename to public/gatk-framework/src/test/resources/exampleFASTA.fasta.sa
diff --git a/public/testdata/exampleGATKReport.eval b/public/gatk-framework/src/test/resources/exampleGATKReport.eval
similarity index 100%
rename from public/testdata/exampleGATKReport.eval
rename to public/gatk-framework/src/test/resources/exampleGATKReport.eval
diff --git a/public/testdata/exampleGATKReportv1.tbl b/public/gatk-framework/src/test/resources/exampleGATKReportv1.tbl
similarity index 100%
rename from public/testdata/exampleGATKReportv1.tbl
rename to public/gatk-framework/src/test/resources/exampleGATKReportv1.tbl
diff --git a/public/testdata/exampleGATKReportv2.tbl b/public/gatk-framework/src/test/resources/exampleGATKReportv2.tbl
similarity index 100%
rename from public/testdata/exampleGATKReportv2.tbl
rename to public/gatk-framework/src/test/resources/exampleGATKReportv2.tbl
diff --git a/public/testdata/exampleGRP.grp b/public/gatk-framework/src/test/resources/exampleGRP.grp
similarity index 100%
rename from public/testdata/exampleGRP.grp
rename to public/gatk-framework/src/test/resources/exampleGRP.grp
diff --git a/public/testdata/exampleINTERVAL.intervals b/public/gatk-framework/src/test/resources/exampleINTERVAL.intervals
similarity index 100%
rename from public/testdata/exampleINTERVAL.intervals
rename to public/gatk-framework/src/test/resources/exampleINTERVAL.intervals
diff --git a/public/testdata/exampleNORG.bam b/public/gatk-framework/src/test/resources/exampleNORG.bam
similarity index 100%
rename from public/testdata/exampleNORG.bam
rename to public/gatk-framework/src/test/resources/exampleNORG.bam
diff --git a/public/testdata/exampleNORG.bam.bai b/public/gatk-framework/src/test/resources/exampleNORG.bam.bai
similarity index 100%
rename from public/testdata/exampleNORG.bam.bai
rename to public/gatk-framework/src/test/resources/exampleNORG.bam.bai
diff --git a/public/testdata/forSimulation.vcf b/public/gatk-framework/src/test/resources/forSimulation.vcf
similarity index 100%
rename from public/testdata/forSimulation.vcf
rename to public/gatk-framework/src/test/resources/forSimulation.vcf
diff --git a/public/testdata/forSimulation.vcf.idx b/public/gatk-framework/src/test/resources/forSimulation.vcf.idx
similarity index 100%
rename from public/testdata/forSimulation.vcf.idx
rename to public/gatk-framework/src/test/resources/forSimulation.vcf.idx
diff --git a/public/testdata/testfile.sam b/public/gatk-framework/src/test/resources/testfile.sam
similarity index 100%
rename from public/testdata/testfile.sam
rename to public/gatk-framework/src/test/resources/testfile.sam
diff --git a/public/gatk-package/pom.xml b/public/gatk-package/pom.xml
new file mode 100644
index 000000000..48c6168d3
--- /dev/null
+++ b/public/gatk-package/pom.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>gatk-package</artifactId>
+    <packaging>jar</packaging>
+    <name>GATK Package</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <sting.unpack.phase>prepare-package</sting.unpack.phase>
+        <sting.shade.phase>package</sting.shade.phase>
+        <app.main.class>org.broadinstitute.sting.gatk.CommandLineGATK</app.main.class>
+        <sting.binary-dist.name>GenomeAnalysisTK</sting.binary-dist.name>
+    </properties>
+
+    <dependencies>
+        <!-- Package everything in org.broadinstitute.sting -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- Tribble codecs -->
+        <dependency>
+            <groupId>org.broad</groupId>
+            <artifactId>tribble</artifactId>
+        </dependency>
+        <!-- The variant package (VCF, BCF, and VariantContext) -->
+        <dependency>
+            <groupId>org.broadinstitute</groupId>
+            <artifactId>variant</artifactId>
+        </dependency>
+        <!-- Workaround - depend on the logger impl required by JEXL -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <!-- Required for binary-dist assembly, excluded by shade -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+            <classifier>example-resources</classifier>
+            <type>tar.bz2</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-direct-dependencies</id>
+                        <phase>${sting.unpack.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>sting-executable</id>
+                        <phase>${sting.shade.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>binary-dist</id>
+                        <phase>${sting.shade.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.pyx4j</groupId>
+                <artifactId>maven-junction-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>link-git-release</id>
+                        <phase>${sting.shade.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>install-package</id>
+                        <phase>install</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>protected</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../protected/gatk-protected/pom.xml</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>gatk-protected</artifactId>
+                    <version>${project.version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>private</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../private/gatk-private/pom.xml</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>gatk-private</artifactId>
+                    <version>${project.version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/public/gatk-package/src/main/assembly/binary-dist.xml b/public/gatk-package/src/main/assembly/binary-dist.xml
new file mode 100644
index 000000000..adc52646c
--- /dev/null
+++ b/public/gatk-package/src/main/assembly/binary-dist.xml
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>binary-dist</id>
+    <formats>
+        <format>tar.bz2</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.broadinstitute.sting:gatk-package</include>
+            </includes>
+            <outputFileNameMapping>${sting.binary-dist.name}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>resources</outputDirectory>
+            <unpack>true</unpack>
+            <includes>
+                <include>org.broadinstitute.sting:gatk-framework:tar.bz2:example-resources</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/public/gatk-queue-extgen/pom.xml b/public/gatk-queue-extgen/pom.xml
new file mode 100644
index 000000000..532515ff8
--- /dev/null
+++ b/public/gatk-queue-extgen/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>gatk-queue-extgen</artifactId>
+    <packaging>jar</packaging>
+    <name>Queue GATK ExtGen</name>
+    <description>Queue GATK Extensions Generator</description>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/public/java/src/org/broadinstitute/sting/queue/extensions/gatk/ArgumentDefinitionField.java b/public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/ArgumentDefinitionField.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/queue/extensions/gatk/ArgumentDefinitionField.java
rename to public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/ArgumentDefinitionField.java
diff --git a/public/java/src/org/broadinstitute/sting/queue/extensions/gatk/ArgumentField.java b/public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/ArgumentField.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/queue/extensions/gatk/ArgumentField.java
rename to public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/ArgumentField.java
diff --git a/public/java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java b/public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
rename to public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/GATKExtensionsGenerator.java
diff --git a/public/java/src/org/broadinstitute/sting/queue/extensions/gatk/ReadFilterField.java b/public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/ReadFilterField.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/queue/extensions/gatk/ReadFilterField.java
rename to public/gatk-queue-extgen/src/main/java/org/broadinstitute/sting/queue/extensions/gatk/ReadFilterField.java
diff --git a/public/gsalib/pom.xml b/public/gsalib/pom.xml
new file mode 100644
index 000000000..c751bc0f0
--- /dev/null
+++ b/public/gsalib/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>gsalib</artifactId>
+    <packaging>pom</packaging>
+    <name>Sting GSALib</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <gsalib.packagedir>org/broadinstitute/sting/utils/R</gsalib.packagedir>
+        <gsalib.filename>gsalib.tar.gz</gsalib.filename>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>gsalib-assembly</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/assembly/gsalib.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/DESCRIPTION b/public/gsalib/src/R/DESCRIPTION
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/DESCRIPTION
rename to public/gsalib/src/R/DESCRIPTION
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/NAMESPACE b/public/gsalib/src/R/NAMESPACE
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/NAMESPACE
rename to public/gsalib/src/R/NAMESPACE
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.error.R b/public/gsalib/src/R/R/gsa.error.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.error.R
rename to public/gsalib/src/R/R/gsa.error.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.getargs.R b/public/gsalib/src/R/R/gsa.getargs.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.getargs.R
rename to public/gsalib/src/R/R/gsa.getargs.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.message.R b/public/gsalib/src/R/R/gsa.message.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.message.R
rename to public/gsalib/src/R/R/gsa.message.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.plot.venn.R b/public/gsalib/src/R/R/gsa.plot.venn.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.plot.venn.R
rename to public/gsalib/src/R/R/gsa.plot.venn.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.eval.R b/public/gsalib/src/R/R/gsa.read.eval.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.eval.R
rename to public/gsalib/src/R/R/gsa.read.eval.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.gatkreport.R b/public/gsalib/src/R/R/gsa.read.gatkreport.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.gatkreport.R
rename to public/gsalib/src/R/R/gsa.read.gatkreport.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.squidmetrics.R b/public/gsalib/src/R/R/gsa.read.squidmetrics.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.squidmetrics.R
rename to public/gsalib/src/R/R/gsa.read.squidmetrics.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.vcf.R b/public/gsalib/src/R/R/gsa.read.vcf.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.vcf.R
rename to public/gsalib/src/R/R/gsa.read.vcf.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.variantqc.utils.R b/public/gsalib/src/R/R/gsa.variantqc.utils.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.variantqc.utils.R
rename to public/gsalib/src/R/R/gsa.variantqc.utils.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.warn.R b/public/gsalib/src/R/R/gsa.warn.R
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.warn.R
rename to public/gsalib/src/R/R/gsa.warn.R
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/Read-and-delete-me b/public/gsalib/src/R/Read-and-delete-me
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/Read-and-delete-me
rename to public/gsalib/src/R/Read-and-delete-me
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.error.Rd b/public/gsalib/src/R/man/gsa.error.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.error.Rd
rename to public/gsalib/src/R/man/gsa.error.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.getargs.Rd b/public/gsalib/src/R/man/gsa.getargs.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.getargs.Rd
rename to public/gsalib/src/R/man/gsa.getargs.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.message.Rd b/public/gsalib/src/R/man/gsa.message.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.message.Rd
rename to public/gsalib/src/R/man/gsa.message.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.plot.venn.Rd b/public/gsalib/src/R/man/gsa.plot.venn.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.plot.venn.Rd
rename to public/gsalib/src/R/man/gsa.plot.venn.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.eval.Rd b/public/gsalib/src/R/man/gsa.read.eval.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.eval.Rd
rename to public/gsalib/src/R/man/gsa.read.eval.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.gatkreport.Rd b/public/gsalib/src/R/man/gsa.read.gatkreport.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.gatkreport.Rd
rename to public/gsalib/src/R/man/gsa.read.gatkreport.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.squidmetrics.Rd b/public/gsalib/src/R/man/gsa.read.squidmetrics.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.squidmetrics.Rd
rename to public/gsalib/src/R/man/gsa.read.squidmetrics.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.vcf.Rd b/public/gsalib/src/R/man/gsa.read.vcf.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.vcf.Rd
rename to public/gsalib/src/R/man/gsa.read.vcf.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.warn.Rd b/public/gsalib/src/R/man/gsa.warn.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.warn.Rd
rename to public/gsalib/src/R/man/gsa.warn.Rd
diff --git a/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsalib-package.Rd b/public/gsalib/src/R/man/gsalib-package.Rd
similarity index 100%
rename from public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsalib-package.Rd
rename to public/gsalib/src/R/man/gsalib-package.Rd
diff --git a/public/gsalib/src/assembly/gsalib.xml b/public/gsalib/src/assembly/gsalib.xml
new file mode 100644
index 000000000..7650c713d
--- /dev/null
+++ b/public/gsalib/src/assembly/gsalib.xml
@@ -0,0 +1,13 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>gsalib</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>gsalib</outputDirectory>
+            <directory>src/R</directory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/public/package-tests/pom.xml b/public/package-tests/pom.xml
new file mode 100644
index 000000000..62a1d570b
--- /dev/null
+++ b/public/package-tests/pom.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!--
+    Run during package testing by the maven invoker plugin in the sting-aggregator /pom.xml
+    -->
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-root</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../sting-root</relativePath>
+    </parent>
+
+    <artifactId>sting-package-tests</artifactId>
+    <packaging>pom</packaging>
+    <name>Sting Package Tests</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <sting.packageunittests.skipped>true</sting.packageunittests.skipped>
+        <sting.packageintegrationtests.skipped>true</sting.packageintegrationtests.skipped>
+        <sting.packagepipelinetests.skipped>true</sting.packagepipelinetests.skipped>
+        <sting.packagelargescaletests.skipped>true</sting.packagelargescaletests.skipped>
+        <failsafe.summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary.xml</failsafe.summaryFile>
+    </properties>
+
+    <!-- Dependency configuration (versions, etc.) -->
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${sting.packagetests.artifactId}</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--
+            For com.sun.javadoc
+            See also: http://sunnytalkstech.blogspot.in/2011/08/maven-dependency-for-toolsjar-in-jdk7.html
+            -->
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.cofoja</groupId>
+            <artifactId>cofoja</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.caliper</groupId>
+            <artifactId>caliper</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <directory>${sting.packagetests.basedir}/target</directory>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>unittests</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>unittests.profile.enabled</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <!-- Plugin configuration -->
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <basedir>${sting.packagetests.basedir}</basedir>
+                            <workingDirectory>${sting.packagetests.basedir}</workingDirectory>
+                            <classesDirectory>${project.build.outputDirectory}/ignored_by_package_test</classesDirectory>
+                            <testClassesDirectory>${sting.packagetests.testClasses}</testClassesDirectory>
+                            <dependenciesToScan>
+                                <scan>org.broadinstitute.sting:.*</scan>
+                            </dependenciesToScan>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <!-- run all non integration tests -->
+                                <id>unit-tests</id>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <skip>${sting.packageunittests.skipped}</skip>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>integrationtests</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>integrationtests.profile.enabled</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <!-- Plugin configuration -->
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <basedir>${sting.packagetests.basedir}</basedir>
+                            <workingDirectory>${sting.packagetests.basedir}</workingDirectory>
+                            <classesDirectory>${project.build.outputDirectory}/ignored_by_package_test</classesDirectory>
+                            <testClassesDirectory>${sting.packagetests.testClasses}</testClassesDirectory>
+                            <summaryFile>${failsafe.summaryFile}</summaryFile>
+                            <dependenciesToScan>
+                                <scan>org.broadinstitute.sting:.*</scan>
+                            </dependenciesToScan>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>integration-tests</id>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                                <!-- run integration tests -->
+                                <configuration>
+                                    <skip>${sting.packageintegrationtests.skipped}</skip>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>pipeline-tests</id>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                                <!-- run pipeline dry run tests -->
+                                <configuration>
+                                    <skip>${sting.packagepipelinetests.skipped}</skip>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>large-scale-tests</id>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                                <!-- run large scale tests -->
+                                <configuration>
+                                    <skip>${sting.packagelargescaletests.skipped}</skip>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/public/packages/Aligner.xml b/public/packages/Aligner.xml
deleted file mode 100644
index 031dfacfd..000000000
--- a/public/packages/Aligner.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package name="Aligner">
-  <executable name="Aligner">
-    <dependencies>
-      <!-- BWA/C aligner implementation -->
-      <class name="org.broadinstitute.sting.alignment.bwa.c.BWACAligner" />
-    </dependencies>
-  </executable>
-</package>
diff --git a/public/packages/CreatePackager.xsl b/public/packages/CreatePackager.xsl
deleted file mode 100644
index a89b6bb35..000000000
--- a/public/packages/CreatePackager.xsl
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:variable name="ant.basedir" select="'${basedir}'" />
-  <xsl:variable name="sting.dir" select="'${sting.dir}/'" />
-  <xsl:variable name="classpath" select="'${sting.dir}/staging:${additional.jars}'" />
-  <xsl:variable name="dist.dir" select="'${sting.dir}/dist'" />
-  <xsl:variable name="staging.dir" select="'${sting.dir}/staging'" />
-  <xsl:variable name="package.basename" select="'${package.basename}'" />
-  <xsl:variable name="package.dir" select="'${package.dir}'" />
-  <xsl:variable name="package.filename" select="'${package.filename}'" />
-  <xsl:variable name="resources.dir" select="'${package.dir}/resources'" />
-  
-<xsl:template match="package">
-  <xsl:output method="xml" indent="yes"/>
-
-  <project name="{@name}" default="package">
-
-    <property name="sting.dir" value="{$ant.basedir}" />
-    <!-- Read version information out of the xml file -->
-    <xsl:choose>
-      <xsl:when test="version/@property">
-	<xsl:variable name="version.property" select="concat('${',version/@property,'}')" />
-	<property file="{$staging.dir}/{version/@file}" />
-	<property name="package.basename" value="{concat(@name,'-',$version.property)}" />
-      </xsl:when>
-      <xsl:otherwise>
-	<property name="package.basename" value="{@name}" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <property name="package.dir" value="{concat($dist.dir,'/packages/',$package.basename)}" />
-    <property name="package.filename" value="{concat($package.basename,'.tar.bz2')}" />
-
-    <target name="package">
-      <!-- Verify that all classes specified are present -->
-      <xsl:for-each select="//class">
-	<available property="is.{@name}.present" classpath="{$classpath}" classname="{@name}"/>
-	<fail message="Class {@name} not found" unless="is.{@name}.present" />
-      </xsl:for-each>
-      <xsl:for-each select="//resource-bundle">
-	<available property="is.{@file}.present" file="{$staging.dir}/{@file}"/>
-	<fail message="Resource bundle {@file} not found" unless="is.{@file}.present" />
-      </xsl:for-each>
-
-      <!-- Verify that all files specified are present -->
-      <xsl:for-each select="//dependencies/file">
-        <xsl:choose>
-          <xsl:when test="@name">
-            <available property="is.{@name}.present" file="{$staging.dir}/{@name}" type="file"/>
-            <fail message="File dependency {@name} not found" unless="is.{@name}.present" />
-          </xsl:when>
-          <xsl:when test="@path">
-            <available property="is.{@path}.present" file="{$staging.dir}/{@path}" type="file"/>
-            <fail message="File dependency {@path} not found" unless="is.{@path}.present" />
-          </xsl:when>
-          <xsl:otherwise>
-            <fail message="File dependency must specify a name or a path"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      <xsl:for-each select="//dependencies/dir">
-        <available property="is.{@name}.present" file="{$staging.dir}/{@name}" type="dir"/>
-        <fail message="Directory {@name} not found" unless="is.{@name}.present" />
-      </xsl:for-each>
-
-      <!-- Create an output directory for the package -->
-      <mkdir dir="{$package.dir}"/>
-
-      <!-- Create the executable sections -->
-      <xsl:apply-templates select="executable" />
-
-      <!-- Add in other modules -->
-      <xsl:for-each select="modules/module">
-	<xsl:apply-templates select="document(@file)/package/executable" />
-      </xsl:for-each>
-
-      <!-- Include various resource files explicitly specified in this file and in all other modules -->
-      <xsl:apply-templates select="resources" />
-      <xsl:for-each select="//modules/module">
-	<xsl:apply-templates select="document(@file)/package/resources" />
-      </xsl:for-each>
-
-      <!-- Bundle the package into a single zip file -->
-      <tar destfile="{$dist.dir}/packages/{$package.filename}" compression="bzip2">
-        <fileset dir="{$dist.dir}/packages" includes="{$package.basename}/**"/>
-      </tar>
-    </target>
-
-    <target name="release">
-      <xsl:for-each select="release/executable">
-	<copy todir="{@directory}/{$package.basename}"><fileset dir="{$package.dir}" /></copy>
-	<xsl:if test="@symlink">
-	  <symlink link="{@directory}/{@symlink}" resource="{$package.basename}" overwrite="true" />	
-	</xsl:if>
-      </xsl:for-each>
-      <xsl:for-each select="release/archive">
-	<copy file="{$dist.dir}/packages/{$package.filename}" todir="{@directory}" />
-	<xsl:if test="@symlink">
-	  <symlink link="{@directory}/{@symlink}" resource="{$package.filename}" overwrite="true" />	
-	</xsl:if>
-      </xsl:for-each>
-    </target>
-  </project>
-</xsl:template>
-
-<!-- Create a symlink for the given file in the given target directory -->
-<xsl:template name="symlink">
-  <xsl:param name="file.name" />
-  <xsl:param name="target.dir" />
-  <xsl:variable name="short.name">
-    <xsl:call-template name="get-short-name">
-      <xsl:with-param name="string" select="$file.name" />
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="full.path">
-    <xsl:call-template name="get-full-path">
-      <xsl:with-param name="working-dir" select="$sting.dir"/>
-      <xsl:with-param name="file" select="$file.name" />
-    </xsl:call-template>
-  </xsl:variable>
-  <available property="is.{$short.name}.present" file="{$file.name}"/>
-  <fail message="File {$file.name} not found" unless="is.{$short.name}.present" />
-  <delete file="{$target.dir}/{$short.name}" />
-  <symlink link="{$target.dir}/{$short.name}" resource="{$full.path}" overwrite="true" />
-</xsl:template>
-
-<!-- Transform an executable tag into an ant 'jar' task with nested fileset -->
-<xsl:template match="executable">
-  <!-- Create a jar file containing the specified classes / packages and all their dependencies -->
-  <jar jarfile="{$package.dir}/{@name}.jar">
-    <classfileset dir="{$staging.dir}">
-      <root classname="{main-class/@name}"/>
-    </classfileset>
-    <xsl:for-each select="resource-bundle">
-      <fileset file="{$staging.dir}/{@file}" />
-    </xsl:for-each>
-    <xsl:for-each select="modules/module">
-      <xsl:apply-templates select="document(@file)/package/executable/dependencies" />
-    </xsl:for-each>
-    <xsl:apply-templates select="dependencies" />
-    <manifest>
-      <attribute name="Main-Class" value="{main-class/@name}"/>
-    </manifest>
-  </jar>
-</xsl:template>
-
-<!-- Transform a resource file into a symlink operation -->
-<xsl:template match="resources">
-  <xsl:for-each select="file">
-    <mkdir dir="{$resources.dir}"/>
-    <xsl:call-template name="symlink">
-      <xsl:with-param name="file.name" select="@name" />
-      <xsl:with-param name="target.dir" select="$resources.dir" />
-    </xsl:call-template>
-  </xsl:for-each>
-</xsl:template>
-
-<!-- Transform a dependency list into a fileset for embedding in a jar -->
-<xsl:template match="dependencies">
-  <classfileset dir="{$staging.dir}">
-    <xsl:for-each select="package">
-      <rootfileset dir="{$staging.dir}" includes="{concat(translate(@name,'.','/'),'/','*.class')}" />
-    </xsl:for-each>
-    <xsl:for-each select="class">
-      <root classname="{@name}" />
-    </xsl:for-each>
-  </classfileset>
-  <xsl:for-each select="file">
-    <xsl:choose>
-      <xsl:when test="@name">
-        <fileset file="{$staging.dir}/{@name}" />
-      </xsl:when>
-      <xsl:when test="@path">
-        <fileset dir="{$staging.dir}">
-          <xsl:attribute name="includes">
-            <xsl:value-of select="@path"/>
-          </xsl:attribute>
-        </fileset>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:for-each>
-  <xsl:for-each select="dir">
-    <xsl:variable name="includes">
-      <xsl:choose>
-        <xsl:when test="@includes = ''">
-          <xsl:value-of select="concat(@name,'/**')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat(@name,'/',@includes)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <fileset dir="{$staging.dir}" includes="{$includes}"/>
-  </xsl:for-each>
-</xsl:template>
-
-<!-- Determine the short name (filename w/o directory structure of the given filename -->
-<xsl:template name="get-short-name">
-  <xsl:param name="string"/>
-  <xsl:choose>
-    <xsl:when test="contains($string,'/')">
-      <xsl:call-template name="get-short-name">
-        <xsl:with-param name="string" select="substring-after($string,'/')" />
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise><xsl:value-of select="$string"/></xsl:otherwise>
-  </xsl:choose>    
-</xsl:template>
-
-<!-- Determine the full path of the given filename.  Take into account absolute / relative paths -->
-<xsl:template name="get-full-path">
-  <xsl:param name="working-dir"/>
-  <xsl:param name="file"/>
-  <xsl:choose>
-    <xsl:when test="starts-with($file,'/')"><xsl:value-of select="$file"/></xsl:when>
-    <xsl:otherwise><xsl:value-of select="concat($working-dir,$file)"/></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/public/packages/GATKEngine.xml b/public/packages/GATKEngine.xml
deleted file mode 100644
index 08d2e1c2c..000000000
--- a/public/packages/GATKEngine.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2011, The Broad Institute
-  ~
-  ~ Permission is hereby granted, free of charge, to any person
-  ~ obtaining a copy of this software and associated documentation
-  ~ files (the "Software"), to deal in the Software without
-  ~ restriction, including without limitation the rights to use,
-  ~ copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the
-  ~ Software is furnished to do so, subject to the following
-  ~ conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be
-  ~ included in all copies or substantial portions of the Software.
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  ~ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  ~ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  ~ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  ~ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  ~ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  ~ OTHER DEALINGS IN THE SOFTWARE.
-  -->
-
-<package name="GATKEngine">
-  <executable name="GATKEngine">
-    <dependencies>
-      <!-- Package everything in org.broadinstitute.sting -->
-      <package name="org.broadinstitute.sting.**" />
-      <!-- Tribble codecs -->
-      <package name="org.broad.tribble.**" />
-      <!-- The variant package (VCF, BCF, and VariantContext) -->
-      <package name="org.broadinstitute.variant.**" />
-      <!-- Workaround - depend on the logger impl required by JEXL -->
-      <package name="org.apache.commons.logging.impl" />
-      <!-- R packages -->
-      <dir name="org/broadinstitute/sting/utils/R" includes="**/*.tar.gz" />
-      <!-- All R scripts in org.broadinstitute.sting -->
-      <dir name="org/broadinstitute/sting" includes="**/*.R" />
-      <!-- Resources in org.broadinstitute.sting -->
-      <dir name="org/broadinstitute/sting" includes="**/resources/*" />
-      <dir name="org/broadinstitute/sting" includes="**/templates/*" />
-      <!-- The GATK public key -->
-      <file path="GATK_public.key" />
-    </dependencies>
-  </executable>
-  <resources>
-    <!-- Sample reads and reference files -->
-    <file name="public/testdata/exampleBAM.bam" />
-    <file name="public/testdata/exampleBAM.bam.bai" />
-    <file name="public/testdata/exampleFASTA.fasta" />
-    <file name="public/testdata/exampleFASTA.fasta.fai" />
-    <file name="public/testdata/exampleFASTA.dict" />
-    <!-- GATK sample code and build scripts -->
-    <file name="public/java/src/org/broadinstitute/sting/gatk/walkers/qc/Pileup.java" />
-    <file name="public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountLoci.java" />
-    <file name="public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountReads.java" />
-    <file name="public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CheckPileup.java" />
-    <file name="public/java/src/org/broadinstitute/sting/gatk/walkers/readutils/PrintReads.java" />
-  </resources>
-</package>
diff --git a/public/packages/GenomeAnalysisTK.xml b/public/packages/GenomeAnalysisTK.xml
deleted file mode 100644
index e95c992b6..000000000
--- a/public/packages/GenomeAnalysisTK.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2012, The Broad Institute
-  ~
-  ~ Permission is hereby granted, free of charge, to any person
-  ~ obtaining a copy of this software and associated documentation
-  ~ files (the "Software"), to deal in the Software without
-  ~ restriction, including without limitation the rights to use,
-  ~ copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the
-  ~ Software is furnished to do so, subject to the following
-  ~ conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be
-  ~ included in all copies or substantial portions of the Software.
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  ~ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  ~ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  ~ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  ~ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  ~ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  ~ OTHER DEALINGS IN THE SOFTWARE.
-  -->
-
-<!-- The full release of the GATK contains both public and protected tools (but nothing from private) -->
-<package name="GenomeAnalysisTK">
-  <version file="StingText.properties" property="org.broadinstitute.sting.gatk.version" />
-  <executable name="GenomeAnalysisTK">
-    <main-class name="org.broadinstitute.sting.gatk.CommandLineGATK" />
-    <resource-bundle file="StingText.properties" />
-    <modules>
-      <module file="GATKEngine.xml"/>
-    </modules>
-  </executable>
-  <release>
-    <executable directory="/humgen/gsa-hpprojects/GATK/bin" symlink="current" />
-    <archive directory="/humgen/gsa-hpprojects/GATK/bin" symlink="GenomeAnalysisTK-latest.tar.bz2" />
-  </release>
-</package>
diff --git a/public/packages/PicardPrivate.xml b/public/packages/PicardPrivate.xml
deleted file mode 100644
index d898a5d07..000000000
--- a/public/packages/PicardPrivate.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package name="picard-private-parts">
-  <executable name="picard-private-parts">
-    <dependencies>
-      <class name="edu.mit.broad.picard.util.PicardAggregationFsUtil" />
-      <class name="edu.mit.broad.picard.genotype.fingerprint.v2.FingerprintingSummaryMetrics" />
-      <class name="edu.mit.broad.picard.genotype.concordance.DbSnpMatchMetrics" />
-    </dependencies>
-  </executable>
-</package>
diff --git a/public/packages/Queue.xml b/public/packages/Queue.xml
deleted file mode 100644
index 621a549d5..000000000
--- a/public/packages/Queue.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2011, The Broad Institute
-  ~
-  ~ Permission is hereby granted, free of charge, to any person
-  ~ obtaining a copy of this software and associated documentation
-  ~ files (the "Software"), to deal in the Software without
-  ~ restriction, including without limitation the rights to use,
-  ~ copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the
-  ~ Software is furnished to do so, subject to the following
-  ~ conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be
-  ~ included in all copies or substantial portions of the Software.
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  ~ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  ~ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  ~ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  ~ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  ~ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  ~ OTHER DEALINGS IN THE SOFTWARE.
-  -->
-
-<!-- The full release of Queue contains both public and protected tools (but nothing from private) -->
-<package name="Queue">
-    <version file="StingText.properties" property="org.broadinstitute.sting.queue.version" />
-    <executable name="Queue">
-        <main-class name="org.broadinstitute.sting.queue.QCommandLine" />
-        <resource-bundle file="StingText.properties" />
-        <modules>
-            <module file="QueueEngine.xml"/>
-            <module file="GATKEngine.xml"/>
-        </modules>
-    </executable>
-    <release>
-        <executable directory="/humgen/gsa-hpprojects/Queue/bin" symlink="current" />
-        <archive directory="/humgen/gsa-hpprojects/Queue/bin" symlink="Queue-latest.tar.bz2" />
-    </release>
-</package>
diff --git a/public/packages/QueueEngine.xml b/public/packages/QueueEngine.xml
deleted file mode 100644
index af3e20219..000000000
--- a/public/packages/QueueEngine.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2012, The Broad Institute
-  ~
-  ~ Permission is hereby granted, free of charge, to any person
-  ~ obtaining a copy of this software and associated documentation
-  ~ files (the "Software"), to deal in the Software without
-  ~ restriction, including without limitation the rights to use,
-  ~ copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the
-  ~ Software is furnished to do so, subject to the following
-  ~ conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be
-  ~ included in all copies or substantial portions of the Software.
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  ~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  ~ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  ~ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  ~ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  ~ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  ~ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  ~ OTHER DEALINGS IN THE SOFTWARE.
-  -->
-
-<package name="QueueEngine">
-    <executable name="QueueEngine">
-        <dependencies>
-            <!-- Queue -->
-            <package name="org.broadinstitute.sting.queue.**" />
-
-            <!-- Pipeline + Utils -->
-            <package name="org.broadinstitute.sting.pipeline.**" />
-            <package name="org.broadinstitute.sting.utils.**" />
-
-            <!-- Scala -->
-            <package name="scala.**" />
-
-            <!-- Picard -->
-            <package name="net.sf.picard.**" />
-            <package name="edu.mit.broad.picard.**" />
-
-            <!-- JavaMail -->
-            <package name="javax.activation.**" />
-            <package name="javax.mail.**" />
-            <package name="com.sun.activation.**" />
-            <package name="com.sun.mail.**" />
-            <file path="META-INF/javamail.charset.map" />
-            <file path="META-INF/javamail.default.address.map" />
-            <file path="META-INF/javamail.default.providers" />
-            <file path="META-INF/mailcap" />
-            <file path="META-INF/mailcap.default" />
-            <file path="META-INF/mimetypes.default" />
-
-            <!-- JNA, including embedded native libraries -->
-            <dir name="com/sun/jna" />
-
-            <!-- Contracts for Java -->
-            <package name="com.google.java.contract.**" />
-
-            <!-- snpEff -->
-            <package name="ca.mcgill.mcb.pcingola.**" />
-            <file path="snpEff_genes.ftl" />
-            <file path="snpEff_summary.ftl" />
-            
-            <!-- R scripts -->
-            <dir name="org/broadinstitute/sting/queue" includes="**/*.R" />
-        </dependencies>
-    </executable>
-    <resources>
-        <!-- Sample QScripts -->
-        <file name="public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountReads.scala" />
-        <file name="public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountLoci.scala" />
-        <file name="public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleUnifiedGenotyper.scala" />
-        <file name="public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleReadFilter.scala" />
-        <file name="public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCustomWalker.scala" />
-    </resources>
-</package>
diff --git a/public/pom.xml b/public/pom.xml
new file mode 100644
index 000000000..5e3ae00a6
--- /dev/null
+++ b/public/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-root</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>sting-root</relativePath>
+    </parent>
+
+    <artifactId>sting-public</artifactId>
+    <packaging>pom</packaging>
+    <name>Sting Public</name>
+
+    <modules>
+        <module>sting-root</module>
+        <module>gsalib</module>
+        <module>sting-utils</module>
+        <module>gatk-framework</module>
+        <module>gatk-package</module>
+        <!-- queue optionally enabled as profiles -->
+    </modules>
+
+    <properties>
+        <sting.basedir>${project.basedir}/..</sting.basedir>
+    </properties>
+
+    <profiles>
+        <!-- Allow queue to be disabled. -->
+        <profile>
+            <id>queue</id>
+            <activation>
+                <property>
+                    <name>!disable.queue</name>
+                </property>
+            </activation>
+            <modules>
+                <module>gatk-queue-extgen</module>
+                <module>queue-framework</module>
+                <module>queue-package</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/public/queue-framework/pom.xml b/public/queue-framework/pom.xml
new file mode 100644
index 000000000..7146e9694
--- /dev/null
+++ b/public/queue-framework/pom.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>queue-framework</artifactId>
+    <packaging>jar</packaging>
+    <name>Queue Framework</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <gatk.extensions.sources>${project.build.directory}/generated-sources/gatk-extensions</gatk.extensions.sources>
+        <sting.generate-gatk-extensions.skipped>false</sting.generate-gatk-extensions.skipped>
+        <sting.packagetests.artifactId>queue-package</sting.packagetests.artifactId>
+        <sting.test-utils-jar.phase>${sting.jar.phase}</sting.test-utils-jar.phase>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-compiler</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jgrapht</groupId>
+            <artifactId>jgrapht</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-email</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+        <!--
+        extgen dependency only applies to the exec:exec,
+        not the artifact, but don't know another way to include
+        the artifact *only* in the <classpath/> of exec.
+        See https://jira.codehaus.org/browse/MEXEC-111
+
+        Perhaps extgen should be wrapped in a maven plugin?
+        -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-queue-extgen</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-utils</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-gatk-extensions</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <skip>${sting.generate-gatk-extensions.skipped}</skip>
+                            <executable>java</executable>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <classpath />
+                                <argument>org.broadinstitute.sting.queue.extensions.gatk.GATKExtensionsGenerator</argument>
+                                <argument>-l</argument>
+                                <argument>WARN</argument>
+                                <argument>-outDir</argument>
+                                <argument>${gatk.extensions.sources}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-gatk-extensions</id>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <sources>
+                                <source>${gatk.extensions.sources}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>example-resources</id>
+                        <phase>generate-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.scala-tools</groupId>
+                <artifactId>maven-scala-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.pyx4j</groupId>
+                <artifactId>maven-junction-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>link-public-qscript</id>
+                        <phase>process-test-resources</phase>
+                    </execution>
+                    <execution>
+                        <id>unlink-public-qscript</id>
+                        <phase>clean</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resource-bundle-log4j</id>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>extract-resource-bundle</id>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package-unittests</id>
+                    </execution>
+                    <execution>
+                        <id>package-integrationtests</id>
+                    </execution>
+                    <execution>
+                        <id>package-largescaletests</id>
+                    </execution>
+                    <execution>
+                        <id>package-pipelinetests</id>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>protected</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../protected/gatk-protected/pom.xml</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>gatk-protected</artifactId>
+                    <version>${project.version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>private</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../private/gatk-private/pom.xml</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>gatk-private</artifactId>
+                    <version>${project.version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <!-- TODO: All tests require access to private. For now. -->
+                    <plugin>
+                        <groupId>com.pyx4j</groupId>
+                        <artifactId>maven-junction-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>link-private-testdata</id>
+                                <phase>process-test-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>unlink-private-testdata</id>
+                                <phase>clean</phase>
+                            </execution>
+                            <execution>
+                                <id>link-private-qscript</id>
+                                <phase>process-test-resources</phase>
+                            </execution>
+                            <execution>
+                                <id>unlink-private-qscript</id>
+                                <phase>clean</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/public/queue-framework/src/main/assembly/example-resources.xml b/public/queue-framework/src/main/assembly/example-resources.xml
new file mode 100644
index 000000000..7d4ec43ef
--- /dev/null
+++ b/public/queue-framework/src/main/assembly/example-resources.xml
@@ -0,0 +1,20 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>example-resources</id>
+    <formats>
+        <format>tar.bz2</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>ExampleCountReads.scala</include>
+                <include>ExampleCountLoci.scala</include>
+                <include>ExampleUnifiedGenotyper.scala</include>
+                <include>ExampleReadFilter.scala</include>
+                <include>ExampleCustomWalker.scala</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/public/java/src/org/broadinstitute/sting/queue/QueueVersion.java b/public/queue-framework/src/main/java/org/broadinstitute/sting/queue/QueueVersion.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/queue/QueueVersion.java
rename to public/queue-framework/src/main/java/org/broadinstitute/sting/queue/QueueVersion.java
diff --git a/public/java/src/org/broadinstitute/sting/queue/package-info.java b/public/queue-framework/src/main/java/org/broadinstitute/sting/queue/package-info.java
similarity index 100%
rename from public/java/src/org/broadinstitute/sting/queue/package-info.java
rename to public/queue-framework/src/main/java/org/broadinstitute/sting/queue/package-info.java
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/CNV/xhmmCNVpipeline.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/CNV/xhmmCNVpipeline.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/CNV/xhmmCNVpipeline.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/CNV/xhmmCNVpipeline.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/GATKResourcesBundle.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/GATKResourcesBundle.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/GATKResourcesBundle.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/GATKResourcesBundle.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/DevNullOutput.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/DevNullOutput.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/DevNullOutput.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/DevNullOutput.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountLoci.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountLoci.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountLoci.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountLoci.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountReads.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountReads.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountReads.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleCountReads.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCustomWalker.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleCustomWalker.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleCustomWalker.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleCustomWalker.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleReadFilter.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleReadFilter.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleReadFilter.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleReadFilter.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleRetryMemoryLimit.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleRetryMemoryLimit.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleRetryMemoryLimit.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleRetryMemoryLimit.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleUnifiedGenotyper.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleUnifiedGenotyper.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/ExampleUnifiedGenotyper.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/ExampleUnifiedGenotyper.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/HelloWorld.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/HelloWorld.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/examples/HelloWorld.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/examples/HelloWorld.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/lib/ChunkVCF.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/lib/ChunkVCF.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/lib/ChunkVCF.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/lib/ChunkVCF.scala
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/lib/Vcf2Table.q b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/lib/Vcf2Table.q
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/lib/Vcf2Table.q
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/lib/Vcf2Table.q
diff --git a/public/scala/qscript/org/broadinstitute/sting/queue/qscripts/lib/VcfToPed.scala b/public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/lib/VcfToPed.scala
similarity index 100%
rename from public/scala/qscript/org/broadinstitute/sting/queue/qscripts/lib/VcfToPed.scala
rename to public/queue-framework/src/main/qscripts/org/broadinstitute/sting/queue/qscripts/lib/VcfToPed.scala
diff --git a/public/R/scripts/org/broadinstitute/sting/queue/util/queueJobReport.R b/public/queue-framework/src/main/resources/org/broadinstitute/sting/queue/util/queueJobReport.R
similarity index 100%
rename from public/R/scripts/org/broadinstitute/sting/queue/util/queueJobReport.R
rename to public/queue-framework/src/main/resources/org/broadinstitute/sting/queue/util/queueJobReport.R
diff --git a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QCommandLine.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QCommandLine.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/QCommandPlugin.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QCommandPlugin.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/QCommandPlugin.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QCommandPlugin.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/QException.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QException.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/QException.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QException.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/QScript.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QScript.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/QScript.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QScript.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/QScriptManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QScriptManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/QScriptManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QScriptManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/QSettings.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QSettings.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/QSettings.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/QSettings.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/CommandLineJobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/CommandLineJobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/CommandLineJobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/CommandLineJobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/CommandLineJobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/CommandLineJobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/CommandLineJobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/CommandLineJobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/CommandLinePluginManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/CommandLinePluginManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/CommandLinePluginManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/CommandLinePluginManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/FunctionEdge.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/FunctionEdge.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/FunctionEdge.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/FunctionEdge.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/InProcessJobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/InProcessJobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/InProcessJobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/InProcessJobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/InProcessRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/InProcessRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/InProcessRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/InProcessRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/JobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/JobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/JobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/JobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/JobRunInfo.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/JobRunInfo.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/JobRunInfo.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/JobRunInfo.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/JobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/JobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/JobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/JobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/MappingEdge.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/MappingEdge.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/MappingEdge.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/MappingEdge.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/QEdge.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QEdge.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/QEdge.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QEdge.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/QGraph.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QGraph.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/QGraph.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QGraph.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/QGraphSettings.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QGraphSettings.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/QGraphSettings.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QGraphSettings.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/QNode.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QNode.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/QNode.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QNode.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/QStatusMessenger.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QStatusMessenger.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/QStatusMessenger.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/QStatusMessenger.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/RunnerStatus.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/RunnerStatus.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/RunnerStatus.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/RunnerStatus.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/gridengine/GridEngineJobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/pbsengine/PbsEngineJobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/shell/ShellJobManager.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/shell/ShellJobManager.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/shell/ShellJobManager.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/shell/ShellJobManager.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/engine/shell/ShellJobRunner.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/shell/ShellJobRunner.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/engine/shell/ShellJobRunner.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/engine/shell/ShellJobRunner.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/cancer/MuTect.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/cancer/MuTect.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/cancer/MuTect.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/cancer/MuTect.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/BamGatherFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/BamGatherFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/BamGatherFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/BamGatherFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/CatVariantsGatherer.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/CatVariantsGatherer.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/CatVariantsGatherer.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/CatVariantsGatherer.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/ContigScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/ContigScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/ContigScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/ContigScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/DistributedScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/DistributedScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/DistributedScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/DistributedScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervals.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervals.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervals.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervals.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/GATKScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/GATKScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/GATKScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/GATKScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/IntervalScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/IntervalScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/IntervalScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/IntervalScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/LocusScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/LocusScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/LocusScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/LocusScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/ReadScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/ReadScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/ReadScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/ReadScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/TaggedFile.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/TaggedFile.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/TaggedFile.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/TaggedFile.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/VcfGatherFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/VcfGatherFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/VcfGatherFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/VcfGatherFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/WriteFlankingIntervalsFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/WriteFlankingIntervalsFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/gatk/WriteFlankingIntervalsFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/gatk/WriteFlankingIntervalsFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/AddOrReplaceReadGroups.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/AddOrReplaceReadGroups.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/AddOrReplaceReadGroups.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/AddOrReplaceReadGroups.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/CalculateHsMetrics.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/CalculateHsMetrics.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/CalculateHsMetrics.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/CalculateHsMetrics.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/CollectGcBiasMetrics.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/CollectGcBiasMetrics.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/CollectGcBiasMetrics.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/CollectGcBiasMetrics.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/CollectMultipleMetrics.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/CollectMultipleMetrics.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/CollectMultipleMetrics.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/CollectMultipleMetrics.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/FastqToSam.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/FastqToSam.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/FastqToSam.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/FastqToSam.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/MarkDuplicates.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/MarkDuplicates.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/MarkDuplicates.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/MarkDuplicates.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/MergeSamFiles.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/MergeSamFiles.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/MergeSamFiles.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/MergeSamFiles.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/PicardBamFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/PicardBamFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/PicardBamFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/PicardBamFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/PicardMetricsFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/PicardMetricsFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/PicardMetricsFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/PicardMetricsFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/ReorderSam.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/ReorderSam.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/ReorderSam.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/ReorderSam.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/RevertSam.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/RevertSam.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/RevertSam.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/RevertSam.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/SamToFastq.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/SamToFastq.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/SamToFastq.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/SamToFastq.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/SortSam.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/SortSam.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/SortSam.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/SortSam.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/picard/ValidateSamFile.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/ValidateSamFile.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/picard/ValidateSamFile.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/picard/ValidateSamFile.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsCommandLineFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsCommandLineFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsCommandLineFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsCommandLineFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsIndexFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsIndexFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsIndexFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsIndexFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsMergeFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsMergeFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsMergeFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/samtools/SamtoolsMergeFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/extensions/snpeff/SnpEff.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/snpeff/SnpEff.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/extensions/snpeff/SnpEff.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/extensions/snpeff/SnpEff.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/CommandLineFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/CommandLineFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/CommandLineFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/CommandLineFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/InProcessFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/InProcessFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/InProcessFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/InProcessFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/JavaCommandLineFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/JavaCommandLineFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/JavaCommandLineFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/JavaCommandLineFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/ListWriterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/ListWriterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/ListWriterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/ListWriterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/QFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/QFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/QFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/QFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/RetryMemoryLimit.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/RetryMemoryLimit.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/RetryMemoryLimit.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/RetryMemoryLimit.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/CloneFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/CloneFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/CloneFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/CloneFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/ConcatenateLogsFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/ConcatenateLogsFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/ConcatenateLogsFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/ConcatenateLogsFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/GatherFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/GatherFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/GatherFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/GatherFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/GathererFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/GathererFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/GathererFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/GathererFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/ScatterFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/ScatterFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/ScatterFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/ScatterFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/ScatterGatherableFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/ScatterGatherableFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/ScatterGatherableFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/ScatterGatherableFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/function/scattergather/SimpleTextGatherFunction.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/SimpleTextGatherFunction.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/function/scattergather/SimpleTextGatherFunction.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/function/scattergather/SimpleTextGatherFunction.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractIntervals.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractIntervals.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractIntervals.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractIntervals.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractSamples.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractSamples.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractSamples.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/clf/vcf/VCFExtractSamples.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/ipf/SortByRef.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/SortByRef.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/ipf/SortByRef.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/SortByRef.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractIntervals.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractIntervals.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractIntervals.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractIntervals.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSamples.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSamples.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSamples.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSamples.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSites.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSites.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSites.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFExtractSites.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFSimpleMerge.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFSimpleMerge.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/library/ipf/vcf/VCFSimpleMerge.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/library/ipf/vcf/VCFSimpleMerge.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/ClassFieldCache.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ClassFieldCache.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/ClassFieldCache.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ClassFieldCache.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/CollectionUtils.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/CollectionUtils.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/CollectionUtils.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/CollectionUtils.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/DoC/package.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/DoC/package.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/DoC/package.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/DoC/package.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/EmailMessage.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/EmailMessage.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/EmailMessage.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/EmailMessage.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/EmailSettings.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/EmailSettings.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/EmailSettings.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/EmailSettings.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/Logging.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/Logging.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/Logging.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/Logging.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/PrimitiveOptionConversions.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/PrimitiveOptionConversions.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/PrimitiveOptionConversions.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/PrimitiveOptionConversions.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/QJobReport.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/QJobReport.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/QJobReport.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/QJobReport.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/QJobsReporter.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/QJobsReporter.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/QJobsReporter.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/QJobsReporter.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/QScriptUtils.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/QScriptUtils.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/QScriptUtils.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/QScriptUtils.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/ReflectionUtils.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ReflectionUtils.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/ReflectionUtils.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ReflectionUtils.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/RemoteFile.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/RemoteFile.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/RemoteFile.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/RemoteFile.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/RemoteFileConverter.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/RemoteFileConverter.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/RemoteFileConverter.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/RemoteFileConverter.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/Retry.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/Retry.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/Retry.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/Retry.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/RetryException.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/RetryException.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/RetryException.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/RetryException.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ScalaCompoundArgumentTypeDescriptor.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/ShellUtils.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ShellUtils.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/ShellUtils.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/ShellUtils.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/StringFileConversions.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/StringFileConversions.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/SystemUtils.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/SystemUtils.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/SystemUtils.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/SystemUtils.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/TextFormatUtils.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/TextFormatUtils.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/TextFormatUtils.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/TextFormatUtils.scala
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/VCF_BAM_utilities.scala b/public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/VCF_BAM_utilities.scala
similarity index 100%
rename from public/scala/src/org/broadinstitute/sting/queue/util/VCF_BAM_utilities.scala
rename to public/queue-framework/src/main/scala/org/broadinstitute/sting/queue/util/VCF_BAM_utilities.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervalsUnitTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervalsUnitTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervalsUnitTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/extensions/gatk/GATKIntervalsUnitTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/function/CommandLineFunctionUnitTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/function/CommandLineFunctionUnitTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/function/CommandLineFunctionUnitTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/function/CommandLineFunctionUnitTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/PipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/PipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/PipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/PipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/PipelineTestEvalSpec.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/PipelineTestEvalSpec.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/PipelineTestEvalSpec.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/PipelineTestEvalSpec.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/PipelineTestSpec.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/PipelineTestSpec.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/PipelineTestSpec.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/PipelineTestSpec.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/DevNullOutputPipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/DevNullOutputPipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/DevNullOutputPipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/DevNullOutputPipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountLociPipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountLociPipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountLociPipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountLociPipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountReadsPipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountReadsPipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountReadsPipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleCountReadsPipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleReadFilterPipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleReadFilterPipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleReadFilterPipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleReadFilterPipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleRetryMemoryLimitPipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleRetryMemoryLimitPipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/ExampleRetryMemoryLimitPipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/ExampleRetryMemoryLimitPipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/HelloWorldPipelineTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/HelloWorldPipelineTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/pipeline/examples/HelloWorldPipelineTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/pipeline/examples/HelloWorldPipelineTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/util/ShellUtilsUnitTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/util/ShellUtilsUnitTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/util/ShellUtilsUnitTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/util/ShellUtilsUnitTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/util/StringFileConversionsUnitTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/util/StringFileConversionsUnitTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/util/StringFileConversionsUnitTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/util/StringFileConversionsUnitTest.scala
diff --git a/public/scala/test/org/broadinstitute/sting/queue/util/SystemUtilsUnitTest.scala b/public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/util/SystemUtilsUnitTest.scala
similarity index 100%
rename from public/scala/test/org/broadinstitute/sting/queue/util/SystemUtilsUnitTest.scala
rename to public/queue-framework/src/test/scala/org/broadinstitute/sting/queue/util/SystemUtilsUnitTest.scala
diff --git a/public/queue-package/pom.xml b/public/queue-package/pom.xml
new file mode 100644
index 000000000..3bd9f262e
--- /dev/null
+++ b/public/queue-package/pom.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>queue-package</artifactId>
+    <packaging>jar</packaging>
+    <name>Queue Package</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <sting.unpack.phase>prepare-package</sting.unpack.phase>
+        <sting.shade.phase>package</sting.shade.phase>
+        <sting.binary-dist.name>Queue</sting.binary-dist.name>
+        <app.main.class>org.broadinstitute.sting.queue.QCommandLine</app.main.class>
+    </properties>
+
+    <dependencies>
+        <!-- Queue -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>queue-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-package</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- Scala -->
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-compiler</artifactId>
+        </dependency>
+        <!-- Picard -->
+        <dependency>
+            <groupId>net.sf</groupId>
+            <artifactId>picard</artifactId>
+        </dependency>
+        <!-- JavaMail -->
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+        <!-- JNA, including embedded native libraries -->
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+        </dependency>
+        <!-- Contracts for Java -->
+        <dependency>
+            <groupId>com.google.code.cofoja</groupId>
+            <artifactId>cofoja</artifactId>
+        </dependency>
+        <!-- snpEff -->
+        <dependency>
+            <groupId>net.sf.snpeff</groupId>
+            <artifactId>snpeff</artifactId>
+        </dependency>
+        <!-- Required for binary-dist assembly, excluded by shade -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gatk-framework</artifactId>
+            <version>${project.version}</version>
+            <classifier>example-resources</classifier>
+            <type>tar.bz2</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>queue-framework</artifactId>
+            <version>${project.version}</version>
+            <classifier>example-resources</classifier>
+            <type>tar.bz2</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-direct-dependencies</id>
+                        <phase>${sting.unpack.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>sting-executable</id>
+                        <phase>${sting.shade.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>binary-dist</id>
+                        <phase>${sting.shade.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.pyx4j</groupId>
+                <artifactId>maven-junction-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>link-git-release</id>
+                        <phase>${sting.shade.phase}</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>install-package</id>
+                        <phase>install</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>private</id>
+            <activation>
+                <file>
+                    <exists>${basedir}/../../private/queue-private/pom.xml</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>queue-private</artifactId>
+                    <version>${project.version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/public/queue-package/src/main/assembly/binary-dist.xml b/public/queue-package/src/main/assembly/binary-dist.xml
new file mode 100644
index 000000000..6de236a56
--- /dev/null
+++ b/public/queue-package/src/main/assembly/binary-dist.xml
@@ -0,0 +1,23 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>binary-dist</id>
+    <formats>
+        <format>tar.bz2</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.broadinstitute.sting:queue-package</include>
+            </includes>
+            <outputFileNameMapping>${sting.binary-dist.name}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>resources</outputDirectory>
+            <unpack>true</unpack>
+            <includes>
+                <include>org.broadinstitute.sting:gatk-framework:tar.bz2:example-resources</include>
+                <include>org.broadinstitute.sting:queue-framework:tar.bz2:example-resources</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/settings/repository/com.google.code.caliper/caliper-1.0-SNAPSHOT.jar b/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.jar
similarity index 100%
rename from settings/repository/com.google.code.caliper/caliper-1.0-SNAPSHOT.jar
rename to public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.jar
diff --git a/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.pom b/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.pom
new file mode 100644
index 000000000..683ac1ae3
--- /dev/null
+++ b/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.code.caliper</groupId>
+  <artifactId>caliper</artifactId>
+  <name>caliper</name>
+  <version>1.0-SNAPSHOT</version>
+</project>
diff --git a/settings/repository/com.google.code.cofoja/cofoja-1.0-r139.jar b/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.jar
similarity index 100%
rename from settings/repository/com.google.code.cofoja/cofoja-1.0-r139.jar
rename to public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.jar
diff --git a/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.pom b/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.pom
new file mode 100644
index 000000000..5a6fb69b9
--- /dev/null
+++ b/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.code.cofoja</groupId>
+  <artifactId>cofoja</artifactId>
+  <name>cofoja</name>
+  <version>1.0-r139</version>
+</project>
diff --git a/settings/repository/gov.nist/Jama-1.0.2.jar b/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.jar
similarity index 100%
rename from settings/repository/gov.nist/Jama-1.0.2.jar
rename to public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.jar
diff --git a/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.pom b/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.pom
new file mode 100644
index 000000000..33d13d1ab
--- /dev/null
+++ b/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gov.nist</groupId>
+  <artifactId>Jama</artifactId>
+  <name>Jama</name>
+  <version>1.0.2</version>
+</project>
diff --git a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.jar b/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.jar
similarity index 100%
rename from settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.jar
rename to public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.jar
diff --git a/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.pom b/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.pom
new file mode 100644
index 000000000..921635c84
--- /dev/null
+++ b/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.gridscheduler</groupId>
+  <artifactId>drmaa</artifactId>
+  <name>drmaa</name>
+  <version>6.2u5p2</version>
+</project>
diff --git a/settings/repository/net.sf/picard-1.104.1628.jar b/public/repo/net/sf/picard/1.104.1628/picard-1.104.1628.jar
similarity index 100%
rename from settings/repository/net.sf/picard-1.104.1628.jar
rename to public/repo/net/sf/picard/1.104.1628/picard-1.104.1628.jar
diff --git a/public/repo/net/sf/picard/1.104.1628/picard-1.104.1628.pom b/public/repo/net/sf/picard/1.104.1628/picard-1.104.1628.pom
new file mode 100644
index 000000000..c2f2a5048
--- /dev/null
+++ b/public/repo/net/sf/picard/1.104.1628/picard-1.104.1628.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.snpeff</groupId>
+  <artifactId>picard</artifactId>
+  <name>picard</name>
+  <version>1.104.1628</version>
+</project>
diff --git a/settings/repository/net.sf/sam-1.104.1628.jar b/public/repo/net/sf/sam/1.104.1628/sam-1.104.1628.jar
similarity index 100%
rename from settings/repository/net.sf/sam-1.104.1628.jar
rename to public/repo/net/sf/sam/1.104.1628/sam-1.104.1628.jar
diff --git a/public/repo/net/sf/sam/1.104.1628/sam-1.104.1628.pom b/public/repo/net/sf/sam/1.104.1628/sam-1.104.1628.pom
new file mode 100644
index 000000000..4d9e63822
--- /dev/null
+++ b/public/repo/net/sf/sam/1.104.1628/sam-1.104.1628.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf</groupId>
+  <artifactId>sam</artifactId>
+  <name>sam</name>
+  <version>1.104.1628</version>
+</project>
diff --git a/settings/repository/net.sf.snpeff/snpeff-2.0.5.jar b/public/repo/net/sf/snpeff/snpeff/2.0.5/snpeff-2.0.5.jar
similarity index 100%
rename from settings/repository/net.sf.snpeff/snpeff-2.0.5.jar
rename to public/repo/net/sf/snpeff/snpeff/2.0.5/snpeff-2.0.5.jar
diff --git a/public/repo/net/sf/snpeff/snpeff/2.0.5/snpeff-2.0.5.pom b/public/repo/net/sf/snpeff/snpeff/2.0.5/snpeff-2.0.5.pom
new file mode 100644
index 000000000..d316e2055
--- /dev/null
+++ b/public/repo/net/sf/snpeff/snpeff/2.0.5/snpeff-2.0.5.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf</groupId>
+  <artifactId>snpeff</artifactId>
+  <name>snpeff</name>
+  <version>2.0.5</version>
+</project>
diff --git a/settings/repository/org.broad/tribble-1.104.1628.jar b/public/repo/org/broad/tribble/1.104.1628/tribble-1.104.1628.jar
similarity index 100%
rename from settings/repository/org.broad/tribble-1.104.1628.jar
rename to public/repo/org/broad/tribble/1.104.1628/tribble-1.104.1628.jar
diff --git a/public/repo/org/broad/tribble/1.104.1628/tribble-1.104.1628.pom b/public/repo/org/broad/tribble/1.104.1628/tribble-1.104.1628.pom
new file mode 100644
index 000000000..9acaf0dd1
--- /dev/null
+++ b/public/repo/org/broad/tribble/1.104.1628/tribble-1.104.1628.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.broad</groupId>
+  <artifactId>tribble</artifactId>
+  <name>tribble</name>
+  <version>1.104.1628</version>
+</project>
diff --git a/settings/repository/org.broadinstitute/variant-1.105.1642.jar b/public/repo/org/broadinstitute/variant/1.105.1642/variant-1.105.1642.jar
similarity index 100%
rename from settings/repository/org.broadinstitute/variant-1.105.1642.jar
rename to public/repo/org/broadinstitute/variant/1.105.1642/variant-1.105.1642.jar
diff --git a/public/repo/org/broadinstitute/variant/1.105.1642/variant-1.105.1642.pom b/public/repo/org/broadinstitute/variant/1.105.1642/variant-1.105.1642.pom
new file mode 100644
index 000000000..7fafe61f4
--- /dev/null
+++ b/public/repo/org/broadinstitute/variant/1.105.1642/variant-1.105.1642.pom
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.broadinstitute</groupId>
+  <artifactId>variant</artifactId>
+  <name>variant</name>
+  <version>1.105.1642</version>
+</project>
diff --git a/public/sting-root/pom.xml b/public/sting-root/pom.xml
new file mode 100644
index 000000000..080ed05c4
--- /dev/null
+++ b/public/sting-root/pom.xml
@@ -0,0 +1,614 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!--
+    This pom is parent for all sting/gatk poms
+    See also:
+      http://maven.apache.org/pom.html#Inheritance_v
+      http://maven.apache.org/guides/introduction/introduction-to-the-pom.html#Project_Inheritance_vs_Project_Aggregation
+      http://stackoverflow.com/questions/1992213/maven-parent-pom-vs-modules-pom
+    -->
+
+    <groupId>org.broadinstitute.sting</groupId>
+    <artifactId>sting-root</artifactId>
+    <version>2.8-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Sting Root</name>
+
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
+    <properties>
+        <sourceEncoding>UTF-8</sourceEncoding>
+        <project.build.sourceEncoding>${sourceEncoding}</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>${sourceEncoding}</project.reporting.outputEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.build.timestamp.format>yyyy/MM/dd HH:mm:ss</maven.build.timestamp.format>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <sting.committests.skipped>true</sting.committests.skipped>
+        <sting.unittests.skipped>${sting.committests.skipped}</sting.unittests.skipped>
+        <sting.integrationtests.skipped>${sting.committests.skipped}</sting.integrationtests.skipped>
+        <sting.pipelinetests.skipped>${sting.committests.skipped}</sting.pipelinetests.skipped>
+        <sting.largescaletests.skipped>true</sting.largescaletests.skipped>
+        <sting.pipelinetests.run>false</sting.pipelinetests.run>
+        <test.maxmemory>4g</test.maxmemory>
+        <test.args>-Xmx${test.maxmemory}</test.args>
+    </properties>
+
+    <!-- Dependency configuration (versions, etc.) -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-compiler</artifactId>
+                <version>2.10.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>2.10.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.cofoja</groupId>
+                <artifactId>cofoja</artifactId>
+                <version>1.0-r139</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf</groupId>
+                <artifactId>sam</artifactId>
+                <version>1.104.1628</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf</groupId>
+                <artifactId>picard</artifactId>
+                <version>1.104.1628</version>
+            </dependency>
+            <dependency>
+                <groupId>edu.mit.broad</groupId>
+                <artifactId>picard-private-parts</artifactId>
+                <version>2872</version>
+            </dependency>
+            <dependency>
+                <groupId>org.broad</groupId>
+                <artifactId>tribble</artifactId>
+                <version>1.104.1628</version>
+            </dependency>
+            <dependency>
+                <groupId>org.broadinstitute</groupId>
+                <artifactId>variant</artifactId>
+                <version>1.105.1642</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.15</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.jdmk</groupId>
+                        <artifactId>jmxtools</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.jms</groupId>
+                        <artifactId>jms</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jmx</groupId>
+                        <artifactId>jmxri</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>colt</groupId>
+                <artifactId>colt</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>it.unimi.dsi</groupId>
+                <artifactId>fastutil</artifactId>
+                <version>6.5.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.simpleframework</groupId>
+                <artifactId>simple-xml</artifactId>
+                <version>2.0.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.bcel</groupId>
+                <artifactId>bcel</artifactId>
+                <version>5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.reflections</groupId>
+                <artifactId>reflections</artifactId>
+                <version>0.9.8</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+            <dependency>
+                <groupId>gov.nist</groupId>
+                <artifactId>Jama</artifactId>
+                <version>1.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.jgrapht</groupId>
+                <artifactId>jgrapht</artifactId>
+                <version>0.8.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.freemarker</groupId>
+                <artifactId>freemarker</artifactId>
+                <version>2.3.18</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-email</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-jexl</artifactId>
+                <version>2.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.5</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-math</artifactId>
+                <version>2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>3.2.7</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jets3t</groupId>
+                <artifactId>jets3t</artifactId>
+                <version>0.8.1</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.gridscheduler</groupId>
+                <artifactId>drmaa</artifactId>
+                <version>6.2u5p2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.uncommons</groupId>
+                <artifactId>reportng</artifactId>
+                <version>1.1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>3.8-beta3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>3.8-beta3</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sf.snpeff</groupId>
+                <artifactId>snpeff</artifactId>
+                <version>2.0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mongodb</groupId>
+                <artifactId>mongo-java-driver</artifactId>
+                <version>2.7.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.1.1</version>
+            </dependency>
+
+            <!--
+            For com.sun.javadoc
+            See also: http://sunnytalkstech.blogspot.in/2011/08/maven-dependency-for-toolsjar-in-jdk7.html
+            -->
+            <dependency>
+                <groupId>com.sun</groupId>
+                <artifactId>tools</artifactId>
+                <version>1.4.2</version>
+                <scope>system</scope>
+                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+            </dependency>
+
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>6.8</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.caliper</groupId>
+                <artifactId>caliper</artifactId>
+                <version>0.5-rc1</version>
+                <scope>test</scope>
+                <exclusions>
+                    <!--
+                    TODO: After upgrade to caliper 1.0-beta-1 or later, this may need a revisit.
+                    Possibly other modules may need to exclude *their* old guava versions.
+                     -->
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <!-- Plugin configuration -->
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.lukegb.mojo</groupId>
+                    <artifactId>gitdescribe-maven-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>2.5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.9.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.scala-tools</groupId>
+                    <artifactId>maven-scala-plugin</artifactId>
+                    <version>2.15.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+
+                <!--
+                surefire/failsafe configurations are global, even across poms
+                not directly aggregated, for example package-tests/pom.xml
+                -->
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.16</version>
+                    <configuration>
+                        <!-- See explicit executions below -->
+                        <skip>true</skip>
+                        <failIfNoTests>false</failIfNoTests>
+                        <useFile>false</useFile>
+                        <reportFormat>plain</reportFormat>
+                        <argLine>${test.args}</argLine>
+                        <properties>
+                            <property>
+                                <name>usedefaultlisteners</name>
+                                <value>false</value>
+                                <!-- TODO: Why do the default listeners take so long post tests, what is the "old" directory, and why doesn't ant have this problem? -->
+                            </property>
+                        </properties>
+                        <systemPropertyVariables>
+                            <clover.pertest.coverage>diff</clover.pertest.coverage>
+                            <java.awt.headless>true</java.awt.headless>
+                            <!-- TODO: Fix BaseTest to not error out if this property is missing. -->
+                            <pipeline.run>${sting.pipelinetests.run}</pipeline.run>
+                            <java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
+                        </systemPropertyVariables>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>default-test</id>
+                            <phase>none</phase>
+                        </execution>
+                        <execution>
+                            <!-- run all non integration tests -->
+                            <id>unit-tests</id>
+                            <goals>
+                                <goal>test</goal>
+                            </goals>
+                            <configuration>
+                                <!-- TODO: Re-enable unit tests by default? -->
+                                <skip>${sting.unittests.skipped}</skip>
+                                <includes>
+                                    <include>**/*UnitTest.class</include>
+                                </includes>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>2.16</version>
+                    <configuration>
+                        <!-- See explicit executions below -->
+                        <skip>true</skip>
+                        <failIfNoTests>false</failIfNoTests>
+                        <useFile>false</useFile>
+                        <reportFormat>plain</reportFormat>
+                        <argLine>${test.args}</argLine>
+                        <properties>
+                            <property>
+                                <name>usedefaultlisteners</name>
+                                <value>false</value>
+                                <!-- TODO: Why do the default listeners take so long post tests, what is the "old" directory, and why doesn't ant have this problem? -->
+                            </property>
+                        </properties>
+                        <systemPropertyVariables>
+                            <clover.pertest.coverage>diff</clover.pertest.coverage>
+                            <java.awt.headless>true</java.awt.headless>
+                            <!-- TODO: Fix BaseTest to not error out if this property is missing. -->
+                            <pipeline.run>${sting.pipelinetests.run}</pipeline.run>
+                            <java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
+                        </systemPropertyVariables>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>integration-tests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <!-- run integration tests -->
+                            <configuration>
+                                <!-- TODO: Re-enable integration tests by default? -->
+                                <skip>${sting.integrationtests.skipped}</skip>
+                                <includes>
+                                    <include>**/*IntegrationTest.class</include>
+                                </includes>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>pipeline-tests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <!-- run pipeline dry run tests -->
+                            <configuration>
+                                <!-- TODO: Re-enable pipeline tests by default? -->
+                                <skip>${sting.pipelinetests.skipped}</skip>
+                                <includes>
+                                    <include>**/*PipelineTest.class</include>
+                                </includes>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>large-scale-tests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <!-- run large scale tests -->
+                            <configuration>
+                                <skip>${sting.largescaletests.skipped}</skip>
+                                <includes>
+                                    <include>**/*LargeScaleTest.class</include>
+                                </includes>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <plugin>
+                    <groupId>com.google.code.sortpom</groupId>
+                    <artifactId>maven-sortpom-plugin</artifactId>
+                    <version>2.2</version>
+                    <configuration>
+                        <createBackupFile>false</createBackupFile>
+                        <predefinedSortOrder>custom_1</predefinedSortOrder>
+                        <lineSeparator>\n</lineSeparator>
+                        <encoding>${sourceEncoding}</encoding>
+                        <keepBlankLines>true</keepBlankLines>
+                        <sortDependencies>scope</sortDependencies>
+                        <nrOfIndentSpace>4</nrOfIndentSpace>
+                        <expandEmptyElements>false</expandEmptyElements>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>sort</goal>
+                            </goals>
+                            <phase>verify</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- TODO: Remove temporary symbolic link creation, after fixing test paths to use local resources. -->
+                <plugin>
+                    <groupId>com.pyx4j</groupId>
+                    <artifactId>maven-junction-plugin</artifactId>
+                    <version>1.0.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-invoker-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.3</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <!-- Invoke plugins that always run -->
+        <plugins>
+            <plugin>
+                <groupId>com.lukegb.mojo</groupId>
+                <artifactId>gitdescribe-maven-plugin</artifactId>
+                <configuration>
+                    <extraArguments>
+                        <param>--long</param>
+                    </extraArguments>
+                    <setReactorProjectsProperties>true</setReactorProjectsProperties>
+                    <descriptionProperty>git.version</descriptionProperty>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>gitdescribe-initialize</id>
+                        <goals>
+                            <goal>gitdescribe</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                    <execution>
+                        <id>gitdescribe-presite</id>
+                        <goals>
+                            <goal>gitdescribe</goal>
+                        </goals>
+                        <phase>pre-site</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <!-- TODO: gitdescribe plugin doesn't allow null prefixes -->
+                <executions>
+                    <execution>
+                        <id>fix-version-initialize</id>
+                        <goals>
+                            <goal>regex-property</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <name>build.version</name>
+                            <value>${git.version}</value>
+                            <regex>git-</regex>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>fix-version-pre-site</id>
+                        <goals>
+                            <goal>regex-property</goal>
+                        </goals>
+                        <phase>pre-site</phase>
+                        <configuration>
+                            <name>build.version</name>
+                            <value>${git.version}</value>
+                            <regex>git-</regex>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.sortpom</groupId>
+                <artifactId>maven-sortpom-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>sort</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+    </reporting>
+
+    <repositories>
+        <repository>
+            <id>sting.public.repo.local</id>
+            <name>Sting Public Local Repository</name>
+            <url>file:${sting.basedir}/public/repo</url>
+        </repository>
+        <repository>
+            <id>sting.private.repo.local</id>
+            <name>Sting Private Local Repository</name>
+            <url>file:${sting.basedir}/private/repo</url>
+        </repository>
+    </repositories>
+
+</project>
diff --git a/public/sting-utils/pom.xml b/public/sting-utils/pom.xml
new file mode 100644
index 000000000..043be645f
--- /dev/null
+++ b/public/sting-utils/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.broadinstitute.sting</groupId>
+        <artifactId>sting-aggregator</artifactId>
+        <version>2.8-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <artifactId>sting-utils</artifactId>
+    <packaging>jar</packaging>
+    <name>Sting Utils</name>
+
+    <properties>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
+        <gsalib.packagedir>org/broadinstitute/sting/utils/R</gsalib.packagedir>
+        <gsalib.filename>gsalib.tar.gz</gsalib.filename>
+        <sting.test-utils-jar.phase>${sting.jar.phase}</sting.test-utils-jar.phase>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.sf</groupId>
+            <artifactId>sam</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sf</groupId>
+            <artifactId>picard</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.broad</groupId>
+            <artifactId>tribble</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.broadinstitute</groupId>
+            <artifactId>variant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>colt</groupId>
+            <artifactId>colt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.simpleframework</groupId>
+            <artifactId>simple-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-jexl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jets3t</groupId>
+            <artifactId>jets3t</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.gridscheduler</groupId>
+            <artifactId>drmaa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.cofoja</groupId>
+            <artifactId>cofoja</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gsalib</artifactId>
+            <version>${project.version}</version>
+            <type>tar.gz</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.caliper</groupId>
+            <artifactId>caliper</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-gsalib</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>gsalib</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>tar.gz</type>
+                                    <outputDirectory>${project.build.outputDirectory}/${gsalib.packagedir}</outputDirectory>
+                                    <destFileName>${gsalib.filename}</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/public/sting-utils/src/main/config/org/broadinstitute/sting/utils/help/log4j.properties b/public/sting-utils/src/main/config/org/broadinstitute/sting/utils/help/log4j.properties
new file mode 100644
index 000000000..38c8335c9
--- /dev/null
+++ b/public/sting-utils/src/main/config/org/broadinstitute/sting/utils/help/log4j.properties
@@ -0,0 +1,7 @@
+# Root logger option
+log4j.rootLogger=INFO, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
diff --git a/settings/ivysettings.properties b/settings/ivysettings.properties
deleted file mode 100644
index 8a67434f9..000000000
--- a/settings/ivysettings.properties
+++ /dev/null
@@ -1 +0,0 @@
-repository.dir=${ivy.settings.dir}/repository
diff --git a/settings/ivysettings.xml b/settings/ivysettings.xml
deleted file mode 100644
index ce7667140..000000000
--- a/settings/ivysettings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<ivysettings>
-  <properties file="${ivy.settings.dir}/ivysettings.properties"/>
-  <settings defaultResolver="chain"/>
-  <resolvers>
-    <chain name="chain">
-      <filesystem name="projects">
-	<artifact pattern="${repository.dir}/[organisation]/[artifact]-[revision].[ext]" />
-	<ivy pattern="${repository.dir}/[organisation]/[module]-[revision].xml" />
-      </filesystem>
-      <ibiblio name="maven" root="http://repo1.maven.org/maven2" m2compatible="true" />
-    </chain>
-  </resolvers>
-</ivysettings>
diff --git a/settings/repository/com.google.code.caliper/caliper-1.0-SNAPSHOT.xml b/settings/repository/com.google.code.caliper/caliper-1.0-SNAPSHOT.xml
deleted file mode 100644
index 0e2b727e1..000000000
--- a/settings/repository/com.google.code.caliper/caliper-1.0-SNAPSHOT.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="com.google.code.caliper" module="caliper" revision="1.0-SNAPSHOT" status="integration" publication="20110609114800" />
-</ivy-module>
diff --git a/settings/repository/com.google.code.cofoja/cofoja-1.0-r139.xml b/settings/repository/com.google.code.cofoja/cofoja-1.0-r139.xml
deleted file mode 100644
index 202d3d0a3..000000000
--- a/settings/repository/com.google.code.cofoja/cofoja-1.0-r139.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="com.google.code.cofoja" module="cofoja" revision="1.0-r139" status="integration" publication="20110609114800" />
-</ivy-module>
diff --git a/settings/repository/edu.mit.broad/picard-private-parts-2872.jar b/settings/repository/edu.mit.broad/picard-private-parts-2872.jar
deleted file mode 100644
index b6e685684..000000000
Binary files a/settings/repository/edu.mit.broad/picard-private-parts-2872.jar and /dev/null differ
diff --git a/settings/repository/edu.mit.broad/picard-private-parts-2872.xml b/settings/repository/edu.mit.broad/picard-private-parts-2872.xml
deleted file mode 100644
index 677d27d80..000000000
--- a/settings/repository/edu.mit.broad/picard-private-parts-2872.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="edu.mit.broad" module="picard-private-parts" revision="2872" status="integration" publication="" />
-</ivy-module>
diff --git a/settings/repository/gov.nist/Jama-1.0.2.xml b/settings/repository/gov.nist/Jama-1.0.2.xml
deleted file mode 100644
index 57ea106ea..000000000
--- a/settings/repository/gov.nist/Jama-1.0.2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="gov.nist" module="Jama" revision="1.0.2" status="release" />
-</ivy-module>
diff --git a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.xml b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.xml
deleted file mode 100644
index c6a8da052..000000000
--- a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="net.sf.gridscheduler" module="drmaa" revision="6.2u5p2" status="release" />
-</ivy-module>
diff --git a/settings/repository/net.sf.snpeff/snpeff-2.0.5.xml b/settings/repository/net.sf.snpeff/snpeff-2.0.5.xml
deleted file mode 100644
index 9a622abe5..000000000
--- a/settings/repository/net.sf.snpeff/snpeff-2.0.5.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="net.sf.snpeff" module="snpeff" revision="2.0.5" status="release" />
-</ivy-module>
diff --git a/settings/repository/net.sf/picard-1.104.1628.xml b/settings/repository/net.sf/picard-1.104.1628.xml
deleted file mode 100644
index bd0c9fbcd..000000000
--- a/settings/repository/net.sf/picard-1.104.1628.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="net.sf" module="picard" revision="1.104.1628" status="release" />
-</ivy-module>
diff --git a/settings/repository/net.sf/sam-1.104.1628.xml b/settings/repository/net.sf/sam-1.104.1628.xml
deleted file mode 100644
index 0b0cba93f..000000000
--- a/settings/repository/net.sf/sam-1.104.1628.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="net.sf" module="sam" revision="1.104.1628" status="release" />
-</ivy-module>
diff --git a/settings/repository/org.broad/tribble-1.104.1628.xml b/settings/repository/org.broad/tribble-1.104.1628.xml
deleted file mode 100644
index c2158e974..000000000
--- a/settings/repository/org.broad/tribble-1.104.1628.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="org.broad" module="tribble" revision="1.104.1628" status="integration" />
-</ivy-module>
diff --git a/settings/repository/org.broadinstitute/variant-1.105.1642.xml b/settings/repository/org.broadinstitute/variant-1.105.1642.xml
deleted file mode 100644
index d1846ce23..000000000
--- a/settings/repository/org.broadinstitute/variant-1.105.1642.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<ivy-module version="1.0">
-    <info organisation="org.broadinstitute" module="variant" revision="1.105.1642" status="integration" />
-</ivy-module>