Merge latest trunk changes
git-svn-id: https://svn.apache.org/repos/asf/pig/branches/maven@1617821 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/KEYS b/pig/KEYS
similarity index 100%
rename from KEYS
rename to pig/KEYS
diff --git a/autocomplete b/pig/autocomplete
similarity index 100%
rename from autocomplete
rename to pig/autocomplete
diff --git a/bin/pig b/pig/bin/pig
old mode 100755
new mode 100644
similarity index 100%
rename from bin/pig
rename to pig/bin/pig
diff --git a/bin/pig.cmd b/pig/bin/pig.cmd
similarity index 100%
rename from bin/pig.cmd
rename to pig/bin/pig.cmd
diff --git a/bin/pig.py b/pig/bin/pig.py
similarity index 100%
rename from bin/pig.py
rename to pig/bin/pig.py
diff --git a/build.xml b/pig/build.xml
similarity index 100%
rename from build.xml
rename to pig/build.xml
diff --git a/conf/log4j.properties.template b/pig/conf/log4j.properties.template
similarity index 100%
rename from conf/log4j.properties.template
rename to pig/conf/log4j.properties.template
diff --git a/conf/pig.properties b/pig/conf/pig.properties
similarity index 100%
rename from conf/pig.properties
rename to pig/conf/pig.properties
diff --git a/conf/test-log4j.properties b/pig/conf/test-log4j.properties
similarity index 100%
rename from conf/test-log4j.properties
rename to pig/conf/test-log4j.properties
diff --git a/doap_Pig.rdf b/pig/doap_Pig.rdf
similarity index 100%
rename from doap_Pig.rdf
rename to pig/doap_Pig.rdf
diff --git a/ivy.xml b/pig/ivy.xml
similarity index 100%
rename from ivy.xml
rename to pig/ivy.xml
diff --git a/ivy/ivysettings.xml b/pig/ivy/ivysettings.xml
similarity index 100%
rename from ivy/ivysettings.xml
rename to pig/ivy/ivysettings.xml
diff --git a/ivy/libraries.properties b/pig/ivy/libraries.properties
similarity index 100%
rename from ivy/libraries.properties
rename to pig/ivy/libraries.properties
diff --git a/ivy/pig-template.xml b/pig/ivy/pig-template.xml
similarity index 100%
rename from ivy/pig-template.xml
rename to pig/ivy/pig-template.xml
diff --git a/ivy/piggybank-template.xml b/pig/ivy/piggybank-template.xml
similarity index 100%
rename from ivy/piggybank-template.xml
rename to pig/ivy/piggybank-template.xml
diff --git a/ivy/pigsmoke-template.xml b/pig/ivy/pigsmoke-template.xml
similarity index 100%
rename from ivy/pigsmoke-template.xml
rename to pig/ivy/pigsmoke-template.xml
diff --git a/ivy/pigunit-template.xml b/pig/ivy/pigunit-template.xml
similarity index 100%
rename from ivy/pigunit-template.xml
rename to pig/ivy/pigunit-template.xml
diff --git a/lib-src/bzip2/org/apache/pig/bzip2r/Bzip2TextInputFormat.java b/pig/lib-src/bzip2/org/apache/pig/bzip2r/Bzip2TextInputFormat.java
similarity index 100%
rename from lib-src/bzip2/org/apache/pig/bzip2r/Bzip2TextInputFormat.java
rename to pig/lib-src/bzip2/org/apache/pig/bzip2r/Bzip2TextInputFormat.java
diff --git a/lib-src/bzip2/org/apache/tools/bzip2r/BZip2Constants.java b/pig/lib-src/bzip2/org/apache/tools/bzip2r/BZip2Constants.java
similarity index 100%
rename from lib-src/bzip2/org/apache/tools/bzip2r/BZip2Constants.java
rename to pig/lib-src/bzip2/org/apache/tools/bzip2r/BZip2Constants.java
diff --git a/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java b/pig/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
similarity index 100%
rename from lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
rename to pig/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2InputStream.java
diff --git a/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java b/pig/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
similarity index 100%
rename from lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
rename to pig/lib-src/bzip2/org/apache/tools/bzip2r/CBZip2OutputStream.java
diff --git a/lib-src/bzip2/org/apache/tools/bzip2r/CRC.java b/pig/lib-src/bzip2/org/apache/tools/bzip2r/CRC.java
similarity index 100%
rename from lib-src/bzip2/org/apache/tools/bzip2r/CRC.java
rename to pig/lib-src/bzip2/org/apache/tools/bzip2r/CRC.java
diff --git a/license/brics-LICENSE.txt b/pig/license/brics-LICENSE.txt
similarity index 100%
rename from license/brics-LICENSE.txt
rename to pig/license/brics-LICENSE.txt
diff --git a/license/hadoop-LICENSE.txt b/pig/license/hadoop-LICENSE.txt
similarity index 100%
rename from license/hadoop-LICENSE.txt
rename to pig/license/hadoop-LICENSE.txt
diff --git a/license/javacc-LICENSE.txt b/pig/license/javacc-LICENSE.txt
similarity index 100%
rename from license/javacc-LICENSE.txt
rename to pig/license/javacc-LICENSE.txt
diff --git a/license/jline-LICENSE.txt b/pig/license/jline-LICENSE.txt
similarity index 100%
rename from license/jline-LICENSE.txt
rename to pig/license/jline-LICENSE.txt
diff --git a/license/jsch-LICENSE.txt b/pig/license/jsch-LICENSE.txt
similarity index 100%
rename from license/jsch-LICENSE.txt
rename to pig/license/jsch-LICENSE.txt
diff --git a/license/junit-LICENSE.txt b/pig/license/junit-LICENSE.txt
similarity index 100%
rename from license/junit-LICENSE.txt
rename to pig/license/junit-LICENSE.txt
diff --git a/pig/pom.xml b/pig/pom.xml
new file mode 100644
index 0000000..cd9ce1f
--- /dev/null
+++ b/pig/pom.xml
@@ -0,0 +1,970 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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.apache.pig</groupId>
+ <artifactId>pig-main</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>pig</artifactId>
+ <packaging>jar</packaging>
+
+ <repositories>
+ <repository>
+ <id>repo.apache.snapshots</id>
+ <url>http://repository.apache.org/content/groups/snapshots-group/</url>
+ </repository>
+ <repository>
+ <id>repo.jboss.org</id>
+ <url>http://repository.jboss.com/nexus/content/groups/public/</url>
+ </repository>
+ </repositories>
+
+ <properties>
+ <name>pig</name>
+ <Name>Pig</Name>
+ <organizationName>The Apache Software Foundation</organizationName>
+ <output.jarfile.core>${project.build.finalName}</output.jarfile.core>
+
+ <final.name>${name}-${project.version}</final.name>
+
+ <lib.dir>${project.basedir}/lib</lib.dir>
+
+ <javadoc.link.java>http://download.oracle.com/javase/1.5.0/docs/api/</javadoc.link.java>
+
+ <!--Test Configurations-->
+ <skipTests>true</skipTests>
+ <test.src.dir>${project.basedir}/test</test.src.dir>
+ <tests>unit-tests</tests>
+ <test.include.file>${test.src.dir}/${tests}</test.include.file>
+ <test.exclude.file>${test.src.dir}/excluded-tests-20</test.exclude.file>
+ <test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir>
+ <test.extra.path/>
+ <test.exec.type>mr</test.exec.type>
+ <ssh.gateway/>
+ <hod.server/>
+ <debugArgs><!-- -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y --></debugArgs>
+ <test.junit.output.format>plain</test.junit.output.format>
+ <test.log.dir>${basedir}/target</test.log.dir>
+ <test.timeout>7200000</test.timeout>
+
+ </properties>
+
+ <build>
+
+ <testSourceDirectory>${project.basedir}/test/</testSourceDirectory>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>test/org/apache/pig/test/utils/dotGraph/parser</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>${project.basedir}/</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>src-gen/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>build/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>lib/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <show>private</show>
+ <nohelp>true</nohelp>
+ <quiet>true</quiet>
+ <groups>
+ <group>
+ <title>pig</title>
+ <packages>org.apache.*</packages>
+ </group>
+ </groups>
+ <sourcepath>${basedir}/src/main/java/</sourcepath>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
+
+ <!-- All tests are considered as integration tests as most of them should be run after package phase
+ So tests are skipped in the test phase -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
+ <!-- Tests are run based on the profile selected. skipped by default -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.17</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+
+ <skipTests>${skipTests}</skipTests>
+
+ <reuseForks>false</reuseForks>
+ <includesFile>${test.include.file}</includesFile>
+ <excludesFile>${test.exclude.file}</excludesFile>
+
+ <excludes>
+ <exclude>**/TestHelper.java</exclude>
+ <exclude>**/TestLargeFile.java</exclude>
+ <exclude>**/TestOrderBy.java</exclude>
+ <exclude>**/TestOrderBy2.java</exclude>
+ <exclude>**/TestPi.java</exclude>
+ <exclude>**/e2e/**</exclude>
+ <exclude>**/TestRegisteredJarVisibility.java</exclude>
+ </excludes>
+
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.basedir}/${output.jarfile.core}.jar
+ </additionalClasspathElement>
+ <additionalClasspathElement>${project.basedir}/</additionalClasspathElement>
+ <additionalClasspathElement>${project.basedir}/build/classes</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}</additionalClasspathElement>
+ </additionalClasspathElements>
+
+ <argLine>-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M -Xms2048m -Xmx2048m ${debugArgs}
+ </argLine>
+
+ <printSummary>true</printSummary>
+
+ <environmentVariables>
+ <PATH>${env.PATH}${test.extra.path}</PATH>
+ <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+ </environmentVariables>
+
+ <systemPropertyVariables>
+ <hadoopversion>${hadoopversion}</hadoopversion>
+ <test.exec.type>${test.exec.type}</test.exec.type>
+ <ssh.gateway>${ssh.gateway}</ssh.gateway>
+ <hod.server>${hod.server}</hod.server>
+ <java.security.krb5.realm/>
+ <java.security.krb5.kdc/>
+
+ <log4j.configuration>file:${project.basedir}/conf/test-log4j.properties</log4j.configuration>
+ <hadoop.log.dir>${test.tmp.dir}</hadoop.log.dir>
+ </systemPropertyVariables>
+
+ </configuration>
+ </plugin>
+
+
+ <!--This plugin is used to get the svn revision number-->
+ <plugin>
+ <groupId>com.google.code.maven-svn-revision-number-plugin</groupId>
+ <artifactId>svn-revision-number-maven-plugin</artifactId>
+ <version>1.13</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <entries>
+ <entry>
+ <prefix>pig-svn</prefix>
+ </entry>
+ </entries>
+ </configuration>
+ </plugin>
+
+ <!--Adding entries in the MANIFEST -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <outputDirectory>${basedir}</outputDirectory>
+ <finalName>${output.jarfile.core}</finalName>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <manifest>
+ <mainClass>org.apache.pig.Main</mainClass>
+ </manifest>
+ <manifestSections>
+ <manifestSection>
+ <name>org/apache/pig</name>
+ <manifestEntries>
+ <Implementation-Vendor>Apache</Implementation-Vendor>
+ <Implementation-Title>Pig</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Build-TimeStamp>${maven.build.timestamp}</Build-TimeStamp>
+ <Svn-Revision>${pig-svn.revision}</Svn-Revision>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Copying the dependencies to lib folder -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>copy-common-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>${antlr.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.antlr</groupId>
+ <artifactId>ST4</artifactId>
+ <version>${stringtemplate.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda-time.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>dk.brics.automaton</groupId>
+ <artifactId>automaton</artifactId>
+ <version>1.11-8</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>${jansi.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-tools</artifactId>
+ <version>${avro.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>trevni-core</artifactId>
+ <version>${avro.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>trevni-avro</artifactId>
+ <version>${avro.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ <version>${jython.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>${rhino.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <classifier>core</classifier>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ <version>${hive.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ <version>${hive.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-common</artifactId>
+ <version>${hive.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-common-secure</artifactId>
+ <version>${hive.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${accumulo15.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${basedir}/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--Compiling the ANTLR grammars in generate-sources phase-->
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>3.4</version>
+ <executions>
+
+ <execution>
+ <id>antlr</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <outputDirectory>src-gen/</outputDirectory>
+ </configuration>
+ <goals>
+ <goal>antlr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Compiling the JavaCC grammars in the generate-sources phase-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <!-- For the grammar file in the tests folder-->
+ <execution>
+ <id>jjtree-javacc</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>jjtree-javacc</goal>
+ </goals>
+ <configuration>
+ <interimDirectory>test/</interimDirectory>
+ <excludes>
+ <exclude>**/*.jj</exclude>
+ </excludes>
+ <sourceDirectory>test/</sourceDirectory>
+ <outputDirectory>test/</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <configuration>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <outputDirectory>src-gen/</outputDirectory>
+ </configuration>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Creating pigunit and pigsmoke -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>pigunit</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <finalName>pigunit</finalName>
+ <descriptor>src/assembly/pigunit.xml</descriptor>
+ </configuration>
+ </execution>
+ <execution>
+ <id>smoketests</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <finalName>${final.name}-smoketests</finalName>
+ <descriptor>src/assembly/smoketests.xml</descriptor>
+ <archive>
+ <manifestSections>
+ <manifestSection>
+ <name>org/apache/pig/test/pigunit</name>
+ <manifestEntries>
+ <Implementation-Vendor>Apache</Implementation-Vendor>
+ <Implementation-Title>Pig</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Build-TimeStamp>${maven.build.timestamp}</Build-TimeStamp>
+ <Svn-Revision>${pig-svn.revision}</Svn-Revision>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- This plugin is used to generate two dummy poms for pigunit and pigsmoke-->
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <version>1.5.3</version>
+ <executions>
+ <execution>
+ <id>pigunit</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <file>${basedir}/poms/pigunit-template.xml</file>
+ <outputFile>${basedir}/poms/pigunit.xml</outputFile>
+ <replacements>
+ <replacement>
+ <token>@version</token>
+ <value>${project.version}</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </execution>
+ <execution>
+ <id>smoketests</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ <configuration>
+ <file>${basedir}/poms/pigsmoke-template.xml</file>
+ <outputFile>${basedir}/poms/pigsmoke.xml</outputFile>
+ <replacements>
+ <replacement>
+ <token>@version</token>
+ <value>${project.version}</value>
+ </replacement>
+ </replacements>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Two executions are added to gpg-plugin to sign and deploy pigunit and smoke-tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <repositoryId>${distrepositoryId}</repositoryId>
+ <url>${distrepositoryUrl}</url>
+ </configuration>
+ <executions>
+ <execution>
+ <id>sign-and-deploy-pigunit</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign-and-deploy-file</goal>
+ </goals>
+ <configuration>
+ <passphrase>${gpg.passphrase}</passphrase>
+ <useAgent>${gpg.useagent}</useAgent>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>pigunit</artifactId>
+ <version>${project.version}</version>
+ <file>${project.build.directory}/pigunit.jar</file>
+ <pomFile>${basedir}/poms/pigunit.xml</pomFile>
+
+ </configuration>
+ </execution>
+ <execution>
+ <id>sign-and-deploy-pigsmoke</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign-and-deploy-file</goal>
+ </goals>
+ <configuration>
+ <passphrase>${gpg.passphrase}</passphrase>
+ <useAgent>${gpg.useagent}</useAgent>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>pigsmoke</artifactId>
+ <version>${project.version}</version>
+ <file>${project.build.directory}/${final.name}-smoketests.jar</file>
+ <pomFile>${basedir}/poms/pigsmoke.xml</pomFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <profiles>
+
+ <profile>
+ <id>hadoop1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <hadoopversion>20</hadoopversion>
+ <output.jarfile.core>${project.build.finalName}-core-h1</output.jarfile.core>
+ <test.exclude.file>${test.src.dir}/excluded-tests-20</test.exclude.file>
+ </properties>
+
+ <build>
+ <plugins>
+ <!--Excluding tez for hadoop 1 version-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <excludes>
+ <exclude>**/tez/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <testExcludes>
+ <exclude>**/tez/**</exclude>
+ <exclude>perf/**</exclude>
+ <exclude>**/PigTestLoader.java</exclude>
+ <exclude>**/resources/**</exclude>
+ </testExcludes>
+ </configuration>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Adding other src folders with the appropriate shims folder-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>lib-src</source>
+ <source>src-gen</source>
+ <source>shims/src/hadoop20</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-shims</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test</source>
+ <source>shims/test/hadoop20</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Copying the h1 dependencies to lib folder -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>copy-h1-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <version>${avro.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-0.20S</artifactId>
+ <version>${hive.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop1-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase95.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase95.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase95.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase95.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${basedir}/lib/h1</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>hadoop2</id>
+ <properties>
+ <hadoopversion>23</hadoopversion>
+ <output.jarfile.core>${project.build.finalName}-core-h2</output.jarfile.core>
+ <test.exclude.file>${test.src.dir}/excluded-tests-20</test.exclude.file>
+ </properties>
+ <build>
+ <plugins>
+ <!-- Adding other src folders with the appropriate shims folder-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>lib-src</source>
+ <source>src-gen</source>
+ <source>shims/src/hadoop23</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-shims</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test</source>
+ <source>shims/test/hadoop20</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <testExcludes>
+ <exclude>perf/**</exclude>
+ <exclude>**/PigTestLoader.java</exclude>
+ <exclude>**/resources/**</exclude>
+ </testExcludes>
+ </configuration>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ </profile>
+ <profile>
+ <id>test-unit</id>
+ <properties>
+ <skipTests>false</skipTests>
+ </properties>
+ </profile>
+ <profile>
+ <id>test-core</id>
+ <properties>
+ <skipTests>false</skipTests>
+ <test.include.file>${test.src.dir}/all-tests</test.include.file>
+ </properties>
+ </profile>
+ <profile>
+ <id>test-commit</id>
+ <properties>
+ <skipTests>false</skipTests>
+ <test.include.file>${test.src.dir}/commit-tests</test.include.file>
+ </properties>
+ </profile>
+ <profile>
+ <id>test-smoke</id>
+ <properties>
+ <skipTests>false</skipTests>
+ <test.include.file>${test.src.dir}/smoke-tests</test.include.file>
+ </properties>
+ </profile>
+ <profile>
+ <id>test-tez</id>
+ <properties>
+ <skipTests>false</skipTests>
+ <test.include.file>${test.src.dir}/tez-tests</test.include.file>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
diff --git a/ivy/pigsmoke-template.xml b/pig/poms/pigsmoke-template.xml
similarity index 100%
copy from ivy/pigsmoke-template.xml
copy to pig/poms/pigsmoke-template.xml
diff --git a/pig/poms/pigsmoke.xml b/pig/poms/pigsmoke.xml
new file mode 100644
index 0000000..49bc5e1
--- /dev/null
+++ b/pig/poms/pigsmoke.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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.apache.pig</groupId>
+ <artifactId>pigsmoke</artifactId>
+ <packaging>jar</packaging>
+ <version>0.14.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pigunit</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/pig/poms/pigsmoke.xml.asc b/pig/poms/pigsmoke.xml.asc
new file mode 100644
index 0000000..6366647
--- /dev/null
+++ b/pig/poms/pigsmoke.xml.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJT6jpqAAoJEFbow+gUArGourYH/0BxOeKbmo8sdGnwraXLoOU8
+Za7yj1DaVaAU7LqzKDchiUbMsf7oPisKNtsq5OQ0EVLUqhLhh/jRLZJuPUnuCRqX
+Fe4OfBD385dOsGQZRE2MfwFaq4xmb8Zi4jANQIRmb/qtz9gtd6pOdtnt0DJiZooK
+agDM82Hpl/hRFiAwL2Js0TLe5oRGdOBbY8umY4l0FmTWXUbUCzDocwPb8yyhE21c
+Z1ovzYBU787TOU3VIpIa8EksSKXZVMBC4543F2yqkoKHULIlt7E/NWFsPqH6mkPU
+Cb6HjBBhsVCGAH7EgmnNZlFQxBEUqmMhDvSK/L9yWLiDa7D7sxSVgOCRxQdKRNs=
+=zAzm
+-----END PGP SIGNATURE-----
diff --git a/ivy/pigunit-template.xml b/pig/poms/pigunit-template.xml
similarity index 100%
copy from ivy/pigunit-template.xml
copy to pig/poms/pigunit-template.xml
diff --git a/pig/poms/pigunit.xml b/pig/poms/pigunit.xml
new file mode 100644
index 0000000..4ccc990
--- /dev/null
+++ b/pig/poms/pigunit.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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.apache.pig</groupId>
+ <artifactId>pigunit</artifactId>
+ <packaging>jar</packaging>
+ <version>0.14.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/pig/poms/pigunit.xml.asc b/pig/poms/pigunit.xml.asc
new file mode 100644
index 0000000..1db75bd
--- /dev/null
+++ b/pig/poms/pigunit.xml.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJT6jpqAAoJEFbow+gUArGoVScH/2vQ0AwmFnJ6IWpGzXZQt+In
+Yi26sRddnC8FDnjxMG8o2W1sFf4ol1jXo5QMNnq45upkXRu1mEqV5glyVdfOGQR7
+GvVopVB+0kw61rjf3njp32w3jME0QxL3k/u89FWQqc0NdGLBeiBKuHxxD+1ayZ4U
+kdz+uvoi0vLOFrfxoLuCHVEreEG5HE0bq+R79uHRUHC3kn3icdXBuWgQh5r6Qu0K
+mSubi9hHdaZ4hnxytX8QibGgecVfxp1R6EBTllFQ/tYX2FYhxIscMQfeuKCJLuc5
+wg5L0G3GEQr+dfGfD9FQvc4ETfWTqtDPAl00BxuAuAj3ihO2EaEGkl9AFYd8Muw=
+=fABg
+-----END PGP SIGNATURE-----
diff --git a/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java b/pig/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
similarity index 100%
rename from shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
rename to pig/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
diff --git a/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java b/pig/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
similarity index 100%
rename from shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
rename to pig/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
diff --git a/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java b/pig/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
similarity index 100%
rename from shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
rename to pig/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
diff --git a/shims/src/hadoop20/org/apache/pig/backend/hadoop20/PigJobControl.java b/pig/shims/src/hadoop20/org/apache/pig/backend/hadoop20/PigJobControl.java
similarity index 100%
rename from shims/src/hadoop20/org/apache/pig/backend/hadoop20/PigJobControl.java
rename to pig/shims/src/hadoop20/org/apache/pig/backend/hadoop20/PigJobControl.java
diff --git a/shims/src/hadoop23/org/apache/hadoop/mapred/DowngradeHelper.java b/pig/shims/src/hadoop23/org/apache/hadoop/mapred/DowngradeHelper.java
similarity index 100%
rename from shims/src/hadoop23/org/apache/hadoop/mapred/DowngradeHelper.java
rename to pig/shims/src/hadoop23/org/apache/hadoop/mapred/DowngradeHelper.java
diff --git a/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java b/pig/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
similarity index 100%
rename from shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
rename to pig/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
diff --git a/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java b/pig/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
similarity index 100%
rename from shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
rename to pig/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
diff --git a/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java b/pig/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
similarity index 100%
rename from shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
rename to pig/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
diff --git a/shims/src/hadoop23/org/apache/pig/backend/hadoop23/PigJobControl.java b/pig/shims/src/hadoop23/org/apache/pig/backend/hadoop23/PigJobControl.java
similarity index 100%
rename from shims/src/hadoop23/org/apache/pig/backend/hadoop23/PigJobControl.java
rename to pig/shims/src/hadoop23/org/apache/pig/backend/hadoop23/PigJobControl.java
diff --git a/shims/test/hadoop20/org/apache/pig/test/MiniCluster.java b/pig/shims/test/hadoop20/org/apache/pig/test/MiniCluster.java
similarity index 100%
rename from shims/test/hadoop20/org/apache/pig/test/MiniCluster.java
rename to pig/shims/test/hadoop20/org/apache/pig/test/MiniCluster.java
diff --git a/shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java b/pig/shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java
similarity index 100%
rename from shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java
rename to pig/shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java
diff --git a/shims/test/hadoop23/org/apache/pig/test/MiniCluster.java b/pig/shims/test/hadoop23/org/apache/pig/test/MiniCluster.java
similarity index 100%
rename from shims/test/hadoop23/org/apache/pig/test/MiniCluster.java
rename to pig/shims/test/hadoop23/org/apache/pig/test/MiniCluster.java
diff --git a/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java b/pig/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java
similarity index 100%
rename from shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java
rename to pig/shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java
diff --git a/pig/src/assembly/pigunit.xml b/pig/src/assembly/pigunit.xml
new file mode 100644
index 0000000..aecf1cb
--- /dev/null
+++ b/pig/src/assembly/pigunit.xml
@@ -0,0 +1,28 @@
+<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>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/test-classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/org/apache/pig/pigunit/**</include>
+ <include>**/org/apache/pig/test/Util.**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <includes>
+ <include>commons-lang:commons-lang</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/pig/src/assembly/smoketests.xml b/pig/src/assembly/smoketests.xml
new file mode 100644
index 0000000..debe18e
--- /dev/null
+++ b/pig/src/assembly/smoketests.xml
@@ -0,0 +1,26 @@
+<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>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/test-classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/org/apache/pig/pigunit/**</include>
+ <include>**/org/apache/pig/test/Util.**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>test/data/pigunit/**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/docs/forrest.properties b/pig/src/docs/forrest.properties
similarity index 100%
rename from src/docs/forrest.properties
rename to pig/src/docs/forrest.properties
diff --git a/src/docs/forrest.properties.dispatcher.properties b/pig/src/docs/forrest.properties.dispatcher.properties
similarity index 100%
rename from src/docs/forrest.properties.dispatcher.properties
rename to pig/src/docs/forrest.properties.dispatcher.properties
diff --git a/src/docs/forrest.properties.xml b/pig/src/docs/forrest.properties.xml
similarity index 100%
rename from src/docs/forrest.properties.xml
rename to pig/src/docs/forrest.properties.xml
diff --git a/src/docs/jdiff/pig_0.13.0.xml b/pig/src/docs/jdiff/pig_0.13.0.xml
similarity index 100%
rename from src/docs/jdiff/pig_0.13.0.xml
rename to pig/src/docs/jdiff/pig_0.13.0.xml
diff --git a/src/docs/src/documentation/README.txt b/pig/src/docs/src/documentation/README.txt
similarity index 100%
rename from src/docs/src/documentation/README.txt
rename to pig/src/docs/src/documentation/README.txt
diff --git a/src/docs/src/documentation/classes/CatalogManager.properties b/pig/src/docs/src/documentation/classes/CatalogManager.properties
similarity index 100%
rename from src/docs/src/documentation/classes/CatalogManager.properties
rename to pig/src/docs/src/documentation/classes/CatalogManager.properties
diff --git a/src/docs/src/documentation/conf/cli.xconf b/pig/src/docs/src/documentation/conf/cli.xconf
similarity index 100%
rename from src/docs/src/documentation/conf/cli.xconf
rename to pig/src/docs/src/documentation/conf/cli.xconf
diff --git a/src/docs/src/documentation/content/locationmap.xml b/pig/src/docs/src/documentation/content/locationmap.xml
similarity index 100%
rename from src/docs/src/documentation/content/locationmap.xml
rename to pig/src/docs/src/documentation/content/locationmap.xml
diff --git a/src/docs/src/documentation/content/test1.html b/pig/src/docs/src/documentation/content/test1.html
similarity index 100%
rename from src/docs/src/documentation/content/test1.html
rename to pig/src/docs/src/documentation/content/test1.html
diff --git a/src/docs/src/documentation/content/xdocs/admin.xml b/pig/src/docs/src/documentation/content/xdocs/admin.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/admin.xml
rename to pig/src/docs/src/documentation/content/xdocs/admin.xml
diff --git a/src/docs/src/documentation/content/xdocs/basic.xml b/pig/src/docs/src/documentation/content/xdocs/basic.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/basic.xml
rename to pig/src/docs/src/documentation/content/xdocs/basic.xml
diff --git a/src/docs/src/documentation/content/xdocs/cmds.xml b/pig/src/docs/src/documentation/content/xdocs/cmds.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/cmds.xml
rename to pig/src/docs/src/documentation/content/xdocs/cmds.xml
diff --git a/src/docs/src/documentation/content/xdocs/cont.xml b/pig/src/docs/src/documentation/content/xdocs/cont.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/cont.xml
rename to pig/src/docs/src/documentation/content/xdocs/cont.xml
diff --git a/src/docs/src/documentation/content/xdocs/func.xml b/pig/src/docs/src/documentation/content/xdocs/func.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/func.xml
rename to pig/src/docs/src/documentation/content/xdocs/func.xml
diff --git a/src/docs/src/documentation/content/xdocs/images/group.svg b/pig/src/docs/src/documentation/content/xdocs/images/group.svg
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/images/group.svg
rename to pig/src/docs/src/documentation/content/xdocs/images/group.svg
diff --git a/src/docs/src/documentation/content/xdocs/images/project.svg b/pig/src/docs/src/documentation/content/xdocs/images/project.svg
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/images/project.svg
rename to pig/src/docs/src/documentation/content/xdocs/images/project.svg
diff --git a/src/docs/src/documentation/content/xdocs/index.xml b/pig/src/docs/src/documentation/content/xdocs/index.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/index.xml
rename to pig/src/docs/src/documentation/content/xdocs/index.xml
diff --git a/src/docs/src/documentation/content/xdocs/perf.xml b/pig/src/docs/src/documentation/content/xdocs/perf.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/perf.xml
rename to pig/src/docs/src/documentation/content/xdocs/perf.xml
diff --git a/src/docs/src/documentation/content/xdocs/pig-index.xml b/pig/src/docs/src/documentation/content/xdocs/pig-index.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/pig-index.xml
rename to pig/src/docs/src/documentation/content/xdocs/pig-index.xml
diff --git a/src/docs/src/documentation/content/xdocs/pigunit.xml b/pig/src/docs/src/documentation/content/xdocs/pigunit.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/pigunit.xml
rename to pig/src/docs/src/documentation/content/xdocs/pigunit.xml
diff --git a/src/docs/src/documentation/content/xdocs/site.xml b/pig/src/docs/src/documentation/content/xdocs/site.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/site.xml
rename to pig/src/docs/src/documentation/content/xdocs/site.xml
diff --git a/src/docs/src/documentation/content/xdocs/start.xml b/pig/src/docs/src/documentation/content/xdocs/start.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/start.xml
rename to pig/src/docs/src/documentation/content/xdocs/start.xml
diff --git a/src/docs/src/documentation/content/xdocs/tabs.xml b/pig/src/docs/src/documentation/content/xdocs/tabs.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/tabs.xml
rename to pig/src/docs/src/documentation/content/xdocs/tabs.xml
diff --git a/src/docs/src/documentation/content/xdocs/test.xml b/pig/src/docs/src/documentation/content/xdocs/test.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/test.xml
rename to pig/src/docs/src/documentation/content/xdocs/test.xml
diff --git a/src/docs/src/documentation/content/xdocs/udf.xml b/pig/src/docs/src/documentation/content/xdocs/udf.xml
similarity index 100%
rename from src/docs/src/documentation/content/xdocs/udf.xml
rename to pig/src/docs/src/documentation/content/xdocs/udf.xml
diff --git a/src/docs/src/documentation/resources/images/ellipse-2.svg b/pig/src/docs/src/documentation/resources/images/ellipse-2.svg
similarity index 100%
rename from src/docs/src/documentation/resources/images/ellipse-2.svg
rename to pig/src/docs/src/documentation/resources/images/ellipse-2.svg
diff --git a/src/docs/src/documentation/resources/schema/catalog.xcat b/pig/src/docs/src/documentation/resources/schema/catalog.xcat
similarity index 100%
rename from src/docs/src/documentation/resources/schema/catalog.xcat
rename to pig/src/docs/src/documentation/resources/schema/catalog.xcat
diff --git a/src/docs/src/documentation/resources/schema/hello-v10.dtd b/pig/src/docs/src/documentation/resources/schema/hello-v10.dtd
similarity index 100%
rename from src/docs/src/documentation/resources/schema/hello-v10.dtd
rename to pig/src/docs/src/documentation/resources/schema/hello-v10.dtd
diff --git a/src/docs/src/documentation/resources/schema/symbols-project-v10.ent b/pig/src/docs/src/documentation/resources/schema/symbols-project-v10.ent
similarity index 100%
rename from src/docs/src/documentation/resources/schema/symbols-project-v10.ent
rename to pig/src/docs/src/documentation/resources/schema/symbols-project-v10.ent
diff --git a/src/docs/src/documentation/resources/stylesheets/hello2document.xsl b/pig/src/docs/src/documentation/resources/stylesheets/hello2document.xsl
similarity index 100%
rename from src/docs/src/documentation/resources/stylesheets/hello2document.xsl
rename to pig/src/docs/src/documentation/resources/stylesheets/hello2document.xsl
diff --git a/src/docs/src/documentation/sitemap.xmap b/pig/src/docs/src/documentation/sitemap.xmap
similarity index 100%
rename from src/docs/src/documentation/sitemap.xmap
rename to pig/src/docs/src/documentation/sitemap.xmap
diff --git a/src/docs/src/documentation/skinconf.xml b/pig/src/docs/src/documentation/skinconf.xml
similarity index 100%
rename from src/docs/src/documentation/skinconf.xml
rename to pig/src/docs/src/documentation/skinconf.xml
diff --git a/src/docs/src/documentation/translations/langcode.xml b/pig/src/docs/src/documentation/translations/langcode.xml
similarity index 100%
rename from src/docs/src/documentation/translations/langcode.xml
rename to pig/src/docs/src/documentation/translations/langcode.xml
diff --git a/src/docs/src/documentation/translations/languages_de.xml b/pig/src/docs/src/documentation/translations/languages_de.xml
similarity index 100%
rename from src/docs/src/documentation/translations/languages_de.xml
rename to pig/src/docs/src/documentation/translations/languages_de.xml
diff --git a/src/docs/src/documentation/translations/languages_en.xml b/pig/src/docs/src/documentation/translations/languages_en.xml
similarity index 100%
rename from src/docs/src/documentation/translations/languages_en.xml
rename to pig/src/docs/src/documentation/translations/languages_en.xml
diff --git a/src/docs/src/documentation/translations/languages_es.xml b/pig/src/docs/src/documentation/translations/languages_es.xml
similarity index 100%
rename from src/docs/src/documentation/translations/languages_es.xml
rename to pig/src/docs/src/documentation/translations/languages_es.xml
diff --git a/src/docs/src/documentation/translations/languages_fr.xml b/pig/src/docs/src/documentation/translations/languages_fr.xml
similarity index 100%
rename from src/docs/src/documentation/translations/languages_fr.xml
rename to pig/src/docs/src/documentation/translations/languages_fr.xml
diff --git a/src/docs/src/documentation/translations/languages_nl.xml b/pig/src/docs/src/documentation/translations/languages_nl.xml
similarity index 100%
rename from src/docs/src/documentation/translations/languages_nl.xml
rename to pig/src/docs/src/documentation/translations/languages_nl.xml
diff --git a/src/docs/src/documentation/translations/menu.xml b/pig/src/docs/src/documentation/translations/menu.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu.xml
rename to pig/src/docs/src/documentation/translations/menu.xml
diff --git a/src/docs/src/documentation/translations/menu_af.xml b/pig/src/docs/src/documentation/translations/menu_af.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_af.xml
rename to pig/src/docs/src/documentation/translations/menu_af.xml
diff --git a/src/docs/src/documentation/translations/menu_de.xml b/pig/src/docs/src/documentation/translations/menu_de.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_de.xml
rename to pig/src/docs/src/documentation/translations/menu_de.xml
diff --git a/src/docs/src/documentation/translations/menu_es.xml b/pig/src/docs/src/documentation/translations/menu_es.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_es.xml
rename to pig/src/docs/src/documentation/translations/menu_es.xml
diff --git a/src/docs/src/documentation/translations/menu_fr.xml b/pig/src/docs/src/documentation/translations/menu_fr.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_fr.xml
rename to pig/src/docs/src/documentation/translations/menu_fr.xml
diff --git a/src/docs/src/documentation/translations/menu_it.xml b/pig/src/docs/src/documentation/translations/menu_it.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_it.xml
rename to pig/src/docs/src/documentation/translations/menu_it.xml
diff --git a/src/docs/src/documentation/translations/menu_nl.xml b/pig/src/docs/src/documentation/translations/menu_nl.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_nl.xml
rename to pig/src/docs/src/documentation/translations/menu_nl.xml
diff --git a/src/docs/src/documentation/translations/menu_no.xml b/pig/src/docs/src/documentation/translations/menu_no.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_no.xml
rename to pig/src/docs/src/documentation/translations/menu_no.xml
diff --git a/src/docs/src/documentation/translations/menu_ru.xml b/pig/src/docs/src/documentation/translations/menu_ru.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_ru.xml
rename to pig/src/docs/src/documentation/translations/menu_ru.xml
diff --git a/src/docs/src/documentation/translations/menu_sk.xml b/pig/src/docs/src/documentation/translations/menu_sk.xml
similarity index 100%
rename from src/docs/src/documentation/translations/menu_sk.xml
rename to pig/src/docs/src/documentation/translations/menu_sk.xml
diff --git a/src/docs/src/documentation/translations/tabs.xml b/pig/src/docs/src/documentation/translations/tabs.xml
similarity index 100%
rename from src/docs/src/documentation/translations/tabs.xml
rename to pig/src/docs/src/documentation/translations/tabs.xml
diff --git a/src/docs/src/documentation/translations/tabs_de.xml b/pig/src/docs/src/documentation/translations/tabs_de.xml
similarity index 100%
rename from src/docs/src/documentation/translations/tabs_de.xml
rename to pig/src/docs/src/documentation/translations/tabs_de.xml
diff --git a/src/docs/src/documentation/translations/tabs_es.xml b/pig/src/docs/src/documentation/translations/tabs_es.xml
similarity index 100%
rename from src/docs/src/documentation/translations/tabs_es.xml
rename to pig/src/docs/src/documentation/translations/tabs_es.xml
diff --git a/src/docs/src/documentation/translations/tabs_fr.xml b/pig/src/docs/src/documentation/translations/tabs_fr.xml
similarity index 100%
rename from src/docs/src/documentation/translations/tabs_fr.xml
rename to pig/src/docs/src/documentation/translations/tabs_fr.xml
diff --git a/src/docs/src/documentation/translations/tabs_nl.xml b/pig/src/docs/src/documentation/translations/tabs_nl.xml
similarity index 100%
rename from src/docs/src/documentation/translations/tabs_nl.xml
rename to pig/src/docs/src/documentation/translations/tabs_nl.xml
diff --git a/src/org/apache/pig/Accumulator.java b/pig/src/main/java/org/apache/pig/Accumulator.java
similarity index 100%
rename from src/org/apache/pig/Accumulator.java
rename to pig/src/main/java/org/apache/pig/Accumulator.java
diff --git a/src/org/apache/pig/AccumulatorEvalFunc.java b/pig/src/main/java/org/apache/pig/AccumulatorEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/AccumulatorEvalFunc.java
rename to pig/src/main/java/org/apache/pig/AccumulatorEvalFunc.java
diff --git a/src/org/apache/pig/Algebraic.java b/pig/src/main/java/org/apache/pig/Algebraic.java
similarity index 100%
rename from src/org/apache/pig/Algebraic.java
rename to pig/src/main/java/org/apache/pig/Algebraic.java
diff --git a/src/org/apache/pig/AlgebraicEvalFunc.java b/pig/src/main/java/org/apache/pig/AlgebraicEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/AlgebraicEvalFunc.java
rename to pig/src/main/java/org/apache/pig/AlgebraicEvalFunc.java
diff --git a/src/org/apache/pig/CollectableLoadFunc.java b/pig/src/main/java/org/apache/pig/CollectableLoadFunc.java
similarity index 100%
rename from src/org/apache/pig/CollectableLoadFunc.java
rename to pig/src/main/java/org/apache/pig/CollectableLoadFunc.java
diff --git a/src/org/apache/pig/ComparisonFunc.java b/pig/src/main/java/org/apache/pig/ComparisonFunc.java
similarity index 100%
rename from src/org/apache/pig/ComparisonFunc.java
rename to pig/src/main/java/org/apache/pig/ComparisonFunc.java
diff --git a/src/org/apache/pig/EvalFunc.java b/pig/src/main/java/org/apache/pig/EvalFunc.java
similarity index 100%
rename from src/org/apache/pig/EvalFunc.java
rename to pig/src/main/java/org/apache/pig/EvalFunc.java
diff --git a/src/org/apache/pig/ExceptionalFunction.java b/pig/src/main/java/org/apache/pig/ExceptionalFunction.java
similarity index 100%
rename from src/org/apache/pig/ExceptionalFunction.java
rename to pig/src/main/java/org/apache/pig/ExceptionalFunction.java
diff --git a/src/org/apache/pig/ExecType.java b/pig/src/main/java/org/apache/pig/ExecType.java
similarity index 100%
rename from src/org/apache/pig/ExecType.java
rename to pig/src/main/java/org/apache/pig/ExecType.java
diff --git a/src/org/apache/pig/ExecTypeProvider.java b/pig/src/main/java/org/apache/pig/ExecTypeProvider.java
similarity index 100%
rename from src/org/apache/pig/ExecTypeProvider.java
rename to pig/src/main/java/org/apache/pig/ExecTypeProvider.java
diff --git a/src/org/apache/pig/Expression.java b/pig/src/main/java/org/apache/pig/Expression.java
similarity index 100%
rename from src/org/apache/pig/Expression.java
rename to pig/src/main/java/org/apache/pig/Expression.java
diff --git a/src/org/apache/pig/FileInputLoadFunc.java b/pig/src/main/java/org/apache/pig/FileInputLoadFunc.java
similarity index 100%
rename from src/org/apache/pig/FileInputLoadFunc.java
rename to pig/src/main/java/org/apache/pig/FileInputLoadFunc.java
diff --git a/src/org/apache/pig/FileSplitComparable.java b/pig/src/main/java/org/apache/pig/FileSplitComparable.java
similarity index 100%
rename from src/org/apache/pig/FileSplitComparable.java
rename to pig/src/main/java/org/apache/pig/FileSplitComparable.java
diff --git a/src/org/apache/pig/FilterFunc.java b/pig/src/main/java/org/apache/pig/FilterFunc.java
similarity index 100%
rename from src/org/apache/pig/FilterFunc.java
rename to pig/src/main/java/org/apache/pig/FilterFunc.java
diff --git a/src/org/apache/pig/FuncSpec.java b/pig/src/main/java/org/apache/pig/FuncSpec.java
similarity index 100%
rename from src/org/apache/pig/FuncSpec.java
rename to pig/src/main/java/org/apache/pig/FuncSpec.java
diff --git a/src/org/apache/pig/Function.java b/pig/src/main/java/org/apache/pig/Function.java
similarity index 100%
rename from src/org/apache/pig/Function.java
rename to pig/src/main/java/org/apache/pig/Function.java
diff --git a/src/org/apache/pig/IndexableLoadFunc.java b/pig/src/main/java/org/apache/pig/IndexableLoadFunc.java
similarity index 100%
rename from src/org/apache/pig/IndexableLoadFunc.java
rename to pig/src/main/java/org/apache/pig/IndexableLoadFunc.java
diff --git a/src/org/apache/pig/IteratingAccumulatorEvalFunc.java b/pig/src/main/java/org/apache/pig/IteratingAccumulatorEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/IteratingAccumulatorEvalFunc.java
rename to pig/src/main/java/org/apache/pig/IteratingAccumulatorEvalFunc.java
diff --git a/src/org/apache/pig/LoadCaster.java b/pig/src/main/java/org/apache/pig/LoadCaster.java
similarity index 100%
rename from src/org/apache/pig/LoadCaster.java
rename to pig/src/main/java/org/apache/pig/LoadCaster.java
diff --git a/src/org/apache/pig/LoadFunc.java b/pig/src/main/java/org/apache/pig/LoadFunc.java
similarity index 100%
rename from src/org/apache/pig/LoadFunc.java
rename to pig/src/main/java/org/apache/pig/LoadFunc.java
diff --git a/src/org/apache/pig/LoadFuncMetadataWrapper.java b/pig/src/main/java/org/apache/pig/LoadFuncMetadataWrapper.java
similarity index 100%
rename from src/org/apache/pig/LoadFuncMetadataWrapper.java
rename to pig/src/main/java/org/apache/pig/LoadFuncMetadataWrapper.java
diff --git a/src/org/apache/pig/LoadFuncWrapper.java b/pig/src/main/java/org/apache/pig/LoadFuncWrapper.java
similarity index 100%
rename from src/org/apache/pig/LoadFuncWrapper.java
rename to pig/src/main/java/org/apache/pig/LoadFuncWrapper.java
diff --git a/src/org/apache/pig/LoadMetadata.java b/pig/src/main/java/org/apache/pig/LoadMetadata.java
similarity index 100%
rename from src/org/apache/pig/LoadMetadata.java
rename to pig/src/main/java/org/apache/pig/LoadMetadata.java
diff --git a/src/org/apache/pig/LoadPredicatePushdown.java b/pig/src/main/java/org/apache/pig/LoadPredicatePushdown.java
similarity index 100%
rename from src/org/apache/pig/LoadPredicatePushdown.java
rename to pig/src/main/java/org/apache/pig/LoadPredicatePushdown.java
diff --git a/src/org/apache/pig/LoadPushDown.java b/pig/src/main/java/org/apache/pig/LoadPushDown.java
similarity index 100%
rename from src/org/apache/pig/LoadPushDown.java
rename to pig/src/main/java/org/apache/pig/LoadPushDown.java
diff --git a/src/org/apache/pig/LoadStoreCaster.java b/pig/src/main/java/org/apache/pig/LoadStoreCaster.java
similarity index 100%
rename from src/org/apache/pig/LoadStoreCaster.java
rename to pig/src/main/java/org/apache/pig/LoadStoreCaster.java
diff --git a/src/org/apache/pig/Main.java b/pig/src/main/java/org/apache/pig/Main.java
similarity index 100%
rename from src/org/apache/pig/Main.java
rename to pig/src/main/java/org/apache/pig/Main.java
diff --git a/src/org/apache/pig/OrderedLoadFunc.java b/pig/src/main/java/org/apache/pig/OrderedLoadFunc.java
similarity index 100%
rename from src/org/apache/pig/OrderedLoadFunc.java
rename to pig/src/main/java/org/apache/pig/OrderedLoadFunc.java
diff --git a/src/org/apache/pig/OverwritableStoreFunc.java b/pig/src/main/java/org/apache/pig/OverwritableStoreFunc.java
similarity index 100%
rename from src/org/apache/pig/OverwritableStoreFunc.java
rename to pig/src/main/java/org/apache/pig/OverwritableStoreFunc.java
diff --git a/src/org/apache/pig/PigConfiguration.java b/pig/src/main/java/org/apache/pig/PigConfiguration.java
similarity index 100%
rename from src/org/apache/pig/PigConfiguration.java
rename to pig/src/main/java/org/apache/pig/PigConfiguration.java
diff --git a/src/org/apache/pig/PigConstants.java b/pig/src/main/java/org/apache/pig/PigConstants.java
similarity index 100%
rename from src/org/apache/pig/PigConstants.java
rename to pig/src/main/java/org/apache/pig/PigConstants.java
diff --git a/src/org/apache/pig/PigCounters.java b/pig/src/main/java/org/apache/pig/PigCounters.java
similarity index 100%
rename from src/org/apache/pig/PigCounters.java
rename to pig/src/main/java/org/apache/pig/PigCounters.java
diff --git a/src/org/apache/pig/PigException.java b/pig/src/main/java/org/apache/pig/PigException.java
similarity index 100%
rename from src/org/apache/pig/PigException.java
rename to pig/src/main/java/org/apache/pig/PigException.java
diff --git a/src/org/apache/pig/PigRunner.java b/pig/src/main/java/org/apache/pig/PigRunner.java
similarity index 100%
rename from src/org/apache/pig/PigRunner.java
rename to pig/src/main/java/org/apache/pig/PigRunner.java
diff --git a/src/org/apache/pig/PigServer.java b/pig/src/main/java/org/apache/pig/PigServer.java
similarity index 100%
rename from src/org/apache/pig/PigServer.java
rename to pig/src/main/java/org/apache/pig/PigServer.java
diff --git a/src/org/apache/pig/PigStreamingBase.java b/pig/src/main/java/org/apache/pig/PigStreamingBase.java
similarity index 100%
rename from src/org/apache/pig/PigStreamingBase.java
rename to pig/src/main/java/org/apache/pig/PigStreamingBase.java
diff --git a/src/org/apache/pig/PigToStream.java b/pig/src/main/java/org/apache/pig/PigToStream.java
similarity index 100%
rename from src/org/apache/pig/PigToStream.java
rename to pig/src/main/java/org/apache/pig/PigToStream.java
diff --git a/src/org/apache/pig/PigWarning.java b/pig/src/main/java/org/apache/pig/PigWarning.java
similarity index 100%
rename from src/org/apache/pig/PigWarning.java
rename to pig/src/main/java/org/apache/pig/PigWarning.java
diff --git a/src/org/apache/pig/PrimitiveEvalFunc.java b/pig/src/main/java/org/apache/pig/PrimitiveEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/PrimitiveEvalFunc.java
rename to pig/src/main/java/org/apache/pig/PrimitiveEvalFunc.java
diff --git a/src/org/apache/pig/ResourceSchema.java b/pig/src/main/java/org/apache/pig/ResourceSchema.java
similarity index 100%
rename from src/org/apache/pig/ResourceSchema.java
rename to pig/src/main/java/org/apache/pig/ResourceSchema.java
diff --git a/src/org/apache/pig/ResourceStatistics.java b/pig/src/main/java/org/apache/pig/ResourceStatistics.java
similarity index 100%
rename from src/org/apache/pig/ResourceStatistics.java
rename to pig/src/main/java/org/apache/pig/ResourceStatistics.java
diff --git a/src/org/apache/pig/SortColInfo.java b/pig/src/main/java/org/apache/pig/SortColInfo.java
similarity index 100%
rename from src/org/apache/pig/SortColInfo.java
rename to pig/src/main/java/org/apache/pig/SortColInfo.java
diff --git a/src/org/apache/pig/SortInfo.java b/pig/src/main/java/org/apache/pig/SortInfo.java
similarity index 100%
rename from src/org/apache/pig/SortInfo.java
rename to pig/src/main/java/org/apache/pig/SortInfo.java
diff --git a/src/org/apache/pig/StoreCaster.java b/pig/src/main/java/org/apache/pig/StoreCaster.java
similarity index 100%
rename from src/org/apache/pig/StoreCaster.java
rename to pig/src/main/java/org/apache/pig/StoreCaster.java
diff --git a/src/org/apache/pig/StoreFunc.java b/pig/src/main/java/org/apache/pig/StoreFunc.java
similarity index 100%
rename from src/org/apache/pig/StoreFunc.java
rename to pig/src/main/java/org/apache/pig/StoreFunc.java
diff --git a/src/org/apache/pig/StoreFuncInterface.java b/pig/src/main/java/org/apache/pig/StoreFuncInterface.java
similarity index 100%
rename from src/org/apache/pig/StoreFuncInterface.java
rename to pig/src/main/java/org/apache/pig/StoreFuncInterface.java
diff --git a/src/org/apache/pig/StoreFuncMetadataWrapper.java b/pig/src/main/java/org/apache/pig/StoreFuncMetadataWrapper.java
similarity index 100%
rename from src/org/apache/pig/StoreFuncMetadataWrapper.java
rename to pig/src/main/java/org/apache/pig/StoreFuncMetadataWrapper.java
diff --git a/src/org/apache/pig/StoreFuncWrapper.java b/pig/src/main/java/org/apache/pig/StoreFuncWrapper.java
similarity index 100%
rename from src/org/apache/pig/StoreFuncWrapper.java
rename to pig/src/main/java/org/apache/pig/StoreFuncWrapper.java
diff --git a/src/org/apache/pig/StoreMetadata.java b/pig/src/main/java/org/apache/pig/StoreMetadata.java
similarity index 100%
rename from src/org/apache/pig/StoreMetadata.java
rename to pig/src/main/java/org/apache/pig/StoreMetadata.java
diff --git a/src/org/apache/pig/StreamToPig.java b/pig/src/main/java/org/apache/pig/StreamToPig.java
similarity index 100%
rename from src/org/apache/pig/StreamToPig.java
rename to pig/src/main/java/org/apache/pig/StreamToPig.java
diff --git a/src/org/apache/pig/TerminatingAccumulator.java b/pig/src/main/java/org/apache/pig/TerminatingAccumulator.java
similarity index 100%
rename from src/org/apache/pig/TerminatingAccumulator.java
rename to pig/src/main/java/org/apache/pig/TerminatingAccumulator.java
diff --git a/src/org/apache/pig/TypedOutputEvalFunc.java b/pig/src/main/java/org/apache/pig/TypedOutputEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/TypedOutputEvalFunc.java
rename to pig/src/main/java/org/apache/pig/TypedOutputEvalFunc.java
diff --git a/src/org/apache/pig/backend/BackendException.java b/pig/src/main/java/org/apache/pig/backend/BackendException.java
similarity index 100%
rename from src/org/apache/pig/backend/BackendException.java
rename to pig/src/main/java/org/apache/pig/backend/BackendException.java
diff --git a/src/org/apache/pig/backend/datastorage/ContainerDescriptor.java b/pig/src/main/java/org/apache/pig/backend/datastorage/ContainerDescriptor.java
similarity index 100%
rename from src/org/apache/pig/backend/datastorage/ContainerDescriptor.java
rename to pig/src/main/java/org/apache/pig/backend/datastorage/ContainerDescriptor.java
diff --git a/src/org/apache/pig/backend/datastorage/DataStorage.java b/pig/src/main/java/org/apache/pig/backend/datastorage/DataStorage.java
similarity index 100%
rename from src/org/apache/pig/backend/datastorage/DataStorage.java
rename to pig/src/main/java/org/apache/pig/backend/datastorage/DataStorage.java
diff --git a/src/org/apache/pig/backend/datastorage/DataStorageException.java b/pig/src/main/java/org/apache/pig/backend/datastorage/DataStorageException.java
similarity index 100%
rename from src/org/apache/pig/backend/datastorage/DataStorageException.java
rename to pig/src/main/java/org/apache/pig/backend/datastorage/DataStorageException.java
diff --git a/src/org/apache/pig/backend/datastorage/ElementDescriptor.java b/pig/src/main/java/org/apache/pig/backend/datastorage/ElementDescriptor.java
similarity index 100%
rename from src/org/apache/pig/backend/datastorage/ElementDescriptor.java
rename to pig/src/main/java/org/apache/pig/backend/datastorage/ElementDescriptor.java
diff --git a/src/org/apache/pig/backend/datastorage/ImmutableOutputStream.java b/pig/src/main/java/org/apache/pig/backend/datastorage/ImmutableOutputStream.java
similarity index 100%
rename from src/org/apache/pig/backend/datastorage/ImmutableOutputStream.java
rename to pig/src/main/java/org/apache/pig/backend/datastorage/ImmutableOutputStream.java
diff --git a/src/org/apache/pig/backend/datastorage/SeekableInputStream.java b/pig/src/main/java/org/apache/pig/backend/datastorage/SeekableInputStream.java
similarity index 100%
rename from src/org/apache/pig/backend/datastorage/SeekableInputStream.java
rename to pig/src/main/java/org/apache/pig/backend/datastorage/SeekableInputStream.java
diff --git a/src/org/apache/pig/backend/executionengine/ExecException.java b/pig/src/main/java/org/apache/pig/backend/executionengine/ExecException.java
similarity index 100%
rename from src/org/apache/pig/backend/executionengine/ExecException.java
rename to pig/src/main/java/org/apache/pig/backend/executionengine/ExecException.java
diff --git a/src/org/apache/pig/backend/executionengine/ExecJob.java b/pig/src/main/java/org/apache/pig/backend/executionengine/ExecJob.java
similarity index 100%
rename from src/org/apache/pig/backend/executionengine/ExecJob.java
rename to pig/src/main/java/org/apache/pig/backend/executionengine/ExecJob.java
diff --git a/src/org/apache/pig/backend/executionengine/ExecutionEngine.java b/pig/src/main/java/org/apache/pig/backend/executionengine/ExecutionEngine.java
similarity index 100%
rename from src/org/apache/pig/backend/executionengine/ExecutionEngine.java
rename to pig/src/main/java/org/apache/pig/backend/executionengine/ExecutionEngine.java
diff --git a/src/org/apache/pig/backend/hadoop/BigDecimalWritable.java b/pig/src/main/java/org/apache/pig/backend/hadoop/BigDecimalWritable.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/BigDecimalWritable.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/BigDecimalWritable.java
diff --git a/src/org/apache/pig/backend/hadoop/BigIntegerWritable.java b/pig/src/main/java/org/apache/pig/backend/hadoop/BigIntegerWritable.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/BigIntegerWritable.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/BigIntegerWritable.java
diff --git a/src/org/apache/pig/backend/hadoop/DateTimeWritable.java b/pig/src/main/java/org/apache/pig/backend/hadoop/DateTimeWritable.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/DateTimeWritable.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/DateTimeWritable.java
diff --git a/src/org/apache/pig/backend/hadoop/DoubleWritable.java b/pig/src/main/java/org/apache/pig/backend/hadoop/DoubleWritable.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/DoubleWritable.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/DoubleWritable.java
diff --git a/src/org/apache/pig/backend/hadoop/HDataType.java b/pig/src/main/java/org/apache/pig/backend/hadoop/HDataType.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/HDataType.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/HDataType.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/AbstractAccumuloStorage.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AbstractAccumuloStorage.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/AbstractAccumuloStorage.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AbstractAccumuloStorage.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/AccumuloStorage.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AccumuloStorage.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/AccumuloStorage.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AccumuloStorage.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/AccumuloStorageOptions.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AccumuloStorageOptions.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/AccumuloStorageOptions.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/AccumuloStorageOptions.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/Column.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/Column.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/Column.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/Column.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/FixedByteArrayOutputStream.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/FixedByteArrayOutputStream.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/FixedByteArrayOutputStream.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/FixedByteArrayOutputStream.java
diff --git a/src/org/apache/pig/backend/hadoop/accumulo/Utils.java b/pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/Utils.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/accumulo/Utils.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/accumulo/Utils.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/ConfigurationUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/ConfigurationUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/ConfigurationUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/ConfigurationUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/HConfiguration.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HConfiguration.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/HConfiguration.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HConfiguration.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/HDataStorage.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HDataStorage.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/HDataStorage.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HDataStorage.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/HDirectory.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HDirectory.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/HDirectory.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HDirectory.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/HFile.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HFile.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/HFile.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HFile.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/HPath.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HPath.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/HPath.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HPath.java
diff --git a/src/org/apache/pig/backend/hadoop/datastorage/HSeekableInputStream.java b/pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HSeekableInputStream.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/datastorage/HSeekableInputStream.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/datastorage/HSeekableInputStream.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/HJob.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/HJob.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/HJob.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/HJob.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/JobCreationException.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/JobCreationException.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/JobCreationException.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/JobCreationException.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/Launcher.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/Launcher.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/Launcher.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/Launcher.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/MapRedResult.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/MapRedResult.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/MapRedResult.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/MapRedResult.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/TaskContext.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/TaskContext.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/TaskContext.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/TaskContext.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchContext.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchContext.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchContext.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchContext.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchPOStoreImpl.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchPOStoreImpl.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchPOStoreImpl.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchPOStoreImpl.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchProgressableReporter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchProgressableReporter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchProgressableReporter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchProgressableReporter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchTaskContext.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchTaskContext.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchTaskContext.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/fetch/FetchTaskContext.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/AccumulatorOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/AccumulatorOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/AccumulatorOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/AccumulatorOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnChainInfo.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnChainInfo.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnChainInfo.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnChainInfo.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnInfo.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnInfo.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnInfo.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ColumnInfo.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/CombinerOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/DistinctCombiner.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/FileBasedOutputSizeReader.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/FileBasedOutputSizeReader.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/FileBasedOutputSizeReader.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/FileBasedOutputSizeReader.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/IllustrateDummyReporter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/IllustrateDummyReporter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/IllustrateDummyReporter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/IllustrateDummyReporter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/InputSizeReducerEstimator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/InputSizeReducerEstimator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/InputSizeReducerEstimator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/InputSizeReducerEstimator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/KeyTypeDiscoveryVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LimitAdjuster.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LimitAdjuster.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LimitAdjuster.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LimitAdjuster.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalExecType.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalExecType.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalExecType.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/LocalExecType.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompiler.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompilerException.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompilerException.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompilerException.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRCompilerException.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRConfiguration.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRConfiguration.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRConfiguration.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRConfiguration.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecType.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecType.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecType.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecType.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecutionEngine.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecutionEngine.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecutionEngine.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRExecutionEngine.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRTaskContext.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRTaskContext.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRTaskContext.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRTaskContext.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MRUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceOper.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceOper.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceOper.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceOper.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReducePOStoreImpl.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MergeJoinIndexer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MergeJoinIndexer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MergeJoinIndexer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MergeJoinIndexer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NativeMapReduceOper.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NativeMapReduceOper.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NativeMapReduceOper.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NativeMapReduceOper.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopFilterRemover.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/NoopStoreRemover.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PhyPlanSetter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigDecimalRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigDecimalRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigDecimalRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigDecimalRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigIntegerRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigIntegerRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigIntegerRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBigIntegerRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBooleanRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBooleanRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBooleanRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBooleanRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBytesRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBytesRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBytesRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigBytesRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDateTimeRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDateTimeRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDateTimeRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDateTimeRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDoubleRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDoubleRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDoubleRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigDoubleRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFileInputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFileInputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFileInputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFileInputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFloatRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFloatRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFloatRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigFloatRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapBase.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapBase.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapBase.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapBase.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapReduce.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapReduce.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapReduce.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigGenericMapReduce.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigHadoopLogger.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigInputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigIntRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigIntRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigIntRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigIntRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigLongRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigLongRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigLongRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigLongRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapOnly.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapOnly.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapOnly.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapOnly.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduceCounter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduceCounter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduceCounter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduceCounter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigRecordReader.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigRecordReader.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigRecordReader.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigRecordReader.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigReducerEstimator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigReducerEstimator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigReducerEstimator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigReducerEstimator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSecondaryKeyComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSecondaryKeyComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSecondaryKeyComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSecondaryKeyComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSequenceFileInputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSequenceFileInputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSequenceFileInputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSequenceFileInputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigSplit.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigStatsOutputSizeReader.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigStatsOutputSizeReader.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigStatsOutputSizeReader.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigStatsOutputSizeReader.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextInputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextInputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextInputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextInputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextOutputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextOutputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextOutputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextOutputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTextRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleDefaultRawComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleDefaultRawComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleDefaultRawComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleDefaultRawComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleSortComparator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleSortComparator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleSortComparator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigTupleSortComparator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/RunJarSecurityManager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/RunJarSecurityManager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/RunJarSecurityManager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/RunJarSecurityManager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SampleOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SampleOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SampleOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SampleOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizerMR.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizerMR.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizerMR.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SecondaryKeyOptimizerMR.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SortKeyInfo.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SortKeyInfo.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SortKeyInfo.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/SortKeyInfo.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/UDFFinishVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/UDFFinishVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/UDFFinishVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/UDFFinishVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/CountingMap.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/CountingMap.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/CountingMap.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/CountingMap.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/DiscreteProbabilitySampleGenerator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/DiscreteProbabilitySampleGenerator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/DiscreteProbabilitySampleGenerator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/DiscreteProbabilitySampleGenerator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SecondaryKeyPartitioner.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SecondaryKeyPartitioner.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SecondaryKeyPartitioner.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SecondaryKeyPartitioner.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SkewedPartitioner.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SkewedPartitioner.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SkewedPartitioner.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/SkewedPartitioner.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/partitioners/WeightedRangePartitioner.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/DotMRPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/EndOfAllInputSetter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/EndOfAllInputSetter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/EndOfAllInputSetter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/EndOfAllInputSetter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRIntermediateDataVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRIntermediateDataVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRIntermediateDataVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRIntermediateDataVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROpPlanVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROpPlanVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROpPlanVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROpPlanVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MROperPlan.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/MRPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/POPackageAnnotator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/ScalarPhyFinder.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/ScalarPhyFinder.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/ScalarPhyFinder.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/ScalarPhyFinder.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/UDFFinder.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/UDFFinder.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/UDFFinder.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/UDFFinder.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/XMLMRPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/XMLMRPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/XMLMRPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/plans/XMLMRPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/optimizer/SecondaryKeyOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/optimizer/SecondaryKeyOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/optimizer/SecondaryKeyOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/optimizer/SecondaryKeyOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/LogicalToPhysicalTranslatorException.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POStatus.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POStatus.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POStatus.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/POStatus.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PhysicalOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigLogger.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigLogger.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigLogger.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigLogger.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigProgressable.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigProgressable.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigProgressable.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/PigProgressable.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/Result.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Add.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Add.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Add.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Add.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryComparisonOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryComparisonOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryComparisonOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryComparisonOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryExpressionOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryExpressionOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryExpressionOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/BinaryExpressionOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ComparisonOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ComparisonOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ComparisonOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ComparisonOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ConstantExpression.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ConstantExpression.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ConstantExpression.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ConstantExpression.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Divide.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Divide.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Divide.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Divide.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/EqualToExpr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/ExpressionOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GTOrEqualToExpr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/GreaterThanExpr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LTOrEqualToExpr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/LessThanExpr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Mod.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Mod.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Mod.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Mod.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Multiply.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Multiply.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Multiply.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Multiply.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/NotEqualToExpr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POAnd.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POAnd.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POAnd.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POAnd.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POBinCond.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POCast.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POIsNull.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POMapLookUp.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONegative.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PONot.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POOr.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POProject.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORegexp.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/PORelationToExprProject.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserComparisonFunc.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/POUserFunc.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/Subtract.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryComparisonOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryComparisonOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryComparisonOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryComparisonOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryExpressionOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryExpressionOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryExpressionOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/UnaryExpressionOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledAutomaton.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledAutomaton.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledAutomaton.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledAutomaton.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledRegex.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledRegex.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledRegex.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/CompiledRegex.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/NonConstantRegex.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/NonConstantRegex.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/NonConstantRegex.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/NonConstantRegex.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexImpl.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexImpl.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexImpl.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexImpl.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexInit.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexInit.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexInit.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/expressionOperators/regex/RegexInit.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/package.html b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/package.html
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/package.html
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/package.html
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/DotPOPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/DotPOPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/DotPOPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/DotPOPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternNode.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternNode.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternNode.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternNode.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternPlan.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternPlan.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternPlan.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PatternPlan.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhyPlanVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PlanPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/XMLPhysicalPlanPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/XMLPhysicalPlanPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/XMLPhysicalPlanPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/XMLPhysicalPlanPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/AccumulativeTupleBuffer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/AccumulativeTupleBuffer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/AccumulativeTupleBuffer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/AccumulativeTupleBuffer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/CombinerPackager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/CombinerPackager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/CombinerPackager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/CombinerPackager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/JoinPackager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/JoinPackager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/JoinPackager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/JoinPackager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/LitePackager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/LitePackager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/LitePackager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/LitePackager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/MultiQueryPackager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/MultiQueryPackager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/MultiQueryPackager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/MultiQueryPackager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCollectedGroup.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCross.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODemux.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PODistinct.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFilter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POGlobalRearrange.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLimit.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLoad.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POLocalRearrange.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeJoin.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PONative.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PONative.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PONative.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PONative.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POOptimizedForEach.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPackage.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartialAgg.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPartitionRearrange.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPoissonSample.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POPreCombinerLocalRearrange.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POReservoirSample.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSkewedJoin.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSort.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSortedDistinct.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POSplit.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStore.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStoreImpl.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStoreImpl.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStoreImpl.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStoreImpl.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POStream.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POUnion.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/Packager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/Packager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/Packager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/Packager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/MonitoredUDFExecutor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/MonitoredUDFExecutor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/MonitoredUDFExecutor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/MonitoredUDFExecutor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/PlanHelper.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/PlanHelper.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/PlanHelper.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/physicalLayer/util/PlanHelper.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/AccumulatorOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/AccumulatorOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/AccumulatorOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/AccumulatorOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/CombinerOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/CombinerOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/CombinerOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/CombinerOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/FindQuantilesTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/FindQuantilesTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/FindQuantilesTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/FindQuantilesTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/MultiQueryOptimizerTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/NativeTezOper.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/NativeTezOper.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/NativeTezOper.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/NativeTezOper.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/ObjectCache.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/ObjectCache.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/ObjectCache.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/ObjectCache.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POFRJoinTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POIdentityInOutTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTezFactory.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTezFactory.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTezFactory.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POLocalRearrangeTezFactory.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POPartitionRearrangeTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POShuffleTezLoad.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POSimpleTezLoad.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POStoreTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POValueInputTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/POValueOutputTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionSkewedKeysTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/PartitionSkewedKeysTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionSkewedKeysTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/PartitionSkewedKeysTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/PigProcessor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/PigProcessor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/PigProcessor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/PigProcessor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/ReadScalarsTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/ReadScalarsTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/ReadScalarsTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/ReadScalarsTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/RoundRobinPartitioner.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/RoundRobinPartitioner.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/RoundRobinPartitioner.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/RoundRobinPartitioner.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/SecondaryKeyOptimizerTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/SecondaryKeyOptimizerTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/SecondaryKeyOptimizerTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/SecondaryKeyOptimizerTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/SkewedPartitionerTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/SkewedPartitionerTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/SkewedPartitionerTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/SkewedPartitionerTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezCompiler.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompilerException.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezCompilerException.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezCompilerException.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezCompilerException.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezEdgeDescriptor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezEdgeDescriptor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezEdgeDescriptor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezEdgeDescriptor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezExecType.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezExecType.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezExecType.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezExecType.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezExecutionEngine.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezExecutionEngine.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezExecutionEngine.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezExecutionEngine.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezInput.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezInput.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezInput.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezInput.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJobCompiler.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezJobCompiler.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezJobCompiler.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezJobCompiler.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLocalExecType.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezLocalExecType.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezLocalExecType.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezLocalExecType.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOpPlanVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOpPlanVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezOpPlanVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOpPlanVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperDependencyParallelismEstimator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOperDependencyParallelismEstimator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperDependencyParallelismEstimator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOperDependencyParallelismEstimator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperPlan.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOperPlan.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperPlan.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOperPlan.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOperator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezOutput.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOutput.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezOutput.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezOutput.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPOPackageAnnotator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPOPackageAnnotator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPOPackageAnnotator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPOPackageAnnotator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPOStreamVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPOStreamVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPOStreamVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPOStreamVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPOUserFuncVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPOUserFuncVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPOUserFuncVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPOUserFuncVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezParallelismEstimator.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezParallelismEstimator.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezParallelismEstimator.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezParallelismEstimator.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerNode.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerNode.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerNode.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerNode.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerUDFCollector.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerUDFCollector.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerUDFCollector.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerUDFCollector.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPlanContainerVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezPrinter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPrinter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezPrinter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezPrinter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskConfigurable.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskConfigurable.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskConfigurable.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskConfigurable.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskContext.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskContext.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskContext.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/TezTaskContext.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/WeightedRangePartitionerTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/WeightedRangePartitionerTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/WeightedRangePartitionerTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/WeightedRangePartitionerTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterStatsTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/PORankTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/operators/POShuffledValueInputTez.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/NoopFilterRemover.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/NoopFilterRemover.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/NoopFilterRemover.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/NoopFilterRemover.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/ParallelismSetter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/ParallelismSetter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/ParallelismSetter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/ParallelismSetter.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/UnionOptimizer.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/UnionOptimizer.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/UnionOptimizer.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/UnionOptimizer.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/util/SecurityHelper.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/util/SecurityHelper.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/util/SecurityHelper.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/util/SecurityHelper.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezCompilerUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/util/TezCompilerUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezCompilerUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/tez/util/TezCompilerUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/util/AccumulatorOptimizerUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/AccumulatorOptimizerUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/util/AccumulatorOptimizerUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/AccumulatorOptimizerUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/util/CombinerOptimizerUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/CombinerOptimizerUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/util/CombinerOptimizerUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/CombinerOptimizerUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/util/MapRedUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/MapRedUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/util/MapRedUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/MapRedUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/util/ParallelConstantVisitor.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/ParallelConstantVisitor.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/util/ParallelConstantVisitor.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/ParallelConstantVisitor.java
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/util/SecondaryKeyOptimizerUtil.java b/pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/SecondaryKeyOptimizerUtil.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/executionengine/util/SecondaryKeyOptimizerUtil.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/executionengine/util/SecondaryKeyOptimizerUtil.java
diff --git a/src/org/apache/pig/backend/hadoop/hbase/HBaseBinaryConverter.java b/pig/src/main/java/org/apache/pig/backend/hadoop/hbase/HBaseBinaryConverter.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/hbase/HBaseBinaryConverter.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/hbase/HBaseBinaryConverter.java
diff --git a/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java b/pig/src/main/java/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
diff --git a/src/org/apache/pig/backend/hadoop/hbase/HBaseTableInputFormat.java b/pig/src/main/java/org/apache/pig/backend/hadoop/hbase/HBaseTableInputFormat.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/hbase/HBaseTableInputFormat.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/hbase/HBaseTableInputFormat.java
diff --git a/src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java b/pig/src/main/java/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java
similarity index 100%
rename from src/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java
rename to pig/src/main/java/org/apache/pig/backend/hadoop/streaming/HadoopExecutableManager.java
diff --git a/src/org/apache/pig/builtin/ABS.java b/pig/src/main/java/org/apache/pig/builtin/ABS.java
similarity index 100%
rename from src/org/apache/pig/builtin/ABS.java
rename to pig/src/main/java/org/apache/pig/builtin/ABS.java
diff --git a/src/org/apache/pig/builtin/ACOS.java b/pig/src/main/java/org/apache/pig/builtin/ACOS.java
similarity index 100%
rename from src/org/apache/pig/builtin/ACOS.java
rename to pig/src/main/java/org/apache/pig/builtin/ACOS.java
diff --git a/src/org/apache/pig/builtin/ARITY.java b/pig/src/main/java/org/apache/pig/builtin/ARITY.java
similarity index 100%
rename from src/org/apache/pig/builtin/ARITY.java
rename to pig/src/main/java/org/apache/pig/builtin/ARITY.java
diff --git a/src/org/apache/pig/builtin/ASIN.java b/pig/src/main/java/org/apache/pig/builtin/ASIN.java
similarity index 100%
rename from src/org/apache/pig/builtin/ASIN.java
rename to pig/src/main/java/org/apache/pig/builtin/ASIN.java
diff --git a/src/org/apache/pig/builtin/ATAN.java b/pig/src/main/java/org/apache/pig/builtin/ATAN.java
similarity index 100%
rename from src/org/apache/pig/builtin/ATAN.java
rename to pig/src/main/java/org/apache/pig/builtin/ATAN.java
diff --git a/src/org/apache/pig/builtin/AVG.java b/pig/src/main/java/org/apache/pig/builtin/AVG.java
similarity index 100%
rename from src/org/apache/pig/builtin/AVG.java
rename to pig/src/main/java/org/apache/pig/builtin/AVG.java
diff --git a/src/org/apache/pig/builtin/AddDuration.java b/pig/src/main/java/org/apache/pig/builtin/AddDuration.java
similarity index 100%
rename from src/org/apache/pig/builtin/AddDuration.java
rename to pig/src/main/java/org/apache/pig/builtin/AddDuration.java
diff --git a/src/org/apache/pig/builtin/AlgebraicBigDecimalMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicBigDecimalMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicBigDecimalMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicBigDecimalMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicBigIntegerMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicBigIntegerMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicBigIntegerMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicBigIntegerMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicByteArrayMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicByteArrayMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicByteArrayMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicByteArrayMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicDoubleMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicDoubleMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicDoubleMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicDoubleMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicFloatMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicFloatMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicFloatMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicFloatMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicIntMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicIntMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicIntMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicIntMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicLongMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicLongMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicLongMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicLongMathBase.java
diff --git a/src/org/apache/pig/builtin/AlgebraicMathBase.java b/pig/src/main/java/org/apache/pig/builtin/AlgebraicMathBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/AlgebraicMathBase.java
rename to pig/src/main/java/org/apache/pig/builtin/AlgebraicMathBase.java
diff --git a/src/org/apache/pig/builtin/Assert.java b/pig/src/main/java/org/apache/pig/builtin/Assert.java
similarity index 100%
rename from src/org/apache/pig/builtin/Assert.java
rename to pig/src/main/java/org/apache/pig/builtin/Assert.java
diff --git a/src/org/apache/pig/builtin/AvroStorage.java b/pig/src/main/java/org/apache/pig/builtin/AvroStorage.java
similarity index 100%
rename from src/org/apache/pig/builtin/AvroStorage.java
rename to pig/src/main/java/org/apache/pig/builtin/AvroStorage.java
diff --git a/src/org/apache/pig/builtin/BagSize.java b/pig/src/main/java/org/apache/pig/builtin/BagSize.java
similarity index 100%
rename from src/org/apache/pig/builtin/BagSize.java
rename to pig/src/main/java/org/apache/pig/builtin/BagSize.java
diff --git a/src/org/apache/pig/builtin/BagToString.java b/pig/src/main/java/org/apache/pig/builtin/BagToString.java
similarity index 100%
rename from src/org/apache/pig/builtin/BagToString.java
rename to pig/src/main/java/org/apache/pig/builtin/BagToString.java
diff --git a/src/org/apache/pig/builtin/BagToTuple.java b/pig/src/main/java/org/apache/pig/builtin/BagToTuple.java
similarity index 100%
rename from src/org/apache/pig/builtin/BagToTuple.java
rename to pig/src/main/java/org/apache/pig/builtin/BagToTuple.java
diff --git a/src/org/apache/pig/builtin/Base.java b/pig/src/main/java/org/apache/pig/builtin/Base.java
similarity index 100%
rename from src/org/apache/pig/builtin/Base.java
rename to pig/src/main/java/org/apache/pig/builtin/Base.java
diff --git a/src/org/apache/pig/builtin/BigDecimalAbs.java b/pig/src/main/java/org/apache/pig/builtin/BigDecimalAbs.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigDecimalAbs.java
rename to pig/src/main/java/org/apache/pig/builtin/BigDecimalAbs.java
diff --git a/src/org/apache/pig/builtin/BigDecimalAvg.java b/pig/src/main/java/org/apache/pig/builtin/BigDecimalAvg.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigDecimalAvg.java
rename to pig/src/main/java/org/apache/pig/builtin/BigDecimalAvg.java
diff --git a/src/org/apache/pig/builtin/BigDecimalMax.java b/pig/src/main/java/org/apache/pig/builtin/BigDecimalMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigDecimalMax.java
rename to pig/src/main/java/org/apache/pig/builtin/BigDecimalMax.java
diff --git a/src/org/apache/pig/builtin/BigDecimalMin.java b/pig/src/main/java/org/apache/pig/builtin/BigDecimalMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigDecimalMin.java
rename to pig/src/main/java/org/apache/pig/builtin/BigDecimalMin.java
diff --git a/src/org/apache/pig/builtin/BigDecimalSum.java b/pig/src/main/java/org/apache/pig/builtin/BigDecimalSum.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigDecimalSum.java
rename to pig/src/main/java/org/apache/pig/builtin/BigDecimalSum.java
diff --git a/src/org/apache/pig/builtin/BigDecimalWrapper.java b/pig/src/main/java/org/apache/pig/builtin/BigDecimalWrapper.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigDecimalWrapper.java
rename to pig/src/main/java/org/apache/pig/builtin/BigDecimalWrapper.java
diff --git a/src/org/apache/pig/builtin/BigIntegerAbs.java b/pig/src/main/java/org/apache/pig/builtin/BigIntegerAbs.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigIntegerAbs.java
rename to pig/src/main/java/org/apache/pig/builtin/BigIntegerAbs.java
diff --git a/src/org/apache/pig/builtin/BigIntegerAvg.java b/pig/src/main/java/org/apache/pig/builtin/BigIntegerAvg.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigIntegerAvg.java
rename to pig/src/main/java/org/apache/pig/builtin/BigIntegerAvg.java
diff --git a/src/org/apache/pig/builtin/BigIntegerMax.java b/pig/src/main/java/org/apache/pig/builtin/BigIntegerMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigIntegerMax.java
rename to pig/src/main/java/org/apache/pig/builtin/BigIntegerMax.java
diff --git a/src/org/apache/pig/builtin/BigIntegerMin.java b/pig/src/main/java/org/apache/pig/builtin/BigIntegerMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigIntegerMin.java
rename to pig/src/main/java/org/apache/pig/builtin/BigIntegerMin.java
diff --git a/src/org/apache/pig/builtin/BigIntegerSum.java b/pig/src/main/java/org/apache/pig/builtin/BigIntegerSum.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigIntegerSum.java
rename to pig/src/main/java/org/apache/pig/builtin/BigIntegerSum.java
diff --git a/src/org/apache/pig/builtin/BigIntegerWrapper.java b/pig/src/main/java/org/apache/pig/builtin/BigIntegerWrapper.java
similarity index 100%
rename from src/org/apache/pig/builtin/BigIntegerWrapper.java
rename to pig/src/main/java/org/apache/pig/builtin/BigIntegerWrapper.java
diff --git a/src/org/apache/pig/builtin/BinStorage.java b/pig/src/main/java/org/apache/pig/builtin/BinStorage.java
similarity index 100%
rename from src/org/apache/pig/builtin/BinStorage.java
rename to pig/src/main/java/org/apache/pig/builtin/BinStorage.java
diff --git a/src/org/apache/pig/builtin/Bloom.java b/pig/src/main/java/org/apache/pig/builtin/Bloom.java
similarity index 100%
rename from src/org/apache/pig/builtin/Bloom.java
rename to pig/src/main/java/org/apache/pig/builtin/Bloom.java
diff --git a/src/org/apache/pig/builtin/BuildBloom.java b/pig/src/main/java/org/apache/pig/builtin/BuildBloom.java
similarity index 100%
rename from src/org/apache/pig/builtin/BuildBloom.java
rename to pig/src/main/java/org/apache/pig/builtin/BuildBloom.java
diff --git a/src/org/apache/pig/builtin/BuildBloomBase.java b/pig/src/main/java/org/apache/pig/builtin/BuildBloomBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/BuildBloomBase.java
rename to pig/src/main/java/org/apache/pig/builtin/BuildBloomBase.java
diff --git a/src/org/apache/pig/builtin/CBRT.java b/pig/src/main/java/org/apache/pig/builtin/CBRT.java
similarity index 100%
rename from src/org/apache/pig/builtin/CBRT.java
rename to pig/src/main/java/org/apache/pig/builtin/CBRT.java
diff --git a/src/org/apache/pig/builtin/CEIL.java b/pig/src/main/java/org/apache/pig/builtin/CEIL.java
similarity index 100%
rename from src/org/apache/pig/builtin/CEIL.java
rename to pig/src/main/java/org/apache/pig/builtin/CEIL.java
diff --git a/src/org/apache/pig/builtin/CONCAT.java b/pig/src/main/java/org/apache/pig/builtin/CONCAT.java
similarity index 100%
rename from src/org/apache/pig/builtin/CONCAT.java
rename to pig/src/main/java/org/apache/pig/builtin/CONCAT.java
diff --git a/src/org/apache/pig/builtin/COR.java b/pig/src/main/java/org/apache/pig/builtin/COR.java
similarity index 100%
rename from src/org/apache/pig/builtin/COR.java
rename to pig/src/main/java/org/apache/pig/builtin/COR.java
diff --git a/src/org/apache/pig/builtin/COS.java b/pig/src/main/java/org/apache/pig/builtin/COS.java
similarity index 100%
rename from src/org/apache/pig/builtin/COS.java
rename to pig/src/main/java/org/apache/pig/builtin/COS.java
diff --git a/src/org/apache/pig/builtin/COSH.java b/pig/src/main/java/org/apache/pig/builtin/COSH.java
similarity index 100%
rename from src/org/apache/pig/builtin/COSH.java
rename to pig/src/main/java/org/apache/pig/builtin/COSH.java
diff --git a/src/org/apache/pig/builtin/COUNT.java b/pig/src/main/java/org/apache/pig/builtin/COUNT.java
similarity index 100%
rename from src/org/apache/pig/builtin/COUNT.java
rename to pig/src/main/java/org/apache/pig/builtin/COUNT.java
diff --git a/src/org/apache/pig/builtin/COUNT_STAR.java b/pig/src/main/java/org/apache/pig/builtin/COUNT_STAR.java
similarity index 100%
rename from src/org/apache/pig/builtin/COUNT_STAR.java
rename to pig/src/main/java/org/apache/pig/builtin/COUNT_STAR.java
diff --git a/src/org/apache/pig/builtin/COV.java b/pig/src/main/java/org/apache/pig/builtin/COV.java
similarity index 100%
rename from src/org/apache/pig/builtin/COV.java
rename to pig/src/main/java/org/apache/pig/builtin/COV.java
diff --git a/src/org/apache/pig/builtin/ConstantSize.java b/pig/src/main/java/org/apache/pig/builtin/ConstantSize.java
similarity index 100%
rename from src/org/apache/pig/builtin/ConstantSize.java
rename to pig/src/main/java/org/apache/pig/builtin/ConstantSize.java
diff --git a/src/org/apache/pig/builtin/CubeDimensions.java b/pig/src/main/java/org/apache/pig/builtin/CubeDimensions.java
similarity index 100%
rename from src/org/apache/pig/builtin/CubeDimensions.java
rename to pig/src/main/java/org/apache/pig/builtin/CubeDimensions.java
diff --git a/src/org/apache/pig/builtin/CurrentTime.java b/pig/src/main/java/org/apache/pig/builtin/CurrentTime.java
similarity index 100%
rename from src/org/apache/pig/builtin/CurrentTime.java
rename to pig/src/main/java/org/apache/pig/builtin/CurrentTime.java
diff --git a/src/org/apache/pig/builtin/DIFF.java b/pig/src/main/java/org/apache/pig/builtin/DIFF.java
similarity index 100%
rename from src/org/apache/pig/builtin/DIFF.java
rename to pig/src/main/java/org/apache/pig/builtin/DIFF.java
diff --git a/src/org/apache/pig/builtin/DateTimeMax.java b/pig/src/main/java/org/apache/pig/builtin/DateTimeMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/DateTimeMax.java
rename to pig/src/main/java/org/apache/pig/builtin/DateTimeMax.java
diff --git a/src/org/apache/pig/builtin/DateTimeMin.java b/pig/src/main/java/org/apache/pig/builtin/DateTimeMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/DateTimeMin.java
rename to pig/src/main/java/org/apache/pig/builtin/DateTimeMin.java
diff --git a/src/org/apache/pig/builtin/DaysBetween.java b/pig/src/main/java/org/apache/pig/builtin/DaysBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/DaysBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/DaysBetween.java
diff --git a/src/org/apache/pig/builtin/Distinct.java b/pig/src/main/java/org/apache/pig/builtin/Distinct.java
similarity index 100%
rename from src/org/apache/pig/builtin/Distinct.java
rename to pig/src/main/java/org/apache/pig/builtin/Distinct.java
diff --git a/src/org/apache/pig/builtin/DoubleAbs.java b/pig/src/main/java/org/apache/pig/builtin/DoubleAbs.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleAbs.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleAbs.java
diff --git a/src/org/apache/pig/builtin/DoubleAvg.java b/pig/src/main/java/org/apache/pig/builtin/DoubleAvg.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleAvg.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleAvg.java
diff --git a/src/org/apache/pig/builtin/DoubleBase.java b/pig/src/main/java/org/apache/pig/builtin/DoubleBase.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleBase.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleBase.java
diff --git a/src/org/apache/pig/builtin/DoubleMax.java b/pig/src/main/java/org/apache/pig/builtin/DoubleMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleMax.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleMax.java
diff --git a/src/org/apache/pig/builtin/DoubleMin.java b/pig/src/main/java/org/apache/pig/builtin/DoubleMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleMin.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleMin.java
diff --git a/src/org/apache/pig/builtin/DoubleRound.java b/pig/src/main/java/org/apache/pig/builtin/DoubleRound.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleRound.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleRound.java
diff --git a/src/org/apache/pig/builtin/DoubleRoundTo.java b/pig/src/main/java/org/apache/pig/builtin/DoubleRoundTo.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleRoundTo.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleRoundTo.java
diff --git a/src/org/apache/pig/builtin/DoubleSum.java b/pig/src/main/java/org/apache/pig/builtin/DoubleSum.java
similarity index 100%
rename from src/org/apache/pig/builtin/DoubleSum.java
rename to pig/src/main/java/org/apache/pig/builtin/DoubleSum.java
diff --git a/src/org/apache/pig/builtin/ENDSWITH.java b/pig/src/main/java/org/apache/pig/builtin/ENDSWITH.java
similarity index 100%
rename from src/org/apache/pig/builtin/ENDSWITH.java
rename to pig/src/main/java/org/apache/pig/builtin/ENDSWITH.java
diff --git a/src/org/apache/pig/builtin/EXP.java b/pig/src/main/java/org/apache/pig/builtin/EXP.java
similarity index 100%
rename from src/org/apache/pig/builtin/EXP.java
rename to pig/src/main/java/org/apache/pig/builtin/EXP.java
diff --git a/src/org/apache/pig/builtin/EqualsIgnoreCase.java b/pig/src/main/java/org/apache/pig/builtin/EqualsIgnoreCase.java
similarity index 100%
rename from src/org/apache/pig/builtin/EqualsIgnoreCase.java
rename to pig/src/main/java/org/apache/pig/builtin/EqualsIgnoreCase.java
diff --git a/src/org/apache/pig/builtin/FLOOR.java b/pig/src/main/java/org/apache/pig/builtin/FLOOR.java
similarity index 100%
rename from src/org/apache/pig/builtin/FLOOR.java
rename to pig/src/main/java/org/apache/pig/builtin/FLOOR.java
diff --git a/src/org/apache/pig/builtin/FloatAbs.java b/pig/src/main/java/org/apache/pig/builtin/FloatAbs.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatAbs.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatAbs.java
diff --git a/src/org/apache/pig/builtin/FloatAvg.java b/pig/src/main/java/org/apache/pig/builtin/FloatAvg.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatAvg.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatAvg.java
diff --git a/src/org/apache/pig/builtin/FloatMax.java b/pig/src/main/java/org/apache/pig/builtin/FloatMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatMax.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatMax.java
diff --git a/src/org/apache/pig/builtin/FloatMin.java b/pig/src/main/java/org/apache/pig/builtin/FloatMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatMin.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatMin.java
diff --git a/src/org/apache/pig/builtin/FloatRound.java b/pig/src/main/java/org/apache/pig/builtin/FloatRound.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatRound.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatRound.java
diff --git a/src/org/apache/pig/builtin/FloatRoundTo.java b/pig/src/main/java/org/apache/pig/builtin/FloatRoundTo.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatRoundTo.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatRoundTo.java
diff --git a/src/org/apache/pig/builtin/FloatSum.java b/pig/src/main/java/org/apache/pig/builtin/FloatSum.java
similarity index 100%
rename from src/org/apache/pig/builtin/FloatSum.java
rename to pig/src/main/java/org/apache/pig/builtin/FloatSum.java
diff --git a/src/org/apache/pig/builtin/FunctionWrapperEvalFunc.java b/pig/src/main/java/org/apache/pig/builtin/FunctionWrapperEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/builtin/FunctionWrapperEvalFunc.java
rename to pig/src/main/java/org/apache/pig/builtin/FunctionWrapperEvalFunc.java
diff --git a/src/org/apache/pig/builtin/GenericInvoker.java b/pig/src/main/java/org/apache/pig/builtin/GenericInvoker.java
similarity index 100%
rename from src/org/apache/pig/builtin/GenericInvoker.java
rename to pig/src/main/java/org/apache/pig/builtin/GenericInvoker.java
diff --git a/src/org/apache/pig/builtin/GetDay.java b/pig/src/main/java/org/apache/pig/builtin/GetDay.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetDay.java
rename to pig/src/main/java/org/apache/pig/builtin/GetDay.java
diff --git a/src/org/apache/pig/builtin/GetHour.java b/pig/src/main/java/org/apache/pig/builtin/GetHour.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetHour.java
rename to pig/src/main/java/org/apache/pig/builtin/GetHour.java
diff --git a/src/org/apache/pig/builtin/GetMilliSecond.java b/pig/src/main/java/org/apache/pig/builtin/GetMilliSecond.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetMilliSecond.java
rename to pig/src/main/java/org/apache/pig/builtin/GetMilliSecond.java
diff --git a/src/org/apache/pig/builtin/GetMinute.java b/pig/src/main/java/org/apache/pig/builtin/GetMinute.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetMinute.java
rename to pig/src/main/java/org/apache/pig/builtin/GetMinute.java
diff --git a/src/org/apache/pig/builtin/GetMonth.java b/pig/src/main/java/org/apache/pig/builtin/GetMonth.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetMonth.java
rename to pig/src/main/java/org/apache/pig/builtin/GetMonth.java
diff --git a/src/org/apache/pig/builtin/GetSecond.java b/pig/src/main/java/org/apache/pig/builtin/GetSecond.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetSecond.java
rename to pig/src/main/java/org/apache/pig/builtin/GetSecond.java
diff --git a/src/org/apache/pig/builtin/GetWeek.java b/pig/src/main/java/org/apache/pig/builtin/GetWeek.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetWeek.java
rename to pig/src/main/java/org/apache/pig/builtin/GetWeek.java
diff --git a/src/org/apache/pig/builtin/GetWeekYear.java b/pig/src/main/java/org/apache/pig/builtin/GetWeekYear.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetWeekYear.java
rename to pig/src/main/java/org/apache/pig/builtin/GetWeekYear.java
diff --git a/src/org/apache/pig/builtin/GetYear.java b/pig/src/main/java/org/apache/pig/builtin/GetYear.java
similarity index 100%
rename from src/org/apache/pig/builtin/GetYear.java
rename to pig/src/main/java/org/apache/pig/builtin/GetYear.java
diff --git a/src/org/apache/pig/builtin/HoursBetween.java b/pig/src/main/java/org/apache/pig/builtin/HoursBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/HoursBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/HoursBetween.java
diff --git a/src/org/apache/pig/builtin/INDEXOF.java b/pig/src/main/java/org/apache/pig/builtin/INDEXOF.java
similarity index 100%
rename from src/org/apache/pig/builtin/INDEXOF.java
rename to pig/src/main/java/org/apache/pig/builtin/INDEXOF.java
diff --git a/src/org/apache/pig/builtin/INVERSEMAP.java b/pig/src/main/java/org/apache/pig/builtin/INVERSEMAP.java
similarity index 100%
rename from src/org/apache/pig/builtin/INVERSEMAP.java
rename to pig/src/main/java/org/apache/pig/builtin/INVERSEMAP.java
diff --git a/src/org/apache/pig/builtin/IntAbs.java b/pig/src/main/java/org/apache/pig/builtin/IntAbs.java
similarity index 100%
rename from src/org/apache/pig/builtin/IntAbs.java
rename to pig/src/main/java/org/apache/pig/builtin/IntAbs.java
diff --git a/src/org/apache/pig/builtin/IntAvg.java b/pig/src/main/java/org/apache/pig/builtin/IntAvg.java
similarity index 100%
rename from src/org/apache/pig/builtin/IntAvg.java
rename to pig/src/main/java/org/apache/pig/builtin/IntAvg.java
diff --git a/src/org/apache/pig/builtin/IntMax.java b/pig/src/main/java/org/apache/pig/builtin/IntMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/IntMax.java
rename to pig/src/main/java/org/apache/pig/builtin/IntMax.java
diff --git a/src/org/apache/pig/builtin/IntMin.java b/pig/src/main/java/org/apache/pig/builtin/IntMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/IntMin.java
rename to pig/src/main/java/org/apache/pig/builtin/IntMin.java
diff --git a/src/org/apache/pig/builtin/IntSum.java b/pig/src/main/java/org/apache/pig/builtin/IntSum.java
similarity index 100%
rename from src/org/apache/pig/builtin/IntSum.java
rename to pig/src/main/java/org/apache/pig/builtin/IntSum.java
diff --git a/src/org/apache/pig/builtin/InvokeForDouble.java b/pig/src/main/java/org/apache/pig/builtin/InvokeForDouble.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokeForDouble.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokeForDouble.java
diff --git a/src/org/apache/pig/builtin/InvokeForFloat.java b/pig/src/main/java/org/apache/pig/builtin/InvokeForFloat.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokeForFloat.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokeForFloat.java
diff --git a/src/org/apache/pig/builtin/InvokeForInt.java b/pig/src/main/java/org/apache/pig/builtin/InvokeForInt.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokeForInt.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokeForInt.java
diff --git a/src/org/apache/pig/builtin/InvokeForLong.java b/pig/src/main/java/org/apache/pig/builtin/InvokeForLong.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokeForLong.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokeForLong.java
diff --git a/src/org/apache/pig/builtin/InvokeForString.java b/pig/src/main/java/org/apache/pig/builtin/InvokeForString.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokeForString.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokeForString.java
diff --git a/src/org/apache/pig/builtin/Invoker.java b/pig/src/main/java/org/apache/pig/builtin/Invoker.java
similarity index 100%
rename from src/org/apache/pig/builtin/Invoker.java
rename to pig/src/main/java/org/apache/pig/builtin/Invoker.java
diff --git a/src/org/apache/pig/builtin/InvokerFunction.java b/pig/src/main/java/org/apache/pig/builtin/InvokerFunction.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokerFunction.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokerFunction.java
diff --git a/src/org/apache/pig/builtin/InvokerGenerator.java b/pig/src/main/java/org/apache/pig/builtin/InvokerGenerator.java
similarity index 100%
rename from src/org/apache/pig/builtin/InvokerGenerator.java
rename to pig/src/main/java/org/apache/pig/builtin/InvokerGenerator.java
diff --git a/src/org/apache/pig/builtin/IsEmpty.java b/pig/src/main/java/org/apache/pig/builtin/IsEmpty.java
similarity index 100%
rename from src/org/apache/pig/builtin/IsEmpty.java
rename to pig/src/main/java/org/apache/pig/builtin/IsEmpty.java
diff --git a/src/org/apache/pig/builtin/JsonLoader.java b/pig/src/main/java/org/apache/pig/builtin/JsonLoader.java
similarity index 100%
rename from src/org/apache/pig/builtin/JsonLoader.java
rename to pig/src/main/java/org/apache/pig/builtin/JsonLoader.java
diff --git a/src/org/apache/pig/builtin/JsonMetadata.java b/pig/src/main/java/org/apache/pig/builtin/JsonMetadata.java
similarity index 100%
rename from src/org/apache/pig/builtin/JsonMetadata.java
rename to pig/src/main/java/org/apache/pig/builtin/JsonMetadata.java
diff --git a/src/org/apache/pig/builtin/JsonStorage.java b/pig/src/main/java/org/apache/pig/builtin/JsonStorage.java
similarity index 100%
rename from src/org/apache/pig/builtin/JsonStorage.java
rename to pig/src/main/java/org/apache/pig/builtin/JsonStorage.java
diff --git a/src/org/apache/pig/builtin/KEYSET.java b/pig/src/main/java/org/apache/pig/builtin/KEYSET.java
similarity index 100%
rename from src/org/apache/pig/builtin/KEYSET.java
rename to pig/src/main/java/org/apache/pig/builtin/KEYSET.java
diff --git a/src/org/apache/pig/builtin/LAST_INDEX_OF.java b/pig/src/main/java/org/apache/pig/builtin/LAST_INDEX_OF.java
similarity index 100%
rename from src/org/apache/pig/builtin/LAST_INDEX_OF.java
rename to pig/src/main/java/org/apache/pig/builtin/LAST_INDEX_OF.java
diff --git a/src/org/apache/pig/builtin/LCFIRST.java b/pig/src/main/java/org/apache/pig/builtin/LCFIRST.java
similarity index 100%
rename from src/org/apache/pig/builtin/LCFIRST.java
rename to pig/src/main/java/org/apache/pig/builtin/LCFIRST.java
diff --git a/src/org/apache/pig/builtin/LOG.java b/pig/src/main/java/org/apache/pig/builtin/LOG.java
similarity index 100%
rename from src/org/apache/pig/builtin/LOG.java
rename to pig/src/main/java/org/apache/pig/builtin/LOG.java
diff --git a/src/org/apache/pig/builtin/LOG10.java b/pig/src/main/java/org/apache/pig/builtin/LOG10.java
similarity index 100%
rename from src/org/apache/pig/builtin/LOG10.java
rename to pig/src/main/java/org/apache/pig/builtin/LOG10.java
diff --git a/src/org/apache/pig/builtin/LOWER.java b/pig/src/main/java/org/apache/pig/builtin/LOWER.java
similarity index 100%
rename from src/org/apache/pig/builtin/LOWER.java
rename to pig/src/main/java/org/apache/pig/builtin/LOWER.java
diff --git a/src/org/apache/pig/builtin/LTRIM.java b/pig/src/main/java/org/apache/pig/builtin/LTRIM.java
similarity index 100%
rename from src/org/apache/pig/builtin/LTRIM.java
rename to pig/src/main/java/org/apache/pig/builtin/LTRIM.java
diff --git a/src/org/apache/pig/builtin/LongAbs.java b/pig/src/main/java/org/apache/pig/builtin/LongAbs.java
similarity index 100%
rename from src/org/apache/pig/builtin/LongAbs.java
rename to pig/src/main/java/org/apache/pig/builtin/LongAbs.java
diff --git a/src/org/apache/pig/builtin/LongAvg.java b/pig/src/main/java/org/apache/pig/builtin/LongAvg.java
similarity index 100%
rename from src/org/apache/pig/builtin/LongAvg.java
rename to pig/src/main/java/org/apache/pig/builtin/LongAvg.java
diff --git a/src/org/apache/pig/builtin/LongMax.java b/pig/src/main/java/org/apache/pig/builtin/LongMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/LongMax.java
rename to pig/src/main/java/org/apache/pig/builtin/LongMax.java
diff --git a/src/org/apache/pig/builtin/LongMin.java b/pig/src/main/java/org/apache/pig/builtin/LongMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/LongMin.java
rename to pig/src/main/java/org/apache/pig/builtin/LongMin.java
diff --git a/src/org/apache/pig/builtin/LongSum.java b/pig/src/main/java/org/apache/pig/builtin/LongSum.java
similarity index 100%
rename from src/org/apache/pig/builtin/LongSum.java
rename to pig/src/main/java/org/apache/pig/builtin/LongSum.java
diff --git a/src/org/apache/pig/builtin/MAX.java b/pig/src/main/java/org/apache/pig/builtin/MAX.java
similarity index 100%
rename from src/org/apache/pig/builtin/MAX.java
rename to pig/src/main/java/org/apache/pig/builtin/MAX.java
diff --git a/src/org/apache/pig/builtin/MIN.java b/pig/src/main/java/org/apache/pig/builtin/MIN.java
similarity index 100%
rename from src/org/apache/pig/builtin/MIN.java
rename to pig/src/main/java/org/apache/pig/builtin/MIN.java
diff --git a/src/org/apache/pig/builtin/MapSize.java b/pig/src/main/java/org/apache/pig/builtin/MapSize.java
similarity index 100%
rename from src/org/apache/pig/builtin/MapSize.java
rename to pig/src/main/java/org/apache/pig/builtin/MapSize.java
diff --git a/src/org/apache/pig/builtin/MilliSecondsBetween.java b/pig/src/main/java/org/apache/pig/builtin/MilliSecondsBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/MilliSecondsBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/MilliSecondsBetween.java
diff --git a/src/org/apache/pig/builtin/MinutesBetween.java b/pig/src/main/java/org/apache/pig/builtin/MinutesBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/MinutesBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/MinutesBetween.java
diff --git a/src/org/apache/pig/builtin/MonitoredUDF.java b/pig/src/main/java/org/apache/pig/builtin/MonitoredUDF.java
similarity index 100%
rename from src/org/apache/pig/builtin/MonitoredUDF.java
rename to pig/src/main/java/org/apache/pig/builtin/MonitoredUDF.java
diff --git a/src/org/apache/pig/builtin/MonthsBetween.java b/pig/src/main/java/org/apache/pig/builtin/MonthsBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/MonthsBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/MonthsBetween.java
diff --git a/src/org/apache/pig/builtin/Nondeterministic.java b/pig/src/main/java/org/apache/pig/builtin/Nondeterministic.java
similarity index 100%
rename from src/org/apache/pig/builtin/Nondeterministic.java
rename to pig/src/main/java/org/apache/pig/builtin/Nondeterministic.java
diff --git a/src/org/apache/pig/builtin/OrcStorage.java b/pig/src/main/java/org/apache/pig/builtin/OrcStorage.java
similarity index 100%
rename from src/org/apache/pig/builtin/OrcStorage.java
rename to pig/src/main/java/org/apache/pig/builtin/OrcStorage.java
diff --git a/src/org/apache/pig/builtin/OutputSchema.java b/pig/src/main/java/org/apache/pig/builtin/OutputSchema.java
similarity index 100%
rename from src/org/apache/pig/builtin/OutputSchema.java
rename to pig/src/main/java/org/apache/pig/builtin/OutputSchema.java
diff --git a/src/org/apache/pig/builtin/ParquetLoader.java b/pig/src/main/java/org/apache/pig/builtin/ParquetLoader.java
similarity index 100%
rename from src/org/apache/pig/builtin/ParquetLoader.java
rename to pig/src/main/java/org/apache/pig/builtin/ParquetLoader.java
diff --git a/src/org/apache/pig/builtin/ParquetStorer.java b/pig/src/main/java/org/apache/pig/builtin/ParquetStorer.java
similarity index 100%
rename from src/org/apache/pig/builtin/ParquetStorer.java
rename to pig/src/main/java/org/apache/pig/builtin/ParquetStorer.java
diff --git a/src/org/apache/pig/builtin/PigStorage.java b/pig/src/main/java/org/apache/pig/builtin/PigStorage.java
similarity index 100%
rename from src/org/apache/pig/builtin/PigStorage.java
rename to pig/src/main/java/org/apache/pig/builtin/PigStorage.java
diff --git a/src/org/apache/pig/builtin/PigStreaming.java b/pig/src/main/java/org/apache/pig/builtin/PigStreaming.java
similarity index 100%
rename from src/org/apache/pig/builtin/PigStreaming.java
rename to pig/src/main/java/org/apache/pig/builtin/PigStreaming.java
diff --git a/src/org/apache/pig/builtin/PluckTuple.java b/pig/src/main/java/org/apache/pig/builtin/PluckTuple.java
similarity index 100%
rename from src/org/apache/pig/builtin/PluckTuple.java
rename to pig/src/main/java/org/apache/pig/builtin/PluckTuple.java
diff --git a/src/org/apache/pig/builtin/RANDOM.java b/pig/src/main/java/org/apache/pig/builtin/RANDOM.java
similarity index 100%
rename from src/org/apache/pig/builtin/RANDOM.java
rename to pig/src/main/java/org/apache/pig/builtin/RANDOM.java
diff --git a/src/org/apache/pig/builtin/REGEX_EXTRACT.java b/pig/src/main/java/org/apache/pig/builtin/REGEX_EXTRACT.java
similarity index 100%
rename from src/org/apache/pig/builtin/REGEX_EXTRACT.java
rename to pig/src/main/java/org/apache/pig/builtin/REGEX_EXTRACT.java
diff --git a/src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java b/pig/src/main/java/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java
similarity index 100%
rename from src/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java
rename to pig/src/main/java/org/apache/pig/builtin/REGEX_EXTRACT_ALL.java
diff --git a/src/org/apache/pig/builtin/REPLACE.java b/pig/src/main/java/org/apache/pig/builtin/REPLACE.java
similarity index 100%
rename from src/org/apache/pig/builtin/REPLACE.java
rename to pig/src/main/java/org/apache/pig/builtin/REPLACE.java
diff --git a/src/org/apache/pig/builtin/ROUND.java b/pig/src/main/java/org/apache/pig/builtin/ROUND.java
similarity index 100%
rename from src/org/apache/pig/builtin/ROUND.java
rename to pig/src/main/java/org/apache/pig/builtin/ROUND.java
diff --git a/src/org/apache/pig/builtin/ROUND_TO.java b/pig/src/main/java/org/apache/pig/builtin/ROUND_TO.java
similarity index 100%
rename from src/org/apache/pig/builtin/ROUND_TO.java
rename to pig/src/main/java/org/apache/pig/builtin/ROUND_TO.java
diff --git a/src/org/apache/pig/builtin/RTRIM.java b/pig/src/main/java/org/apache/pig/builtin/RTRIM.java
similarity index 100%
rename from src/org/apache/pig/builtin/RTRIM.java
rename to pig/src/main/java/org/apache/pig/builtin/RTRIM.java
diff --git a/src/org/apache/pig/builtin/RollupDimensions.java b/pig/src/main/java/org/apache/pig/builtin/RollupDimensions.java
similarity index 100%
rename from src/org/apache/pig/builtin/RollupDimensions.java
rename to pig/src/main/java/org/apache/pig/builtin/RollupDimensions.java
diff --git a/src/org/apache/pig/builtin/SIN.java b/pig/src/main/java/org/apache/pig/builtin/SIN.java
similarity index 100%
rename from src/org/apache/pig/builtin/SIN.java
rename to pig/src/main/java/org/apache/pig/builtin/SIN.java
diff --git a/src/org/apache/pig/builtin/SINH.java b/pig/src/main/java/org/apache/pig/builtin/SINH.java
similarity index 100%
rename from src/org/apache/pig/builtin/SINH.java
rename to pig/src/main/java/org/apache/pig/builtin/SINH.java
diff --git a/src/org/apache/pig/builtin/SIZE.java b/pig/src/main/java/org/apache/pig/builtin/SIZE.java
similarity index 100%
rename from src/org/apache/pig/builtin/SIZE.java
rename to pig/src/main/java/org/apache/pig/builtin/SIZE.java
diff --git a/src/org/apache/pig/builtin/SPRINTF.java b/pig/src/main/java/org/apache/pig/builtin/SPRINTF.java
similarity index 100%
rename from src/org/apache/pig/builtin/SPRINTF.java
rename to pig/src/main/java/org/apache/pig/builtin/SPRINTF.java
diff --git a/src/org/apache/pig/builtin/SQRT.java b/pig/src/main/java/org/apache/pig/builtin/SQRT.java
similarity index 100%
rename from src/org/apache/pig/builtin/SQRT.java
rename to pig/src/main/java/org/apache/pig/builtin/SQRT.java
diff --git a/src/org/apache/pig/builtin/STARTSWITH.java b/pig/src/main/java/org/apache/pig/builtin/STARTSWITH.java
similarity index 100%
rename from src/org/apache/pig/builtin/STARTSWITH.java
rename to pig/src/main/java/org/apache/pig/builtin/STARTSWITH.java
diff --git a/src/org/apache/pig/builtin/STRSPLIT.java b/pig/src/main/java/org/apache/pig/builtin/STRSPLIT.java
similarity index 100%
rename from src/org/apache/pig/builtin/STRSPLIT.java
rename to pig/src/main/java/org/apache/pig/builtin/STRSPLIT.java
diff --git a/src/org/apache/pig/builtin/SUBSTRING.java b/pig/src/main/java/org/apache/pig/builtin/SUBSTRING.java
similarity index 100%
rename from src/org/apache/pig/builtin/SUBSTRING.java
rename to pig/src/main/java/org/apache/pig/builtin/SUBSTRING.java
diff --git a/src/org/apache/pig/builtin/SUBTRACT.java b/pig/src/main/java/org/apache/pig/builtin/SUBTRACT.java
similarity index 100%
rename from src/org/apache/pig/builtin/SUBTRACT.java
rename to pig/src/main/java/org/apache/pig/builtin/SUBTRACT.java
diff --git a/src/org/apache/pig/builtin/SUM.java b/pig/src/main/java/org/apache/pig/builtin/SUM.java
similarity index 100%
rename from src/org/apache/pig/builtin/SUM.java
rename to pig/src/main/java/org/apache/pig/builtin/SUM.java
diff --git a/src/org/apache/pig/builtin/SecondsBetween.java b/pig/src/main/java/org/apache/pig/builtin/SecondsBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/SecondsBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/SecondsBetween.java
diff --git a/src/org/apache/pig/builtin/StringConcat.java b/pig/src/main/java/org/apache/pig/builtin/StringConcat.java
similarity index 100%
rename from src/org/apache/pig/builtin/StringConcat.java
rename to pig/src/main/java/org/apache/pig/builtin/StringConcat.java
diff --git a/src/org/apache/pig/builtin/StringMax.java b/pig/src/main/java/org/apache/pig/builtin/StringMax.java
similarity index 100%
rename from src/org/apache/pig/builtin/StringMax.java
rename to pig/src/main/java/org/apache/pig/builtin/StringMax.java
diff --git a/src/org/apache/pig/builtin/StringMin.java b/pig/src/main/java/org/apache/pig/builtin/StringMin.java
similarity index 100%
rename from src/org/apache/pig/builtin/StringMin.java
rename to pig/src/main/java/org/apache/pig/builtin/StringMin.java
diff --git a/src/org/apache/pig/builtin/StringSize.java b/pig/src/main/java/org/apache/pig/builtin/StringSize.java
similarity index 100%
rename from src/org/apache/pig/builtin/StringSize.java
rename to pig/src/main/java/org/apache/pig/builtin/StringSize.java
diff --git a/src/org/apache/pig/builtin/SubtractDuration.java b/pig/src/main/java/org/apache/pig/builtin/SubtractDuration.java
similarity index 100%
rename from src/org/apache/pig/builtin/SubtractDuration.java
rename to pig/src/main/java/org/apache/pig/builtin/SubtractDuration.java
diff --git a/src/org/apache/pig/builtin/TAN.java b/pig/src/main/java/org/apache/pig/builtin/TAN.java
similarity index 100%
rename from src/org/apache/pig/builtin/TAN.java
rename to pig/src/main/java/org/apache/pig/builtin/TAN.java
diff --git a/src/org/apache/pig/builtin/TANH.java b/pig/src/main/java/org/apache/pig/builtin/TANH.java
similarity index 100%
rename from src/org/apache/pig/builtin/TANH.java
rename to pig/src/main/java/org/apache/pig/builtin/TANH.java
diff --git a/src/org/apache/pig/builtin/TOBAG.java b/pig/src/main/java/org/apache/pig/builtin/TOBAG.java
similarity index 100%
rename from src/org/apache/pig/builtin/TOBAG.java
rename to pig/src/main/java/org/apache/pig/builtin/TOBAG.java
diff --git a/src/org/apache/pig/builtin/TOKENIZE.java b/pig/src/main/java/org/apache/pig/builtin/TOKENIZE.java
similarity index 100%
rename from src/org/apache/pig/builtin/TOKENIZE.java
rename to pig/src/main/java/org/apache/pig/builtin/TOKENIZE.java
diff --git a/src/org/apache/pig/builtin/TOMAP.java b/pig/src/main/java/org/apache/pig/builtin/TOMAP.java
similarity index 100%
rename from src/org/apache/pig/builtin/TOMAP.java
rename to pig/src/main/java/org/apache/pig/builtin/TOMAP.java
diff --git a/src/org/apache/pig/builtin/TOP.java b/pig/src/main/java/org/apache/pig/builtin/TOP.java
similarity index 100%
rename from src/org/apache/pig/builtin/TOP.java
rename to pig/src/main/java/org/apache/pig/builtin/TOP.java
diff --git a/src/org/apache/pig/builtin/TOTUPLE.java b/pig/src/main/java/org/apache/pig/builtin/TOTUPLE.java
similarity index 100%
rename from src/org/apache/pig/builtin/TOTUPLE.java
rename to pig/src/main/java/org/apache/pig/builtin/TOTUPLE.java
diff --git a/src/org/apache/pig/builtin/TRIM.java b/pig/src/main/java/org/apache/pig/builtin/TRIM.java
similarity index 100%
rename from src/org/apache/pig/builtin/TRIM.java
rename to pig/src/main/java/org/apache/pig/builtin/TRIM.java
diff --git a/src/org/apache/pig/builtin/TextLoader.java b/pig/src/main/java/org/apache/pig/builtin/TextLoader.java
similarity index 100%
rename from src/org/apache/pig/builtin/TextLoader.java
rename to pig/src/main/java/org/apache/pig/builtin/TextLoader.java
diff --git a/src/org/apache/pig/builtin/ToDate.java b/pig/src/main/java/org/apache/pig/builtin/ToDate.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToDate.java
rename to pig/src/main/java/org/apache/pig/builtin/ToDate.java
diff --git a/src/org/apache/pig/builtin/ToDate2ARGS.java b/pig/src/main/java/org/apache/pig/builtin/ToDate2ARGS.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToDate2ARGS.java
rename to pig/src/main/java/org/apache/pig/builtin/ToDate2ARGS.java
diff --git a/src/org/apache/pig/builtin/ToDate3ARGS.java b/pig/src/main/java/org/apache/pig/builtin/ToDate3ARGS.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToDate3ARGS.java
rename to pig/src/main/java/org/apache/pig/builtin/ToDate3ARGS.java
diff --git a/src/org/apache/pig/builtin/ToDateISO.java b/pig/src/main/java/org/apache/pig/builtin/ToDateISO.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToDateISO.java
rename to pig/src/main/java/org/apache/pig/builtin/ToDateISO.java
diff --git a/src/org/apache/pig/builtin/ToMilliSeconds.java b/pig/src/main/java/org/apache/pig/builtin/ToMilliSeconds.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToMilliSeconds.java
rename to pig/src/main/java/org/apache/pig/builtin/ToMilliSeconds.java
diff --git a/src/org/apache/pig/builtin/ToString.java b/pig/src/main/java/org/apache/pig/builtin/ToString.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToString.java
rename to pig/src/main/java/org/apache/pig/builtin/ToString.java
diff --git a/src/org/apache/pig/builtin/ToUnixTime.java b/pig/src/main/java/org/apache/pig/builtin/ToUnixTime.java
similarity index 100%
rename from src/org/apache/pig/builtin/ToUnixTime.java
rename to pig/src/main/java/org/apache/pig/builtin/ToUnixTime.java
diff --git a/src/org/apache/pig/builtin/TrevniStorage.java b/pig/src/main/java/org/apache/pig/builtin/TrevniStorage.java
similarity index 100%
rename from src/org/apache/pig/builtin/TrevniStorage.java
rename to pig/src/main/java/org/apache/pig/builtin/TrevniStorage.java
diff --git a/src/org/apache/pig/builtin/TupleSize.java b/pig/src/main/java/org/apache/pig/builtin/TupleSize.java
similarity index 100%
rename from src/org/apache/pig/builtin/TupleSize.java
rename to pig/src/main/java/org/apache/pig/builtin/TupleSize.java
diff --git a/src/org/apache/pig/builtin/UCFIRST.java b/pig/src/main/java/org/apache/pig/builtin/UCFIRST.java
similarity index 100%
rename from src/org/apache/pig/builtin/UCFIRST.java
rename to pig/src/main/java/org/apache/pig/builtin/UCFIRST.java
diff --git a/src/org/apache/pig/builtin/UPPER.java b/pig/src/main/java/org/apache/pig/builtin/UPPER.java
similarity index 100%
rename from src/org/apache/pig/builtin/UPPER.java
rename to pig/src/main/java/org/apache/pig/builtin/UPPER.java
diff --git a/src/org/apache/pig/builtin/Utf8StorageConverter.java b/pig/src/main/java/org/apache/pig/builtin/Utf8StorageConverter.java
similarity index 100%
rename from src/org/apache/pig/builtin/Utf8StorageConverter.java
rename to pig/src/main/java/org/apache/pig/builtin/Utf8StorageConverter.java
diff --git a/src/org/apache/pig/builtin/VALUELIST.java b/pig/src/main/java/org/apache/pig/builtin/VALUELIST.java
similarity index 100%
rename from src/org/apache/pig/builtin/VALUELIST.java
rename to pig/src/main/java/org/apache/pig/builtin/VALUELIST.java
diff --git a/src/org/apache/pig/builtin/VALUESET.java b/pig/src/main/java/org/apache/pig/builtin/VALUESET.java
similarity index 100%
rename from src/org/apache/pig/builtin/VALUESET.java
rename to pig/src/main/java/org/apache/pig/builtin/VALUESET.java
diff --git a/src/org/apache/pig/builtin/WeeksBetween.java b/pig/src/main/java/org/apache/pig/builtin/WeeksBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/WeeksBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/WeeksBetween.java
diff --git a/src/org/apache/pig/builtin/YearsBetween.java b/pig/src/main/java/org/apache/pig/builtin/YearsBetween.java
similarity index 100%
rename from src/org/apache/pig/builtin/YearsBetween.java
rename to pig/src/main/java/org/apache/pig/builtin/YearsBetween.java
diff --git a/src/org/apache/pig/builtin/mock/Storage.java b/pig/src/main/java/org/apache/pig/builtin/mock/Storage.java
similarity index 100%
rename from src/org/apache/pig/builtin/mock/Storage.java
rename to pig/src/main/java/org/apache/pig/builtin/mock/Storage.java
diff --git a/src/org/apache/pig/builtin/package.html b/pig/src/main/java/org/apache/pig/builtin/package.html
similarity index 100%
rename from src/org/apache/pig/builtin/package.html
rename to pig/src/main/java/org/apache/pig/builtin/package.html
diff --git a/src/org/apache/pig/classification/InterfaceAudience.java b/pig/src/main/java/org/apache/pig/classification/InterfaceAudience.java
similarity index 100%
rename from src/org/apache/pig/classification/InterfaceAudience.java
rename to pig/src/main/java/org/apache/pig/classification/InterfaceAudience.java
diff --git a/src/org/apache/pig/classification/InterfaceStability.java b/pig/src/main/java/org/apache/pig/classification/InterfaceStability.java
similarity index 100%
rename from src/org/apache/pig/classification/InterfaceStability.java
rename to pig/src/main/java/org/apache/pig/classification/InterfaceStability.java
diff --git a/src/org/apache/pig/data/AbstractTuple.java b/pig/src/main/java/org/apache/pig/data/AbstractTuple.java
similarity index 100%
rename from src/org/apache/pig/data/AbstractTuple.java
rename to pig/src/main/java/org/apache/pig/data/AbstractTuple.java
diff --git a/src/org/apache/pig/data/AccumulativeBag.java b/pig/src/main/java/org/apache/pig/data/AccumulativeBag.java
similarity index 100%
rename from src/org/apache/pig/data/AccumulativeBag.java
rename to pig/src/main/java/org/apache/pig/data/AccumulativeBag.java
diff --git a/src/org/apache/pig/data/AmendableTuple.java b/pig/src/main/java/org/apache/pig/data/AmendableTuple.java
similarity index 100%
rename from src/org/apache/pig/data/AmendableTuple.java
rename to pig/src/main/java/org/apache/pig/data/AmendableTuple.java
diff --git a/src/org/apache/pig/data/AppendableSchemaTuple.java b/pig/src/main/java/org/apache/pig/data/AppendableSchemaTuple.java
similarity index 100%
rename from src/org/apache/pig/data/AppendableSchemaTuple.java
rename to pig/src/main/java/org/apache/pig/data/AppendableSchemaTuple.java
diff --git a/src/org/apache/pig/data/BagFactory.java b/pig/src/main/java/org/apache/pig/data/BagFactory.java
similarity index 100%
rename from src/org/apache/pig/data/BagFactory.java
rename to pig/src/main/java/org/apache/pig/data/BagFactory.java
diff --git a/src/org/apache/pig/data/BinInterSedes.java b/pig/src/main/java/org/apache/pig/data/BinInterSedes.java
similarity index 100%
rename from src/org/apache/pig/data/BinInterSedes.java
rename to pig/src/main/java/org/apache/pig/data/BinInterSedes.java
diff --git a/src/org/apache/pig/data/BinSedesTuple.java b/pig/src/main/java/org/apache/pig/data/BinSedesTuple.java
similarity index 100%
rename from src/org/apache/pig/data/BinSedesTuple.java
rename to pig/src/main/java/org/apache/pig/data/BinSedesTuple.java
diff --git a/src/org/apache/pig/data/BinSedesTupleFactory.java b/pig/src/main/java/org/apache/pig/data/BinSedesTupleFactory.java
similarity index 100%
rename from src/org/apache/pig/data/BinSedesTupleFactory.java
rename to pig/src/main/java/org/apache/pig/data/BinSedesTupleFactory.java
diff --git a/src/org/apache/pig/data/DataBag.java b/pig/src/main/java/org/apache/pig/data/DataBag.java
similarity index 100%
rename from src/org/apache/pig/data/DataBag.java
rename to pig/src/main/java/org/apache/pig/data/DataBag.java
diff --git a/src/org/apache/pig/data/DataByteArray.java b/pig/src/main/java/org/apache/pig/data/DataByteArray.java
similarity index 100%
rename from src/org/apache/pig/data/DataByteArray.java
rename to pig/src/main/java/org/apache/pig/data/DataByteArray.java
diff --git a/src/org/apache/pig/data/DataReaderWriter.java b/pig/src/main/java/org/apache/pig/data/DataReaderWriter.java
similarity index 100%
rename from src/org/apache/pig/data/DataReaderWriter.java
rename to pig/src/main/java/org/apache/pig/data/DataReaderWriter.java
diff --git a/src/org/apache/pig/data/DataType.java b/pig/src/main/java/org/apache/pig/data/DataType.java
similarity index 100%
rename from src/org/apache/pig/data/DataType.java
rename to pig/src/main/java/org/apache/pig/data/DataType.java
diff --git a/src/org/apache/pig/data/DefaultAbstractBag.java b/pig/src/main/java/org/apache/pig/data/DefaultAbstractBag.java
similarity index 100%
rename from src/org/apache/pig/data/DefaultAbstractBag.java
rename to pig/src/main/java/org/apache/pig/data/DefaultAbstractBag.java
diff --git a/src/org/apache/pig/data/DefaultBagFactory.java b/pig/src/main/java/org/apache/pig/data/DefaultBagFactory.java
similarity index 100%
rename from src/org/apache/pig/data/DefaultBagFactory.java
rename to pig/src/main/java/org/apache/pig/data/DefaultBagFactory.java
diff --git a/src/org/apache/pig/data/DefaultDataBag.java b/pig/src/main/java/org/apache/pig/data/DefaultDataBag.java
similarity index 100%
rename from src/org/apache/pig/data/DefaultDataBag.java
rename to pig/src/main/java/org/apache/pig/data/DefaultDataBag.java
diff --git a/src/org/apache/pig/data/DefaultTuple.java b/pig/src/main/java/org/apache/pig/data/DefaultTuple.java
similarity index 100%
rename from src/org/apache/pig/data/DefaultTuple.java
rename to pig/src/main/java/org/apache/pig/data/DefaultTuple.java
diff --git a/src/org/apache/pig/data/DefaultTupleFactory.java b/pig/src/main/java/org/apache/pig/data/DefaultTupleFactory.java
similarity index 100%
rename from src/org/apache/pig/data/DefaultTupleFactory.java
rename to pig/src/main/java/org/apache/pig/data/DefaultTupleFactory.java
diff --git a/src/org/apache/pig/data/DistinctDataBag.java b/pig/src/main/java/org/apache/pig/data/DistinctDataBag.java
similarity index 100%
rename from src/org/apache/pig/data/DistinctDataBag.java
rename to pig/src/main/java/org/apache/pig/data/DistinctDataBag.java
diff --git a/src/org/apache/pig/data/FieldIsNullException.java b/pig/src/main/java/org/apache/pig/data/FieldIsNullException.java
similarity index 100%
rename from src/org/apache/pig/data/FieldIsNullException.java
rename to pig/src/main/java/org/apache/pig/data/FieldIsNullException.java
diff --git a/src/org/apache/pig/data/FileList.java b/pig/src/main/java/org/apache/pig/data/FileList.java
similarity index 100%
rename from src/org/apache/pig/data/FileList.java
rename to pig/src/main/java/org/apache/pig/data/FileList.java
diff --git a/src/org/apache/pig/data/InterSedes.java b/pig/src/main/java/org/apache/pig/data/InterSedes.java
similarity index 100%
rename from src/org/apache/pig/data/InterSedes.java
rename to pig/src/main/java/org/apache/pig/data/InterSedes.java
diff --git a/src/org/apache/pig/data/InterSedesFactory.java b/pig/src/main/java/org/apache/pig/data/InterSedesFactory.java
similarity index 100%
rename from src/org/apache/pig/data/InterSedesFactory.java
rename to pig/src/main/java/org/apache/pig/data/InterSedesFactory.java
diff --git a/src/org/apache/pig/data/InternalCachedBag.java b/pig/src/main/java/org/apache/pig/data/InternalCachedBag.java
similarity index 100%
rename from src/org/apache/pig/data/InternalCachedBag.java
rename to pig/src/main/java/org/apache/pig/data/InternalCachedBag.java
diff --git a/src/org/apache/pig/data/InternalDistinctBag.java b/pig/src/main/java/org/apache/pig/data/InternalDistinctBag.java
similarity index 100%
rename from src/org/apache/pig/data/InternalDistinctBag.java
rename to pig/src/main/java/org/apache/pig/data/InternalDistinctBag.java
diff --git a/src/org/apache/pig/data/InternalMap.java b/pig/src/main/java/org/apache/pig/data/InternalMap.java
similarity index 100%
rename from src/org/apache/pig/data/InternalMap.java
rename to pig/src/main/java/org/apache/pig/data/InternalMap.java
diff --git a/src/org/apache/pig/data/InternalSortedBag.java b/pig/src/main/java/org/apache/pig/data/InternalSortedBag.java
similarity index 100%
rename from src/org/apache/pig/data/InternalSortedBag.java
rename to pig/src/main/java/org/apache/pig/data/InternalSortedBag.java
diff --git a/src/org/apache/pig/data/NonSpillableDataBag.java b/pig/src/main/java/org/apache/pig/data/NonSpillableDataBag.java
similarity index 100%
rename from src/org/apache/pig/data/NonSpillableDataBag.java
rename to pig/src/main/java/org/apache/pig/data/NonSpillableDataBag.java
diff --git a/src/org/apache/pig/data/ReadOnceBag.java b/pig/src/main/java/org/apache/pig/data/ReadOnceBag.java
similarity index 100%
rename from src/org/apache/pig/data/ReadOnceBag.java
rename to pig/src/main/java/org/apache/pig/data/ReadOnceBag.java
diff --git a/src/org/apache/pig/data/SchemaTuple.java b/pig/src/main/java/org/apache/pig/data/SchemaTuple.java
similarity index 100%
rename from src/org/apache/pig/data/SchemaTuple.java
rename to pig/src/main/java/org/apache/pig/data/SchemaTuple.java
diff --git a/src/org/apache/pig/data/SchemaTupleBackend.java b/pig/src/main/java/org/apache/pig/data/SchemaTupleBackend.java
similarity index 100%
rename from src/org/apache/pig/data/SchemaTupleBackend.java
rename to pig/src/main/java/org/apache/pig/data/SchemaTupleBackend.java
diff --git a/src/org/apache/pig/data/SchemaTupleClassGenerator.java b/pig/src/main/java/org/apache/pig/data/SchemaTupleClassGenerator.java
similarity index 100%
rename from src/org/apache/pig/data/SchemaTupleClassGenerator.java
rename to pig/src/main/java/org/apache/pig/data/SchemaTupleClassGenerator.java
diff --git a/src/org/apache/pig/data/SchemaTupleFactory.java b/pig/src/main/java/org/apache/pig/data/SchemaTupleFactory.java
similarity index 100%
rename from src/org/apache/pig/data/SchemaTupleFactory.java
rename to pig/src/main/java/org/apache/pig/data/SchemaTupleFactory.java
diff --git a/src/org/apache/pig/data/SchemaTupleFrontend.java b/pig/src/main/java/org/apache/pig/data/SchemaTupleFrontend.java
similarity index 100%
rename from src/org/apache/pig/data/SchemaTupleFrontend.java
rename to pig/src/main/java/org/apache/pig/data/SchemaTupleFrontend.java
diff --git a/src/org/apache/pig/data/SelfSpillBag.java b/pig/src/main/java/org/apache/pig/data/SelfSpillBag.java
similarity index 100%
rename from src/org/apache/pig/data/SelfSpillBag.java
rename to pig/src/main/java/org/apache/pig/data/SelfSpillBag.java
diff --git a/src/org/apache/pig/data/SingleTupleBag.java b/pig/src/main/java/org/apache/pig/data/SingleTupleBag.java
similarity index 100%
rename from src/org/apache/pig/data/SingleTupleBag.java
rename to pig/src/main/java/org/apache/pig/data/SingleTupleBag.java
diff --git a/src/org/apache/pig/data/SizeUtil.java b/pig/src/main/java/org/apache/pig/data/SizeUtil.java
similarity index 100%
rename from src/org/apache/pig/data/SizeUtil.java
rename to pig/src/main/java/org/apache/pig/data/SizeUtil.java
diff --git a/src/org/apache/pig/data/SortedDataBag.java b/pig/src/main/java/org/apache/pig/data/SortedDataBag.java
similarity index 100%
rename from src/org/apache/pig/data/SortedDataBag.java
rename to pig/src/main/java/org/apache/pig/data/SortedDataBag.java
diff --git a/src/org/apache/pig/data/SortedSpillBag.java b/pig/src/main/java/org/apache/pig/data/SortedSpillBag.java
similarity index 100%
rename from src/org/apache/pig/data/SortedSpillBag.java
rename to pig/src/main/java/org/apache/pig/data/SortedSpillBag.java
diff --git a/src/org/apache/pig/data/TargetedTuple.java b/pig/src/main/java/org/apache/pig/data/TargetedTuple.java
similarity index 100%
rename from src/org/apache/pig/data/TargetedTuple.java
rename to pig/src/main/java/org/apache/pig/data/TargetedTuple.java
diff --git a/src/org/apache/pig/data/TimestampedTuple.java b/pig/src/main/java/org/apache/pig/data/TimestampedTuple.java
similarity index 100%
rename from src/org/apache/pig/data/TimestampedTuple.java
rename to pig/src/main/java/org/apache/pig/data/TimestampedTuple.java
diff --git a/src/org/apache/pig/data/Tuple.java b/pig/src/main/java/org/apache/pig/data/Tuple.java
similarity index 100%
rename from src/org/apache/pig/data/Tuple.java
rename to pig/src/main/java/org/apache/pig/data/Tuple.java
diff --git a/src/org/apache/pig/data/TupleFactory.java b/pig/src/main/java/org/apache/pig/data/TupleFactory.java
similarity index 100%
rename from src/org/apache/pig/data/TupleFactory.java
rename to pig/src/main/java/org/apache/pig/data/TupleFactory.java
diff --git a/src/org/apache/pig/data/TupleMaker.java b/pig/src/main/java/org/apache/pig/data/TupleMaker.java
similarity index 100%
rename from src/org/apache/pig/data/TupleMaker.java
rename to pig/src/main/java/org/apache/pig/data/TupleMaker.java
diff --git a/src/org/apache/pig/data/TupleRawComparator.java b/pig/src/main/java/org/apache/pig/data/TupleRawComparator.java
similarity index 100%
rename from src/org/apache/pig/data/TupleRawComparator.java
rename to pig/src/main/java/org/apache/pig/data/TupleRawComparator.java
diff --git a/src/org/apache/pig/data/TypeAwareTuple.java b/pig/src/main/java/org/apache/pig/data/TypeAwareTuple.java
similarity index 100%
rename from src/org/apache/pig/data/TypeAwareTuple.java
rename to pig/src/main/java/org/apache/pig/data/TypeAwareTuple.java
diff --git a/src/org/apache/pig/data/WritableByteArray.java b/pig/src/main/java/org/apache/pig/data/WritableByteArray.java
similarity index 100%
rename from src/org/apache/pig/data/WritableByteArray.java
rename to pig/src/main/java/org/apache/pig/data/WritableByteArray.java
diff --git a/src/org/apache/pig/data/package.html b/pig/src/main/java/org/apache/pig/data/package.html
similarity index 100%
rename from src/org/apache/pig/data/package.html
rename to pig/src/main/java/org/apache/pig/data/package.html
diff --git a/src/org/apache/pig/data/utils/BytesHelper.java b/pig/src/main/java/org/apache/pig/data/utils/BytesHelper.java
similarity index 100%
rename from src/org/apache/pig/data/utils/BytesHelper.java
rename to pig/src/main/java/org/apache/pig/data/utils/BytesHelper.java
diff --git a/src/org/apache/pig/data/utils/MethodHelper.java b/pig/src/main/java/org/apache/pig/data/utils/MethodHelper.java
similarity index 100%
rename from src/org/apache/pig/data/utils/MethodHelper.java
rename to pig/src/main/java/org/apache/pig/data/utils/MethodHelper.java
diff --git a/src/org/apache/pig/data/utils/SedesHelper.java b/pig/src/main/java/org/apache/pig/data/utils/SedesHelper.java
similarity index 100%
rename from src/org/apache/pig/data/utils/SedesHelper.java
rename to pig/src/main/java/org/apache/pig/data/utils/SedesHelper.java
diff --git a/src/org/apache/pig/data/utils/StructuresHelper.java b/pig/src/main/java/org/apache/pig/data/utils/StructuresHelper.java
similarity index 100%
rename from src/org/apache/pig/data/utils/StructuresHelper.java
rename to pig/src/main/java/org/apache/pig/data/utils/StructuresHelper.java
diff --git a/src/org/apache/pig/impl/PigContext.java b/pig/src/main/java/org/apache/pig/impl/PigContext.java
similarity index 100%
rename from src/org/apache/pig/impl/PigContext.java
rename to pig/src/main/java/org/apache/pig/impl/PigContext.java
diff --git a/src/org/apache/pig/impl/PigImplConstants.java b/pig/src/main/java/org/apache/pig/impl/PigImplConstants.java
similarity index 100%
rename from src/org/apache/pig/impl/PigImplConstants.java
rename to pig/src/main/java/org/apache/pig/impl/PigImplConstants.java
diff --git a/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java b/pig/src/main/java/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
diff --git a/src/org/apache/pig/impl/builtin/FindQuantiles.java b/pig/src/main/java/org/apache/pig/impl/builtin/FindQuantiles.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/FindQuantiles.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/FindQuantiles.java
diff --git a/src/org/apache/pig/impl/builtin/GFAny.java b/pig/src/main/java/org/apache/pig/impl/builtin/GFAny.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/GFAny.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/GFAny.java
diff --git a/src/org/apache/pig/impl/builtin/GFCross.java b/pig/src/main/java/org/apache/pig/impl/builtin/GFCross.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/GFCross.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/GFCross.java
diff --git a/src/org/apache/pig/impl/builtin/GFReplicate.java b/pig/src/main/java/org/apache/pig/impl/builtin/GFReplicate.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/GFReplicate.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/GFReplicate.java
diff --git a/src/org/apache/pig/impl/builtin/GetMemNumRows.java b/pig/src/main/java/org/apache/pig/impl/builtin/GetMemNumRows.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/GetMemNumRows.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/GetMemNumRows.java
diff --git a/src/org/apache/pig/impl/builtin/IdentityColumn.java b/pig/src/main/java/org/apache/pig/impl/builtin/IdentityColumn.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/IdentityColumn.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/IdentityColumn.java
diff --git a/src/org/apache/pig/impl/builtin/PartitionSkewedKeys.java b/pig/src/main/java/org/apache/pig/impl/builtin/PartitionSkewedKeys.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/PartitionSkewedKeys.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/PartitionSkewedKeys.java
diff --git a/src/org/apache/pig/impl/builtin/PoissonSampleLoader.java b/pig/src/main/java/org/apache/pig/impl/builtin/PoissonSampleLoader.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/PoissonSampleLoader.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/PoissonSampleLoader.java
diff --git a/src/org/apache/pig/impl/builtin/RandomSampleLoader.java b/pig/src/main/java/org/apache/pig/impl/builtin/RandomSampleLoader.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/RandomSampleLoader.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/RandomSampleLoader.java
diff --git a/src/org/apache/pig/impl/builtin/ReadScalars.java b/pig/src/main/java/org/apache/pig/impl/builtin/ReadScalars.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/ReadScalars.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/ReadScalars.java
diff --git a/src/org/apache/pig/impl/builtin/SampleLoader.java b/pig/src/main/java/org/apache/pig/impl/builtin/SampleLoader.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/SampleLoader.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/SampleLoader.java
diff --git a/src/org/apache/pig/impl/builtin/StreamingUDF.java b/pig/src/main/java/org/apache/pig/impl/builtin/StreamingUDF.java
similarity index 100%
rename from src/org/apache/pig/impl/builtin/StreamingUDF.java
rename to pig/src/main/java/org/apache/pig/impl/builtin/StreamingUDF.java
diff --git a/src/org/apache/pig/impl/io/BinStorageInputFormat.java b/pig/src/main/java/org/apache/pig/impl/io/BinStorageInputFormat.java
similarity index 100%
rename from src/org/apache/pig/impl/io/BinStorageInputFormat.java
rename to pig/src/main/java/org/apache/pig/impl/io/BinStorageInputFormat.java
diff --git a/src/org/apache/pig/impl/io/BinStorageOutputFormat.java b/pig/src/main/java/org/apache/pig/impl/io/BinStorageOutputFormat.java
similarity index 100%
rename from src/org/apache/pig/impl/io/BinStorageOutputFormat.java
rename to pig/src/main/java/org/apache/pig/impl/io/BinStorageOutputFormat.java
diff --git a/src/org/apache/pig/impl/io/BinStorageRecordReader.java b/pig/src/main/java/org/apache/pig/impl/io/BinStorageRecordReader.java
similarity index 100%
rename from src/org/apache/pig/impl/io/BinStorageRecordReader.java
rename to pig/src/main/java/org/apache/pig/impl/io/BinStorageRecordReader.java
diff --git a/src/org/apache/pig/impl/io/BinStorageRecordWriter.java b/pig/src/main/java/org/apache/pig/impl/io/BinStorageRecordWriter.java
similarity index 100%
rename from src/org/apache/pig/impl/io/BinStorageRecordWriter.java
rename to pig/src/main/java/org/apache/pig/impl/io/BinStorageRecordWriter.java
diff --git a/src/org/apache/pig/impl/io/BufferedPositionedInputStream.java b/pig/src/main/java/org/apache/pig/impl/io/BufferedPositionedInputStream.java
similarity index 100%
rename from src/org/apache/pig/impl/io/BufferedPositionedInputStream.java
rename to pig/src/main/java/org/apache/pig/impl/io/BufferedPositionedInputStream.java
diff --git a/src/org/apache/pig/impl/io/FileLocalizer.java b/pig/src/main/java/org/apache/pig/impl/io/FileLocalizer.java
similarity index 100%
rename from src/org/apache/pig/impl/io/FileLocalizer.java
rename to pig/src/main/java/org/apache/pig/impl/io/FileLocalizer.java
diff --git a/src/org/apache/pig/impl/io/FileSpec.java b/pig/src/main/java/org/apache/pig/impl/io/FileSpec.java
similarity index 100%
rename from src/org/apache/pig/impl/io/FileSpec.java
rename to pig/src/main/java/org/apache/pig/impl/io/FileSpec.java
diff --git a/src/org/apache/pig/impl/io/InterRecordReader.java b/pig/src/main/java/org/apache/pig/impl/io/InterRecordReader.java
similarity index 100%
rename from src/org/apache/pig/impl/io/InterRecordReader.java
rename to pig/src/main/java/org/apache/pig/impl/io/InterRecordReader.java
diff --git a/src/org/apache/pig/impl/io/InterRecordWriter.java b/pig/src/main/java/org/apache/pig/impl/io/InterRecordWriter.java
similarity index 100%
rename from src/org/apache/pig/impl/io/InterRecordWriter.java
rename to pig/src/main/java/org/apache/pig/impl/io/InterRecordWriter.java
diff --git a/src/org/apache/pig/impl/io/InterStorage.java b/pig/src/main/java/org/apache/pig/impl/io/InterStorage.java
similarity index 100%
rename from src/org/apache/pig/impl/io/InterStorage.java
rename to pig/src/main/java/org/apache/pig/impl/io/InterStorage.java
diff --git a/src/org/apache/pig/impl/io/NullableBag.java b/pig/src/main/java/org/apache/pig/impl/io/NullableBag.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableBag.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableBag.java
diff --git a/src/org/apache/pig/impl/io/NullableBigDecimalWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableBigDecimalWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableBigDecimalWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableBigDecimalWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableBigIntegerWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableBigIntegerWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableBigIntegerWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableBigIntegerWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableBooleanWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableBooleanWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableBooleanWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableBooleanWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableBytesWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableBytesWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableBytesWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableBytesWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableDateTimeWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableDateTimeWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableDateTimeWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableDateTimeWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableDoubleWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableDoubleWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableDoubleWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableDoubleWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableFloatWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableFloatWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableFloatWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableFloatWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableIntWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableIntWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableIntWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableIntWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableLongWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableLongWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableLongWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableLongWritable.java
diff --git a/src/org/apache/pig/impl/io/NullablePartitionWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullablePartitionWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullablePartitionWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullablePartitionWritable.java
diff --git a/src/org/apache/pig/impl/io/NullableText.java b/pig/src/main/java/org/apache/pig/impl/io/NullableText.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableText.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableText.java
diff --git a/src/org/apache/pig/impl/io/NullableTuple.java b/pig/src/main/java/org/apache/pig/impl/io/NullableTuple.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableTuple.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableTuple.java
diff --git a/src/org/apache/pig/impl/io/NullableUnknownWritable.java b/pig/src/main/java/org/apache/pig/impl/io/NullableUnknownWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/NullableUnknownWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/NullableUnknownWritable.java
diff --git a/src/org/apache/pig/impl/io/PigFile.java b/pig/src/main/java/org/apache/pig/impl/io/PigFile.java
similarity index 100%
rename from src/org/apache/pig/impl/io/PigFile.java
rename to pig/src/main/java/org/apache/pig/impl/io/PigFile.java
diff --git a/src/org/apache/pig/impl/io/PigNullableWritable.java b/pig/src/main/java/org/apache/pig/impl/io/PigNullableWritable.java
similarity index 100%
rename from src/org/apache/pig/impl/io/PigNullableWritable.java
rename to pig/src/main/java/org/apache/pig/impl/io/PigNullableWritable.java
diff --git a/src/org/apache/pig/impl/io/ReadToEndLoader.java b/pig/src/main/java/org/apache/pig/impl/io/ReadToEndLoader.java
similarity index 100%
rename from src/org/apache/pig/impl/io/ReadToEndLoader.java
rename to pig/src/main/java/org/apache/pig/impl/io/ReadToEndLoader.java
diff --git a/src/org/apache/pig/impl/io/ResourceNotFoundException.java b/pig/src/main/java/org/apache/pig/impl/io/ResourceNotFoundException.java
similarity index 100%
rename from src/org/apache/pig/impl/io/ResourceNotFoundException.java
rename to pig/src/main/java/org/apache/pig/impl/io/ResourceNotFoundException.java
diff --git a/src/org/apache/pig/impl/io/SequenceFileInterStorage.java b/pig/src/main/java/org/apache/pig/impl/io/SequenceFileInterStorage.java
similarity index 100%
rename from src/org/apache/pig/impl/io/SequenceFileInterStorage.java
rename to pig/src/main/java/org/apache/pig/impl/io/SequenceFileInterStorage.java
diff --git a/src/org/apache/pig/impl/io/TFileRecordReader.java b/pig/src/main/java/org/apache/pig/impl/io/TFileRecordReader.java
similarity index 100%
rename from src/org/apache/pig/impl/io/TFileRecordReader.java
rename to pig/src/main/java/org/apache/pig/impl/io/TFileRecordReader.java
diff --git a/src/org/apache/pig/impl/io/TFileRecordWriter.java b/pig/src/main/java/org/apache/pig/impl/io/TFileRecordWriter.java
similarity index 100%
rename from src/org/apache/pig/impl/io/TFileRecordWriter.java
rename to pig/src/main/java/org/apache/pig/impl/io/TFileRecordWriter.java
diff --git a/src/org/apache/pig/impl/io/TFileStorage.java b/pig/src/main/java/org/apache/pig/impl/io/TFileStorage.java
similarity index 100%
rename from src/org/apache/pig/impl/io/TFileStorage.java
rename to pig/src/main/java/org/apache/pig/impl/io/TFileStorage.java
diff --git a/src/org/apache/pig/impl/logicalLayer/CanonicalNamer.java b/pig/src/main/java/org/apache/pig/impl/logicalLayer/CanonicalNamer.java
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/CanonicalNamer.java
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/CanonicalNamer.java
diff --git a/src/org/apache/pig/impl/logicalLayer/FrontendException.java b/pig/src/main/java/org/apache/pig/impl/logicalLayer/FrontendException.java
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/FrontendException.java
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/FrontendException.java
diff --git a/src/org/apache/pig/impl/logicalLayer/package.html b/pig/src/main/java/org/apache/pig/impl/logicalLayer/package.html
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/package.html
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/package.html
diff --git a/src/org/apache/pig/impl/logicalLayer/schema/Schema.java b/pig/src/main/java/org/apache/pig/impl/logicalLayer/schema/Schema.java
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/schema/Schema.java
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/schema/Schema.java
diff --git a/src/org/apache/pig/impl/logicalLayer/schema/SchemaMergeException.java b/pig/src/main/java/org/apache/pig/impl/logicalLayer/schema/SchemaMergeException.java
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/schema/SchemaMergeException.java
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/schema/SchemaMergeException.java
diff --git a/src/org/apache/pig/impl/logicalLayer/schema/SchemaUtil.java b/pig/src/main/java/org/apache/pig/impl/logicalLayer/schema/SchemaUtil.java
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/schema/SchemaUtil.java
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/schema/SchemaUtil.java
diff --git a/src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java b/pig/src/main/java/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
similarity index 100%
rename from src/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
rename to pig/src/main/java/org/apache/pig/impl/logicalLayer/validators/TypeCheckerException.java
diff --git a/src/org/apache/pig/impl/plan/CompilationMessageCollector.java b/pig/src/main/java/org/apache/pig/impl/plan/CompilationMessageCollector.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/CompilationMessageCollector.java
rename to pig/src/main/java/org/apache/pig/impl/plan/CompilationMessageCollector.java
diff --git a/src/org/apache/pig/impl/plan/DependencyOrderWalker.java b/pig/src/main/java/org/apache/pig/impl/plan/DependencyOrderWalker.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/DependencyOrderWalker.java
rename to pig/src/main/java/org/apache/pig/impl/plan/DependencyOrderWalker.java
diff --git a/src/org/apache/pig/impl/plan/DepthFirstWalker.java b/pig/src/main/java/org/apache/pig/impl/plan/DepthFirstWalker.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/DepthFirstWalker.java
rename to pig/src/main/java/org/apache/pig/impl/plan/DepthFirstWalker.java
diff --git a/src/org/apache/pig/impl/plan/DotPlanDumper.java b/pig/src/main/java/org/apache/pig/impl/plan/DotPlanDumper.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/DotPlanDumper.java
rename to pig/src/main/java/org/apache/pig/impl/plan/DotPlanDumper.java
diff --git a/src/org/apache/pig/impl/plan/MapKeysInfo.java b/pig/src/main/java/org/apache/pig/impl/plan/MapKeysInfo.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/MapKeysInfo.java
rename to pig/src/main/java/org/apache/pig/impl/plan/MapKeysInfo.java
diff --git a/src/org/apache/pig/impl/plan/NodeIdGenerator.java b/pig/src/main/java/org/apache/pig/impl/plan/NodeIdGenerator.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/NodeIdGenerator.java
rename to pig/src/main/java/org/apache/pig/impl/plan/NodeIdGenerator.java
diff --git a/src/org/apache/pig/impl/plan/Operator.java b/pig/src/main/java/org/apache/pig/impl/plan/Operator.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/Operator.java
rename to pig/src/main/java/org/apache/pig/impl/plan/Operator.java
diff --git a/src/org/apache/pig/impl/plan/OperatorKey.java b/pig/src/main/java/org/apache/pig/impl/plan/OperatorKey.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/OperatorKey.java
rename to pig/src/main/java/org/apache/pig/impl/plan/OperatorKey.java
diff --git a/src/org/apache/pig/impl/plan/OperatorPlan.java b/pig/src/main/java/org/apache/pig/impl/plan/OperatorPlan.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/OperatorPlan.java
rename to pig/src/main/java/org/apache/pig/impl/plan/OperatorPlan.java
diff --git a/src/org/apache/pig/impl/plan/PlanDumper.java b/pig/src/main/java/org/apache/pig/impl/plan/PlanDumper.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/PlanDumper.java
rename to pig/src/main/java/org/apache/pig/impl/plan/PlanDumper.java
diff --git a/src/org/apache/pig/impl/plan/PlanException.java b/pig/src/main/java/org/apache/pig/impl/plan/PlanException.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/PlanException.java
rename to pig/src/main/java/org/apache/pig/impl/plan/PlanException.java
diff --git a/src/org/apache/pig/impl/plan/PlanValidationException.java b/pig/src/main/java/org/apache/pig/impl/plan/PlanValidationException.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/PlanValidationException.java
rename to pig/src/main/java/org/apache/pig/impl/plan/PlanValidationException.java
diff --git a/src/org/apache/pig/impl/plan/PlanVisitor.java b/pig/src/main/java/org/apache/pig/impl/plan/PlanVisitor.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/PlanVisitor.java
rename to pig/src/main/java/org/apache/pig/impl/plan/PlanVisitor.java
diff --git a/src/org/apache/pig/impl/plan/PlanWalker.java b/pig/src/main/java/org/apache/pig/impl/plan/PlanWalker.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/PlanWalker.java
rename to pig/src/main/java/org/apache/pig/impl/plan/PlanWalker.java
diff --git a/src/org/apache/pig/impl/plan/ProjectionMap.java b/pig/src/main/java/org/apache/pig/impl/plan/ProjectionMap.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/ProjectionMap.java
rename to pig/src/main/java/org/apache/pig/impl/plan/ProjectionMap.java
diff --git a/src/org/apache/pig/impl/plan/RequiredFields.java b/pig/src/main/java/org/apache/pig/impl/plan/RequiredFields.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/RequiredFields.java
rename to pig/src/main/java/org/apache/pig/impl/plan/RequiredFields.java
diff --git a/src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java b/pig/src/main/java/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java
rename to pig/src/main/java/org/apache/pig/impl/plan/ReverseDependencyOrderWalker.java
diff --git a/src/org/apache/pig/impl/plan/VisitorException.java b/pig/src/main/java/org/apache/pig/impl/plan/VisitorException.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/VisitorException.java
rename to pig/src/main/java/org/apache/pig/impl/plan/VisitorException.java
diff --git a/src/org/apache/pig/impl/plan/optimizer/OptimizerException.java b/pig/src/main/java/org/apache/pig/impl/plan/optimizer/OptimizerException.java
similarity index 100%
rename from src/org/apache/pig/impl/plan/optimizer/OptimizerException.java
rename to pig/src/main/java/org/apache/pig/impl/plan/optimizer/OptimizerException.java
diff --git a/src/org/apache/pig/impl/streaming/DefaultInputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/DefaultInputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/DefaultInputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/DefaultInputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/DefaultOutputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/DefaultOutputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/DefaultOutputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/DefaultOutputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/ExecutableManager.java b/pig/src/main/java/org/apache/pig/impl/streaming/ExecutableManager.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/ExecutableManager.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/ExecutableManager.java
diff --git a/src/org/apache/pig/impl/streaming/FileInputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/FileInputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/FileInputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/FileInputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/FileOutputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/FileOutputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/FileOutputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/FileOutputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/HandlerFactory.java b/pig/src/main/java/org/apache/pig/impl/streaming/HandlerFactory.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/HandlerFactory.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/HandlerFactory.java
diff --git a/src/org/apache/pig/impl/streaming/InputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/InputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/InputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/InputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/OutputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/OutputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/OutputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/OutputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/PigStreamingUDF.java b/pig/src/main/java/org/apache/pig/impl/streaming/PigStreamingUDF.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/PigStreamingUDF.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/PigStreamingUDF.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingCommand.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingCommand.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingCommand.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingCommand.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingDelimiters.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingDelimiters.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingDelimiters.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingDelimiters.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingUDFException.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFException.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingUDFException.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFException.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingUDFInputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFInputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingUDFInputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFInputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingUDFOutputHandler.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFOutputHandler.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingUDFOutputHandler.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFOutputHandler.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingUDFOutputSchemaException.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFOutputSchemaException.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingUDFOutputSchemaException.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingUDFOutputSchemaException.java
diff --git a/src/org/apache/pig/impl/streaming/StreamingUtil.java b/pig/src/main/java/org/apache/pig/impl/streaming/StreamingUtil.java
similarity index 100%
rename from src/org/apache/pig/impl/streaming/StreamingUtil.java
rename to pig/src/main/java/org/apache/pig/impl/streaming/StreamingUtil.java
diff --git a/src/org/apache/pig/impl/util/BagFormat.java b/pig/src/main/java/org/apache/pig/impl/util/BagFormat.java
similarity index 100%
rename from src/org/apache/pig/impl/util/BagFormat.java
rename to pig/src/main/java/org/apache/pig/impl/util/BagFormat.java
diff --git a/src/org/apache/pig/impl/util/CastUtils.java b/pig/src/main/java/org/apache/pig/impl/util/CastUtils.java
similarity index 100%
rename from src/org/apache/pig/impl/util/CastUtils.java
rename to pig/src/main/java/org/apache/pig/impl/util/CastUtils.java
diff --git a/src/org/apache/pig/impl/util/CompilerUtils.java b/pig/src/main/java/org/apache/pig/impl/util/CompilerUtils.java
similarity index 100%
rename from src/org/apache/pig/impl/util/CompilerUtils.java
rename to pig/src/main/java/org/apache/pig/impl/util/CompilerUtils.java
diff --git a/src/org/apache/pig/impl/util/ConfigurationValidator.java b/pig/src/main/java/org/apache/pig/impl/util/ConfigurationValidator.java
similarity index 100%
rename from src/org/apache/pig/impl/util/ConfigurationValidator.java
rename to pig/src/main/java/org/apache/pig/impl/util/ConfigurationValidator.java
diff --git a/src/org/apache/pig/impl/util/HashOutputStream.java b/pig/src/main/java/org/apache/pig/impl/util/HashOutputStream.java
similarity index 100%
rename from src/org/apache/pig/impl/util/HashOutputStream.java
rename to pig/src/main/java/org/apache/pig/impl/util/HashOutputStream.java
diff --git a/src/org/apache/pig/impl/util/IdentityHashSet.java b/pig/src/main/java/org/apache/pig/impl/util/IdentityHashSet.java
similarity index 100%
rename from src/org/apache/pig/impl/util/IdentityHashSet.java
rename to pig/src/main/java/org/apache/pig/impl/util/IdentityHashSet.java
diff --git a/src/org/apache/pig/impl/util/JarManager.java b/pig/src/main/java/org/apache/pig/impl/util/JarManager.java
similarity index 100%
rename from src/org/apache/pig/impl/util/JarManager.java
rename to pig/src/main/java/org/apache/pig/impl/util/JarManager.java
diff --git a/src/org/apache/pig/impl/util/JavaCompilerHelper.java b/pig/src/main/java/org/apache/pig/impl/util/JavaCompilerHelper.java
similarity index 100%
rename from src/org/apache/pig/impl/util/JavaCompilerHelper.java
rename to pig/src/main/java/org/apache/pig/impl/util/JavaCompilerHelper.java
diff --git a/src/org/apache/pig/impl/util/LineageTracer.java b/pig/src/main/java/org/apache/pig/impl/util/LineageTracer.java
similarity index 100%
rename from src/org/apache/pig/impl/util/LineageTracer.java
rename to pig/src/main/java/org/apache/pig/impl/util/LineageTracer.java
diff --git a/src/org/apache/pig/impl/util/LinkedMultiMap.java b/pig/src/main/java/org/apache/pig/impl/util/LinkedMultiMap.java
similarity index 100%
rename from src/org/apache/pig/impl/util/LinkedMultiMap.java
rename to pig/src/main/java/org/apache/pig/impl/util/LinkedMultiMap.java
diff --git a/src/org/apache/pig/impl/util/LogUtils.java b/pig/src/main/java/org/apache/pig/impl/util/LogUtils.java
similarity index 100%
rename from src/org/apache/pig/impl/util/LogUtils.java
rename to pig/src/main/java/org/apache/pig/impl/util/LogUtils.java
diff --git a/src/org/apache/pig/impl/util/MultiMap.java b/pig/src/main/java/org/apache/pig/impl/util/MultiMap.java
similarity index 100%
rename from src/org/apache/pig/impl/util/MultiMap.java
rename to pig/src/main/java/org/apache/pig/impl/util/MultiMap.java
diff --git a/src/org/apache/pig/impl/util/NumValCarrier.java b/pig/src/main/java/org/apache/pig/impl/util/NumValCarrier.java
similarity index 100%
rename from src/org/apache/pig/impl/util/NumValCarrier.java
rename to pig/src/main/java/org/apache/pig/impl/util/NumValCarrier.java
diff --git a/src/org/apache/pig/impl/util/ObjectSerializer.java b/pig/src/main/java/org/apache/pig/impl/util/ObjectSerializer.java
similarity index 100%
rename from src/org/apache/pig/impl/util/ObjectSerializer.java
rename to pig/src/main/java/org/apache/pig/impl/util/ObjectSerializer.java
diff --git a/src/org/apache/pig/impl/util/Pair.java b/pig/src/main/java/org/apache/pig/impl/util/Pair.java
similarity index 100%
rename from src/org/apache/pig/impl/util/Pair.java
rename to pig/src/main/java/org/apache/pig/impl/util/Pair.java
diff --git a/src/org/apache/pig/impl/util/PropertiesUtil.java b/pig/src/main/java/org/apache/pig/impl/util/PropertiesUtil.java
similarity index 100%
rename from src/org/apache/pig/impl/util/PropertiesUtil.java
rename to pig/src/main/java/org/apache/pig/impl/util/PropertiesUtil.java
diff --git a/src/org/apache/pig/impl/util/RewindableIterator.java b/pig/src/main/java/org/apache/pig/impl/util/RewindableIterator.java
similarity index 100%
rename from src/org/apache/pig/impl/util/RewindableIterator.java
rename to pig/src/main/java/org/apache/pig/impl/util/RewindableIterator.java
diff --git a/src/org/apache/pig/impl/util/Spillable.java b/pig/src/main/java/org/apache/pig/impl/util/Spillable.java
similarity index 100%
rename from src/org/apache/pig/impl/util/Spillable.java
rename to pig/src/main/java/org/apache/pig/impl/util/Spillable.java
diff --git a/src/org/apache/pig/impl/util/SpillableMemoryManager.java b/pig/src/main/java/org/apache/pig/impl/util/SpillableMemoryManager.java
similarity index 100%
rename from src/org/apache/pig/impl/util/SpillableMemoryManager.java
rename to pig/src/main/java/org/apache/pig/impl/util/SpillableMemoryManager.java
diff --git a/src/org/apache/pig/impl/util/StorageUtil.java b/pig/src/main/java/org/apache/pig/impl/util/StorageUtil.java
similarity index 100%
rename from src/org/apache/pig/impl/util/StorageUtil.java
rename to pig/src/main/java/org/apache/pig/impl/util/StorageUtil.java
diff --git a/src/org/apache/pig/impl/util/StringUtils.java b/pig/src/main/java/org/apache/pig/impl/util/StringUtils.java
similarity index 100%
rename from src/org/apache/pig/impl/util/StringUtils.java
rename to pig/src/main/java/org/apache/pig/impl/util/StringUtils.java
diff --git a/src/org/apache/pig/impl/util/TupleFormat.java b/pig/src/main/java/org/apache/pig/impl/util/TupleFormat.java
similarity index 100%
rename from src/org/apache/pig/impl/util/TupleFormat.java
rename to pig/src/main/java/org/apache/pig/impl/util/TupleFormat.java
diff --git a/src/org/apache/pig/impl/util/UDFContext.java b/pig/src/main/java/org/apache/pig/impl/util/UDFContext.java
similarity index 100%
rename from src/org/apache/pig/impl/util/UDFContext.java
rename to pig/src/main/java/org/apache/pig/impl/util/UDFContext.java
diff --git a/src/org/apache/pig/impl/util/UriUtil.java b/pig/src/main/java/org/apache/pig/impl/util/UriUtil.java
similarity index 100%
rename from src/org/apache/pig/impl/util/UriUtil.java
rename to pig/src/main/java/org/apache/pig/impl/util/UriUtil.java
diff --git a/src/org/apache/pig/impl/util/Utils.java b/pig/src/main/java/org/apache/pig/impl/util/Utils.java
similarity index 100%
rename from src/org/apache/pig/impl/util/Utils.java
rename to pig/src/main/java/org/apache/pig/impl/util/Utils.java
diff --git a/src/org/apache/pig/impl/util/WrappedIOException.java b/pig/src/main/java/org/apache/pig/impl/util/WrappedIOException.java
similarity index 100%
rename from src/org/apache/pig/impl/util/WrappedIOException.java
rename to pig/src/main/java/org/apache/pig/impl/util/WrappedIOException.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroArrayReader.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroArrayReader.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroArrayReader.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroArrayReader.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroBagWrapper.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroBagWrapper.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroBagWrapper.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroBagWrapper.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroMapWrapper.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroMapWrapper.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroMapWrapper.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroMapWrapper.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroRecordReader.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroRecordReader.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroRecordReader.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroRecordReader.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroRecordWriter.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroRecordWriter.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroRecordWriter.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroRecordWriter.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroStorageDataConversionUtilities.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroStorageDataConversionUtilities.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroStorageDataConversionUtilities.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroStorageDataConversionUtilities.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroStorageSchemaConversionUtilities.java
diff --git a/src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java b/pig/src/main/java/org/apache/pig/impl/util/avro/AvroTupleWrapper.java
similarity index 100%
rename from src/org/apache/pig/impl/util/avro/AvroTupleWrapper.java
rename to pig/src/main/java/org/apache/pig/impl/util/avro/AvroTupleWrapper.java
diff --git a/src/org/apache/pig/impl/util/orc/OrcUtils.java b/pig/src/main/java/org/apache/pig/impl/util/orc/OrcUtils.java
similarity index 100%
rename from src/org/apache/pig/impl/util/orc/OrcUtils.java
rename to pig/src/main/java/org/apache/pig/impl/util/orc/OrcUtils.java
diff --git a/src/org/apache/pig/newplan/BaseOperatorPlan.java b/pig/src/main/java/org/apache/pig/newplan/BaseOperatorPlan.java
similarity index 100%
rename from src/org/apache/pig/newplan/BaseOperatorPlan.java
rename to pig/src/main/java/org/apache/pig/newplan/BaseOperatorPlan.java
diff --git a/src/org/apache/pig/newplan/DependencyOrderWalker.java b/pig/src/main/java/org/apache/pig/newplan/DependencyOrderWalker.java
similarity index 100%
rename from src/org/apache/pig/newplan/DependencyOrderWalker.java
rename to pig/src/main/java/org/apache/pig/newplan/DependencyOrderWalker.java
diff --git a/src/org/apache/pig/newplan/DepthFirstWalker.java b/pig/src/main/java/org/apache/pig/newplan/DepthFirstWalker.java
similarity index 100%
rename from src/org/apache/pig/newplan/DepthFirstWalker.java
rename to pig/src/main/java/org/apache/pig/newplan/DepthFirstWalker.java
diff --git a/src/org/apache/pig/newplan/DotPlanDumper.java b/pig/src/main/java/org/apache/pig/newplan/DotPlanDumper.java
similarity index 100%
rename from src/org/apache/pig/newplan/DotPlanDumper.java
rename to pig/src/main/java/org/apache/pig/newplan/DotPlanDumper.java
diff --git a/src/org/apache/pig/newplan/FilterExtractor.java b/pig/src/main/java/org/apache/pig/newplan/FilterExtractor.java
similarity index 100%
rename from src/org/apache/pig/newplan/FilterExtractor.java
rename to pig/src/main/java/org/apache/pig/newplan/FilterExtractor.java
diff --git a/src/org/apache/pig/newplan/Operator.java b/pig/src/main/java/org/apache/pig/newplan/Operator.java
similarity index 100%
rename from src/org/apache/pig/newplan/Operator.java
rename to pig/src/main/java/org/apache/pig/newplan/Operator.java
diff --git a/src/org/apache/pig/newplan/OperatorPlan.java b/pig/src/main/java/org/apache/pig/newplan/OperatorPlan.java
similarity index 100%
rename from src/org/apache/pig/newplan/OperatorPlan.java
rename to pig/src/main/java/org/apache/pig/newplan/OperatorPlan.java
diff --git a/src/org/apache/pig/newplan/OperatorSubPlan.java b/pig/src/main/java/org/apache/pig/newplan/OperatorSubPlan.java
similarity index 100%
rename from src/org/apache/pig/newplan/OperatorSubPlan.java
rename to pig/src/main/java/org/apache/pig/newplan/OperatorSubPlan.java
diff --git a/src/org/apache/pig/newplan/PartitionFilterExtractor.java b/pig/src/main/java/org/apache/pig/newplan/PartitionFilterExtractor.java
similarity index 100%
rename from src/org/apache/pig/newplan/PartitionFilterExtractor.java
rename to pig/src/main/java/org/apache/pig/newplan/PartitionFilterExtractor.java
diff --git a/src/org/apache/pig/newplan/PlanDumper.java b/pig/src/main/java/org/apache/pig/newplan/PlanDumper.java
similarity index 100%
rename from src/org/apache/pig/newplan/PlanDumper.java
rename to pig/src/main/java/org/apache/pig/newplan/PlanDumper.java
diff --git a/src/org/apache/pig/newplan/PlanEdge.java b/pig/src/main/java/org/apache/pig/newplan/PlanEdge.java
similarity index 100%
rename from src/org/apache/pig/newplan/PlanEdge.java
rename to pig/src/main/java/org/apache/pig/newplan/PlanEdge.java
diff --git a/src/org/apache/pig/newplan/PlanVisitor.java b/pig/src/main/java/org/apache/pig/newplan/PlanVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/PlanVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/PlanVisitor.java
diff --git a/src/org/apache/pig/newplan/PlanWalker.java b/pig/src/main/java/org/apache/pig/newplan/PlanWalker.java
similarity index 100%
rename from src/org/apache/pig/newplan/PlanWalker.java
rename to pig/src/main/java/org/apache/pig/newplan/PlanWalker.java
diff --git a/src/org/apache/pig/newplan/PredicatePushDownFilterExtractor.java b/pig/src/main/java/org/apache/pig/newplan/PredicatePushDownFilterExtractor.java
similarity index 100%
rename from src/org/apache/pig/newplan/PredicatePushDownFilterExtractor.java
rename to pig/src/main/java/org/apache/pig/newplan/PredicatePushDownFilterExtractor.java
diff --git a/src/org/apache/pig/newplan/ReverseDependencyOrderWalker.java b/pig/src/main/java/org/apache/pig/newplan/ReverseDependencyOrderWalker.java
similarity index 100%
rename from src/org/apache/pig/newplan/ReverseDependencyOrderWalker.java
rename to pig/src/main/java/org/apache/pig/newplan/ReverseDependencyOrderWalker.java
diff --git a/src/org/apache/pig/newplan/ReverseDependencyOrderWalkerWOSeenChk.java b/pig/src/main/java/org/apache/pig/newplan/ReverseDependencyOrderWalkerWOSeenChk.java
similarity index 100%
rename from src/org/apache/pig/newplan/ReverseDependencyOrderWalkerWOSeenChk.java
rename to pig/src/main/java/org/apache/pig/newplan/ReverseDependencyOrderWalkerWOSeenChk.java
diff --git a/src/org/apache/pig/newplan/SubtreeDependencyOrderWalker.java b/pig/src/main/java/org/apache/pig/newplan/SubtreeDependencyOrderWalker.java
similarity index 100%
rename from src/org/apache/pig/newplan/SubtreeDependencyOrderWalker.java
rename to pig/src/main/java/org/apache/pig/newplan/SubtreeDependencyOrderWalker.java
diff --git a/src/org/apache/pig/newplan/logical/DotLOPrinter.java b/pig/src/main/java/org/apache/pig/newplan/logical/DotLOPrinter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/DotLOPrinter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/DotLOPrinter.java
diff --git a/src/org/apache/pig/newplan/logical/Util.java b/pig/src/main/java/org/apache/pig/newplan/logical/Util.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/Util.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/Util.java
diff --git a/src/org/apache/pig/newplan/logical/expression/AddExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/AddExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/AddExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/AddExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/AllSameExpressionVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/AllSameExpressionVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/AllSameExpressionVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/AllSameExpressionVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/expression/AndExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/AndExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/AndExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/AndExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/BinCondExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/BinCondExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/BinCondExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/BinCondExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/BinaryExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/BinaryExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/BinaryExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/BinaryExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/CastExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/CastExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/CastExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/CastExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/ColumnExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/ColumnExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/ColumnExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/ColumnExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/ConstantExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/ConstantExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/ConstantExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/ConstantExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/DereferenceExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/DereferenceExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/DereferenceExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/DereferenceExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/DivideExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/DivideExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/DivideExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/DivideExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/EqualExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/EqualExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/EqualExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/EqualExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/ExpToPhyTranslationVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/ExpToPhyTranslationVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/ExpToPhyTranslationVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/ExpToPhyTranslationVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/expression/GreaterThanEqualExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/GreaterThanEqualExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/GreaterThanEqualExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/GreaterThanEqualExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/GreaterThanExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/GreaterThanExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/GreaterThanExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/GreaterThanExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/IsNullExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/IsNullExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/IsNullExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/IsNullExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/LessThanEqualExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/LessThanEqualExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/LessThanEqualExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/LessThanEqualExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/LessThanExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/LessThanExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/LessThanExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/LessThanExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/LogicalExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/LogicalExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/LogicalExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/LogicalExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/LogicalExpressionPlan.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/LogicalExpressionPlan.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/LogicalExpressionPlan.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/LogicalExpressionPlan.java
diff --git a/src/org/apache/pig/newplan/logical/expression/LogicalExpressionVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/LogicalExpressionVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/LogicalExpressionVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/LogicalExpressionVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/expression/MapLookupExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/MapLookupExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/MapLookupExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/MapLookupExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/ModExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/ModExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/ModExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/ModExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/MultiplyExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/MultiplyExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/MultiplyExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/MultiplyExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/NegativeExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/NegativeExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/NegativeExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/NegativeExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/NotEqualExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/NotEqualExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/NotEqualExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/NotEqualExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/NotExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/NotExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/NotExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/NotExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/OrExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/OrExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/OrExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/OrExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/ProjectExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/ProjectExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/ProjectExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/ProjectExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/RegexExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/RegexExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/RegexExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/RegexExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/ScalarExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/ScalarExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/ScalarExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/ScalarExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/SubtractExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/SubtractExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/SubtractExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/SubtractExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/UnaryExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/UnaryExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/UnaryExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/UnaryExpression.java
diff --git a/src/org/apache/pig/newplan/logical/expression/UserFuncExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/expression/UserFuncExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/expression/UserFuncExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/expression/UserFuncExpression.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/AllExpressionVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/AllExpressionVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/AllExpressionVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/AllExpressionVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/AllSameRalationalNodesVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/AllSameRalationalNodesVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/AllSameRalationalNodesVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/AllSameRalationalNodesVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/LogicalPlanOptimizer.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/LogicalPlanPrinter.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/LogicalPlanPrinter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/LogicalPlanPrinter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/LogicalPlanPrinter.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/ProjectionPatcher.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/ProjectionPatcher.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/ProjectionPatcher.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/ProjectionPatcher.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/SchemaPatcher.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/SchemaPatcher.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/SchemaPatcher.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/SchemaPatcher.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/SchemaResetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/SchemaResetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/SchemaResetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/SchemaResetter.java
diff --git a/src/org/apache/pig/newplan/logical/optimizer/UidResetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/optimizer/UidResetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/optimizer/UidResetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/optimizer/UidResetter.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOCogroup.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOCogroup.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOCogroup.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOCogroup.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOCross.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOCross.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOCross.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOCross.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOCube.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOCube.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOCube.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOCube.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LODistinct.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LODistinct.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LODistinct.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LODistinct.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOFilter.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOFilter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOFilter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOFilter.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOForEach.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOForEach.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOForEach.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOForEach.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOGenerate.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOGenerate.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOGenerate.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOGenerate.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOInnerLoad.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOInnerLoad.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOInnerLoad.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOInnerLoad.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOJoin.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOJoin.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOJoin.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOJoin.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOLimit.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOLimit.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOLimit.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOLimit.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOLoad.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOLoad.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOLoad.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOLoad.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LONative.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LONative.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LONative.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LONative.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LORank.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LORank.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LORank.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LORank.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOSort.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOSort.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOSort.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOSort.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOSplit.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOSplit.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOSplit.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOSplit.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOSplitOutput.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOSplitOutput.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOSplitOutput.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOSplitOutput.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOStore.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOStore.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOStore.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOStore.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOStream.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOStream.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOStream.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOStream.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LOUnion.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LOUnion.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LOUnion.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LOUnion.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LogToPhyTranslationVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LogToPhyTranslationVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LogToPhyTranslationVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LogToPhyTranslationVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LogicalPlan.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalPlan.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LogicalPlan.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalPlan.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LogicalPlanData.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalPlanData.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LogicalPlanData.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalPlanData.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LogicalRelationalNodesVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalRelationalNodesVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LogicalRelationalNodesVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalRelationalNodesVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LogicalRelationalOperator.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalRelationalOperator.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LogicalRelationalOperator.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalRelationalOperator.java
diff --git a/src/org/apache/pig/newplan/logical/relational/LogicalSchema.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalSchema.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/LogicalSchema.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/LogicalSchema.java
diff --git a/src/org/apache/pig/newplan/logical/relational/MapSideMergeValidator.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/MapSideMergeValidator.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/MapSideMergeValidator.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/MapSideMergeValidator.java
diff --git a/src/org/apache/pig/newplan/logical/relational/SchemaNotDefinedException.java b/pig/src/main/java/org/apache/pig/newplan/logical/relational/SchemaNotDefinedException.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/relational/SchemaNotDefinedException.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/relational/SchemaNotDefinedException.java
diff --git a/src/org/apache/pig/newplan/logical/rules/AddForEach.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/AddForEach.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/AddForEach.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/AddForEach.java
diff --git a/src/org/apache/pig/newplan/logical/rules/ColumnMapKeyPrune.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/ColumnMapKeyPrune.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/ColumnMapKeyPrune.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/ColumnMapKeyPrune.java
diff --git a/src/org/apache/pig/newplan/logical/rules/ColumnPruneHelper.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/ColumnPruneHelper.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/ColumnPruneHelper.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/ColumnPruneHelper.java
diff --git a/src/org/apache/pig/newplan/logical/rules/ColumnPruneVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/ColumnPruneVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/ColumnPruneVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/ColumnPruneVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/rules/ConstExpEvaluator.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/ConstExpEvaluator.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/ConstExpEvaluator.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/ConstExpEvaluator.java
diff --git a/src/org/apache/pig/newplan/logical/rules/DNFExpression.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/DNFExpression.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/DNFExpression.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/DNFExpression.java
diff --git a/src/org/apache/pig/newplan/logical/rules/DNFPlan.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/DNFPlan.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/DNFPlan.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/DNFPlan.java
diff --git a/src/org/apache/pig/newplan/logical/rules/DNFPlanGenerator.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/DNFPlanGenerator.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/DNFPlanGenerator.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/DNFPlanGenerator.java
diff --git a/src/org/apache/pig/newplan/logical/rules/FilterAboveForeach.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/FilterAboveForeach.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/FilterAboveForeach.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/FilterAboveForeach.java
diff --git a/src/org/apache/pig/newplan/logical/rules/GroupByConstParallelSetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/GroupByConstParallelSetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/GroupByConstParallelSetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/GroupByConstParallelSetter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/LimitOptimizer.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/LimitOptimizer.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/LimitOptimizer.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/LimitOptimizer.java
diff --git a/src/org/apache/pig/newplan/logical/rules/LoadTypeCastInserter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/LoadTypeCastInserter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/LoadTypeCastInserter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/LoadTypeCastInserter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/LogicalExpressionProxy.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/LogicalExpressionProxy.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/LogicalExpressionProxy.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/LogicalExpressionProxy.java
diff --git a/src/org/apache/pig/newplan/logical/rules/LogicalExpressionSimplifier.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/LogicalExpressionSimplifier.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/LogicalExpressionSimplifier.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/LogicalExpressionSimplifier.java
diff --git a/src/org/apache/pig/newplan/logical/rules/LogicalRelationalNodeValidator.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/LogicalRelationalNodeValidator.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/LogicalRelationalNodeValidator.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/LogicalRelationalNodeValidator.java
diff --git a/src/org/apache/pig/newplan/logical/rules/MapKeysPruneHelper.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/MapKeysPruneHelper.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/MapKeysPruneHelper.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/MapKeysPruneHelper.java
diff --git a/src/org/apache/pig/newplan/logical/rules/MergeFilter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/MergeFilter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/MergeFilter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/MergeFilter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/MergeForEach.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/MergeForEach.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/MergeForEach.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/MergeForEach.java
diff --git a/src/org/apache/pig/newplan/logical/rules/NotConversionVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/NotConversionVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/NotConversionVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/NotConversionVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/rules/OptimizerUtils.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/OptimizerUtils.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/OptimizerUtils.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/OptimizerUtils.java
diff --git a/src/org/apache/pig/newplan/logical/rules/PartitionFilterOptimizer.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/PartitionFilterOptimizer.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/PartitionFilterOptimizer.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/PartitionFilterOptimizer.java
diff --git a/src/org/apache/pig/newplan/logical/rules/PredicatePushdownOptimizer.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/PredicatePushdownOptimizer.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/PredicatePushdownOptimizer.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/PredicatePushdownOptimizer.java
diff --git a/src/org/apache/pig/newplan/logical/rules/PushDownForEachFlatten.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/PushDownForEachFlatten.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/PushDownForEachFlatten.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/PushDownForEachFlatten.java
diff --git a/src/org/apache/pig/newplan/logical/rules/PushUpFilter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/PushUpFilter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/PushUpFilter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/PushUpFilter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/SplitFilter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/SplitFilter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/SplitFilter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/SplitFilter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/StreamTypeCastInserter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/StreamTypeCastInserter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/StreamTypeCastInserter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/StreamTypeCastInserter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/TypeCastInserter.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/TypeCastInserter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/TypeCastInserter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/TypeCastInserter.java
diff --git a/src/org/apache/pig/newplan/logical/rules/WholePlanRule.java b/pig/src/main/java/org/apache/pig/newplan/logical/rules/WholePlanRule.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/rules/WholePlanRule.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/rules/WholePlanRule.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/CastLineageSetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/CastLineageSetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/CastLineageSetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/CastLineageSetter.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ColumnAliasConversionVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ColumnAliasConversionVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ColumnAliasConversionVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ColumnAliasConversionVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/DanglingNestedNodeRemover.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/DanglingNestedNodeRemover.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/DanglingNestedNodeRemover.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/DanglingNestedNodeRemover.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/DuplicateForEachColumnRewriteVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/DuplicateForEachColumnRewriteVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/DuplicateForEachColumnRewriteVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/DuplicateForEachColumnRewriteVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ImplicitSplitInsertVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ImplicitSplitInsertVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ImplicitSplitInsertVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ImplicitSplitInsertVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/InputOutputFileValidatorVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/InputOutputFileValidatorVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/InputOutputFileValidatorVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/InputOutputFileValidatorVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/LineageFindRelVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/LineageFindRelVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/LineageFindRelVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/LineageFindRelVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ProjStarInUdfExpander.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ProjStarInUdfExpander.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ProjStarInUdfExpander.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ProjStarInUdfExpander.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ProjectStarExpander.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ProjectStarExpander.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ProjectStarExpander.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ProjectStarExpander.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ProjectStarExpanderUtil.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ProjectStarExpanderUtil.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ProjectStarExpanderUtil.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ProjectStarExpanderUtil.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ResetProjectionAttachedRelationalOpVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ResetProjectionAttachedRelationalOpVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ResetProjectionAttachedRelationalOpVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ResetProjectionAttachedRelationalOpVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ScalarVariableValidator.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ScalarVariableValidator.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ScalarVariableValidator.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ScalarVariableValidator.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/ScalarVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/ScalarVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/ScalarVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/ScalarVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/SchemaAliasVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/SchemaAliasVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/SchemaAliasVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/SchemaAliasVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/SortInfoSetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/SortInfoSetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/SortInfoSetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/SortInfoSetter.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/StoreAliasSetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/StoreAliasSetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/StoreAliasSetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/StoreAliasSetter.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/TypeCheckingExpVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/TypeCheckingExpVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/TypeCheckingExpVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/TypeCheckingExpVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/TypeCheckingRelVisitor.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/TypeCheckingRelVisitor.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/TypeCheckingRelVisitor.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/TypeCheckingRelVisitor.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/UDFFinder.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/UDFFinder.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/UDFFinder.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/UDFFinder.java
diff --git a/src/org/apache/pig/newplan/logical/visitor/UnionOnSchemaSetter.java b/pig/src/main/java/org/apache/pig/newplan/logical/visitor/UnionOnSchemaSetter.java
similarity index 100%
rename from src/org/apache/pig/newplan/logical/visitor/UnionOnSchemaSetter.java
rename to pig/src/main/java/org/apache/pig/newplan/logical/visitor/UnionOnSchemaSetter.java
diff --git a/src/org/apache/pig/newplan/optimizer/PlanOptimizer.java b/pig/src/main/java/org/apache/pig/newplan/optimizer/PlanOptimizer.java
similarity index 100%
rename from src/org/apache/pig/newplan/optimizer/PlanOptimizer.java
rename to pig/src/main/java/org/apache/pig/newplan/optimizer/PlanOptimizer.java
diff --git a/src/org/apache/pig/newplan/optimizer/PlanTransformListener.java b/pig/src/main/java/org/apache/pig/newplan/optimizer/PlanTransformListener.java
similarity index 100%
rename from src/org/apache/pig/newplan/optimizer/PlanTransformListener.java
rename to pig/src/main/java/org/apache/pig/newplan/optimizer/PlanTransformListener.java
diff --git a/src/org/apache/pig/newplan/optimizer/Rule.java b/pig/src/main/java/org/apache/pig/newplan/optimizer/Rule.java
similarity index 100%
rename from src/org/apache/pig/newplan/optimizer/Rule.java
rename to pig/src/main/java/org/apache/pig/newplan/optimizer/Rule.java
diff --git a/src/org/apache/pig/newplan/optimizer/Transformer.java b/pig/src/main/java/org/apache/pig/newplan/optimizer/Transformer.java
similarity index 100%
rename from src/org/apache/pig/newplan/optimizer/Transformer.java
rename to pig/src/main/java/org/apache/pig/newplan/optimizer/Transformer.java
diff --git a/src/org/apache/pig/package.html b/pig/src/main/java/org/apache/pig/package.html
similarity index 100%
rename from src/org/apache/pig/package.html
rename to pig/src/main/java/org/apache/pig/package.html
diff --git a/src/org/apache/pig/parser/AliasMasker.g b/pig/src/main/java/org/apache/pig/parser/AliasMasker.g
similarity index 100%
rename from src/org/apache/pig/parser/AliasMasker.g
rename to pig/src/main/java/org/apache/pig/parser/AliasMasker.g
diff --git a/src/org/apache/pig/parser/AstPrinter.g b/pig/src/main/java/org/apache/pig/parser/AstPrinter.g
similarity index 100%
rename from src/org/apache/pig/parser/AstPrinter.g
rename to pig/src/main/java/org/apache/pig/parser/AstPrinter.g
diff --git a/src/org/apache/pig/parser/AstValidator.g b/pig/src/main/java/org/apache/pig/parser/AstValidator.g
similarity index 100%
rename from src/org/apache/pig/parser/AstValidator.g
rename to pig/src/main/java/org/apache/pig/parser/AstValidator.g
diff --git a/src/org/apache/pig/parser/DryRunGruntParser.java b/pig/src/main/java/org/apache/pig/parser/DryRunGruntParser.java
similarity index 100%
rename from src/org/apache/pig/parser/DryRunGruntParser.java
rename to pig/src/main/java/org/apache/pig/parser/DryRunGruntParser.java
diff --git a/src/org/apache/pig/parser/DuplicatedSchemaAliasException.java b/pig/src/main/java/org/apache/pig/parser/DuplicatedSchemaAliasException.java
similarity index 100%
rename from src/org/apache/pig/parser/DuplicatedSchemaAliasException.java
rename to pig/src/main/java/org/apache/pig/parser/DuplicatedSchemaAliasException.java
diff --git a/src/org/apache/pig/parser/FunctionType.java b/pig/src/main/java/org/apache/pig/parser/FunctionType.java
similarity index 100%
rename from src/org/apache/pig/parser/FunctionType.java
rename to pig/src/main/java/org/apache/pig/parser/FunctionType.java
diff --git a/src/org/apache/pig/parser/InvalidCommandException.java b/pig/src/main/java/org/apache/pig/parser/InvalidCommandException.java
similarity index 100%
rename from src/org/apache/pig/parser/InvalidCommandException.java
rename to pig/src/main/java/org/apache/pig/parser/InvalidCommandException.java
diff --git a/src/org/apache/pig/parser/InvalidPathException.java b/pig/src/main/java/org/apache/pig/parser/InvalidPathException.java
similarity index 100%
rename from src/org/apache/pig/parser/InvalidPathException.java
rename to pig/src/main/java/org/apache/pig/parser/InvalidPathException.java
diff --git a/src/org/apache/pig/parser/InvalidScalarProjectionException.java b/pig/src/main/java/org/apache/pig/parser/InvalidScalarProjectionException.java
similarity index 100%
rename from src/org/apache/pig/parser/InvalidScalarProjectionException.java
rename to pig/src/main/java/org/apache/pig/parser/InvalidScalarProjectionException.java
diff --git a/src/org/apache/pig/parser/LogicalPlanBuilder.java b/pig/src/main/java/org/apache/pig/parser/LogicalPlanBuilder.java
similarity index 100%
rename from src/org/apache/pig/parser/LogicalPlanBuilder.java
rename to pig/src/main/java/org/apache/pig/parser/LogicalPlanBuilder.java
diff --git a/src/org/apache/pig/parser/LogicalPlanGenerator.g b/pig/src/main/java/org/apache/pig/parser/LogicalPlanGenerator.g
similarity index 100%
rename from src/org/apache/pig/parser/LogicalPlanGenerator.g
rename to pig/src/main/java/org/apache/pig/parser/LogicalPlanGenerator.g
diff --git a/src/org/apache/pig/parser/NonProjectExpressionException.java b/pig/src/main/java/org/apache/pig/parser/NonProjectExpressionException.java
similarity index 100%
rename from src/org/apache/pig/parser/NonProjectExpressionException.java
rename to pig/src/main/java/org/apache/pig/parser/NonProjectExpressionException.java
diff --git a/src/org/apache/pig/parser/ParserException.java b/pig/src/main/java/org/apache/pig/parser/ParserException.java
similarity index 100%
rename from src/org/apache/pig/parser/ParserException.java
rename to pig/src/main/java/org/apache/pig/parser/ParserException.java
diff --git a/src/org/apache/pig/parser/ParserValidationException.java b/pig/src/main/java/org/apache/pig/parser/ParserValidationException.java
similarity index 100%
rename from src/org/apache/pig/parser/ParserValidationException.java
rename to pig/src/main/java/org/apache/pig/parser/ParserValidationException.java
diff --git a/src/org/apache/pig/parser/PigMacro.java b/pig/src/main/java/org/apache/pig/parser/PigMacro.java
similarity index 100%
rename from src/org/apache/pig/parser/PigMacro.java
rename to pig/src/main/java/org/apache/pig/parser/PigMacro.java
diff --git a/src/org/apache/pig/parser/PigParserNode.java b/pig/src/main/java/org/apache/pig/parser/PigParserNode.java
similarity index 100%
rename from src/org/apache/pig/parser/PigParserNode.java
rename to pig/src/main/java/org/apache/pig/parser/PigParserNode.java
diff --git a/src/org/apache/pig/parser/PigParserNodeAdaptor.java b/pig/src/main/java/org/apache/pig/parser/PigParserNodeAdaptor.java
similarity index 100%
rename from src/org/apache/pig/parser/PigParserNodeAdaptor.java
rename to pig/src/main/java/org/apache/pig/parser/PigParserNodeAdaptor.java
diff --git a/src/org/apache/pig/parser/PigRecognitionException.java b/pig/src/main/java/org/apache/pig/parser/PigRecognitionException.java
similarity index 100%
rename from src/org/apache/pig/parser/PigRecognitionException.java
rename to pig/src/main/java/org/apache/pig/parser/PigRecognitionException.java
diff --git a/src/org/apache/pig/parser/PlanGenerationFailureException.java b/pig/src/main/java/org/apache/pig/parser/PlanGenerationFailureException.java
similarity index 100%
rename from src/org/apache/pig/parser/PlanGenerationFailureException.java
rename to pig/src/main/java/org/apache/pig/parser/PlanGenerationFailureException.java
diff --git a/src/org/apache/pig/parser/QueryLexer.g b/pig/src/main/java/org/apache/pig/parser/QueryLexer.g
similarity index 100%
rename from src/org/apache/pig/parser/QueryLexer.g
rename to pig/src/main/java/org/apache/pig/parser/QueryLexer.g
diff --git a/src/org/apache/pig/parser/QueryParser.g b/pig/src/main/java/org/apache/pig/parser/QueryParser.g
similarity index 100%
rename from src/org/apache/pig/parser/QueryParser.g
rename to pig/src/main/java/org/apache/pig/parser/QueryParser.g
diff --git a/src/org/apache/pig/parser/QueryParserDriver.java b/pig/src/main/java/org/apache/pig/parser/QueryParserDriver.java
similarity index 100%
rename from src/org/apache/pig/parser/QueryParserDriver.java
rename to pig/src/main/java/org/apache/pig/parser/QueryParserDriver.java
diff --git a/src/org/apache/pig/parser/QueryParserFileStream.java b/pig/src/main/java/org/apache/pig/parser/QueryParserFileStream.java
similarity index 100%
rename from src/org/apache/pig/parser/QueryParserFileStream.java
rename to pig/src/main/java/org/apache/pig/parser/QueryParserFileStream.java
diff --git a/src/org/apache/pig/parser/QueryParserStreamUtil.java b/pig/src/main/java/org/apache/pig/parser/QueryParserStreamUtil.java
similarity index 100%
rename from src/org/apache/pig/parser/QueryParserStreamUtil.java
rename to pig/src/main/java/org/apache/pig/parser/QueryParserStreamUtil.java
diff --git a/src/org/apache/pig/parser/QueryParserStringStream.java b/pig/src/main/java/org/apache/pig/parser/QueryParserStringStream.java
similarity index 100%
rename from src/org/apache/pig/parser/QueryParserStringStream.java
rename to pig/src/main/java/org/apache/pig/parser/QueryParserStringStream.java
diff --git a/src/org/apache/pig/parser/QueryParserUtils.java b/pig/src/main/java/org/apache/pig/parser/QueryParserUtils.java
similarity index 100%
rename from src/org/apache/pig/parser/QueryParserUtils.java
rename to pig/src/main/java/org/apache/pig/parser/QueryParserUtils.java
diff --git a/src/org/apache/pig/parser/SourceLocation.java b/pig/src/main/java/org/apache/pig/parser/SourceLocation.java
similarity index 100%
rename from src/org/apache/pig/parser/SourceLocation.java
rename to pig/src/main/java/org/apache/pig/parser/SourceLocation.java
diff --git a/src/org/apache/pig/parser/StreamingCommandUtils.java b/pig/src/main/java/org/apache/pig/parser/StreamingCommandUtils.java
similarity index 100%
rename from src/org/apache/pig/parser/StreamingCommandUtils.java
rename to pig/src/main/java/org/apache/pig/parser/StreamingCommandUtils.java
diff --git a/src/org/apache/pig/parser/UndefinedAliasException.java b/pig/src/main/java/org/apache/pig/parser/UndefinedAliasException.java
similarity index 100%
rename from src/org/apache/pig/parser/UndefinedAliasException.java
rename to pig/src/main/java/org/apache/pig/parser/UndefinedAliasException.java
diff --git a/src/org/apache/pig/pen/AugmentBaseDataVisitor.java b/pig/src/main/java/org/apache/pig/pen/AugmentBaseDataVisitor.java
similarity index 100%
rename from src/org/apache/pig/pen/AugmentBaseDataVisitor.java
rename to pig/src/main/java/org/apache/pig/pen/AugmentBaseDataVisitor.java
diff --git a/src/org/apache/pig/pen/EquivalenceClasses.java b/pig/src/main/java/org/apache/pig/pen/EquivalenceClasses.java
similarity index 100%
rename from src/org/apache/pig/pen/EquivalenceClasses.java
rename to pig/src/main/java/org/apache/pig/pen/EquivalenceClasses.java
diff --git a/src/org/apache/pig/pen/ExampleGenerator.java b/pig/src/main/java/org/apache/pig/pen/ExampleGenerator.java
similarity index 100%
rename from src/org/apache/pig/pen/ExampleGenerator.java
rename to pig/src/main/java/org/apache/pig/pen/ExampleGenerator.java
diff --git a/src/org/apache/pig/pen/FakeRawKeyValueIterator.java b/pig/src/main/java/org/apache/pig/pen/FakeRawKeyValueIterator.java
similarity index 100%
rename from src/org/apache/pig/pen/FakeRawKeyValueIterator.java
rename to pig/src/main/java/org/apache/pig/pen/FakeRawKeyValueIterator.java
diff --git a/src/org/apache/pig/pen/Illustrable.java b/pig/src/main/java/org/apache/pig/pen/Illustrable.java
similarity index 100%
rename from src/org/apache/pig/pen/Illustrable.java
rename to pig/src/main/java/org/apache/pig/pen/Illustrable.java
diff --git a/src/org/apache/pig/pen/Illustrator.java b/pig/src/main/java/org/apache/pig/pen/Illustrator.java
similarity index 100%
rename from src/org/apache/pig/pen/Illustrator.java
rename to pig/src/main/java/org/apache/pig/pen/Illustrator.java
diff --git a/src/org/apache/pig/pen/IllustratorAttacher.java b/pig/src/main/java/org/apache/pig/pen/IllustratorAttacher.java
similarity index 100%
rename from src/org/apache/pig/pen/IllustratorAttacher.java
rename to pig/src/main/java/org/apache/pig/pen/IllustratorAttacher.java
diff --git a/src/org/apache/pig/pen/LineageTrimmingVisitor.java b/pig/src/main/java/org/apache/pig/pen/LineageTrimmingVisitor.java
similarity index 100%
rename from src/org/apache/pig/pen/LineageTrimmingVisitor.java
rename to pig/src/main/java/org/apache/pig/pen/LineageTrimmingVisitor.java
diff --git a/src/org/apache/pig/pen/LocalMapReduceSimulator.java b/pig/src/main/java/org/apache/pig/pen/LocalMapReduceSimulator.java
similarity index 100%
rename from src/org/apache/pig/pen/LocalMapReduceSimulator.java
rename to pig/src/main/java/org/apache/pig/pen/LocalMapReduceSimulator.java
diff --git a/src/org/apache/pig/pen/POOptimizeDisabler.java b/pig/src/main/java/org/apache/pig/pen/POOptimizeDisabler.java
similarity index 100%
rename from src/org/apache/pig/pen/POOptimizeDisabler.java
rename to pig/src/main/java/org/apache/pig/pen/POOptimizeDisabler.java
diff --git a/src/org/apache/pig/pen/PhysicalPlanResetter.java b/pig/src/main/java/org/apache/pig/pen/PhysicalPlanResetter.java
similarity index 100%
rename from src/org/apache/pig/pen/PhysicalPlanResetter.java
rename to pig/src/main/java/org/apache/pig/pen/PhysicalPlanResetter.java
diff --git a/src/org/apache/pig/pen/util/DisplayExamples.java b/pig/src/main/java/org/apache/pig/pen/util/DisplayExamples.java
similarity index 100%
rename from src/org/apache/pig/pen/util/DisplayExamples.java
rename to pig/src/main/java/org/apache/pig/pen/util/DisplayExamples.java
diff --git a/src/org/apache/pig/pen/util/ExampleTuple.java b/pig/src/main/java/org/apache/pig/pen/util/ExampleTuple.java
similarity index 100%
rename from src/org/apache/pig/pen/util/ExampleTuple.java
rename to pig/src/main/java/org/apache/pig/pen/util/ExampleTuple.java
diff --git a/src/org/apache/pig/pen/util/LineageTracer.java b/pig/src/main/java/org/apache/pig/pen/util/LineageTracer.java
similarity index 100%
rename from src/org/apache/pig/pen/util/LineageTracer.java
rename to pig/src/main/java/org/apache/pig/pen/util/LineageTracer.java
diff --git a/src/org/apache/pig/pen/util/MetricEvaluation.java b/pig/src/main/java/org/apache/pig/pen/util/MetricEvaluation.java
similarity index 100%
rename from src/org/apache/pig/pen/util/MetricEvaluation.java
rename to pig/src/main/java/org/apache/pig/pen/util/MetricEvaluation.java
diff --git a/src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java b/pig/src/main/java/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java
similarity index 100%
rename from src/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java
rename to pig/src/main/java/org/apache/pig/pen/util/PreOrderDepthFirstWalker.java
diff --git a/src/org/apache/pig/scripting/BoundScript.java b/pig/src/main/java/org/apache/pig/scripting/BoundScript.java
similarity index 100%
rename from src/org/apache/pig/scripting/BoundScript.java
rename to pig/src/main/java/org/apache/pig/scripting/BoundScript.java
diff --git a/src/org/apache/pig/scripting/Pig.java b/pig/src/main/java/org/apache/pig/scripting/Pig.java
similarity index 100%
rename from src/org/apache/pig/scripting/Pig.java
rename to pig/src/main/java/org/apache/pig/scripting/Pig.java
diff --git a/src/org/apache/pig/scripting/ScriptEngine.java b/pig/src/main/java/org/apache/pig/scripting/ScriptEngine.java
similarity index 100%
rename from src/org/apache/pig/scripting/ScriptEngine.java
rename to pig/src/main/java/org/apache/pig/scripting/ScriptEngine.java
diff --git a/src/org/apache/pig/scripting/ScriptPigContext.java b/pig/src/main/java/org/apache/pig/scripting/ScriptPigContext.java
similarity index 100%
rename from src/org/apache/pig/scripting/ScriptPigContext.java
rename to pig/src/main/java/org/apache/pig/scripting/ScriptPigContext.java
diff --git a/src/org/apache/pig/scripting/ScriptingOutputCapturer.java b/pig/src/main/java/org/apache/pig/scripting/ScriptingOutputCapturer.java
similarity index 100%
rename from src/org/apache/pig/scripting/ScriptingOutputCapturer.java
rename to pig/src/main/java/org/apache/pig/scripting/ScriptingOutputCapturer.java
diff --git a/src/org/apache/pig/scripting/SyncProgressNotificationAdaptor.java b/pig/src/main/java/org/apache/pig/scripting/SyncProgressNotificationAdaptor.java
similarity index 100%
rename from src/org/apache/pig/scripting/SyncProgressNotificationAdaptor.java
rename to pig/src/main/java/org/apache/pig/scripting/SyncProgressNotificationAdaptor.java
diff --git a/src/org/apache/pig/scripting/groovy/AccumulatorAccumulate.java b/pig/src/main/java/org/apache/pig/scripting/groovy/AccumulatorAccumulate.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/AccumulatorAccumulate.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/AccumulatorAccumulate.java
diff --git a/src/org/apache/pig/scripting/groovy/AccumulatorCleanup.java b/pig/src/main/java/org/apache/pig/scripting/groovy/AccumulatorCleanup.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/AccumulatorCleanup.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/AccumulatorCleanup.java
diff --git a/src/org/apache/pig/scripting/groovy/AccumulatorGetValue.java b/pig/src/main/java/org/apache/pig/scripting/groovy/AccumulatorGetValue.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/AccumulatorGetValue.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/AccumulatorGetValue.java
diff --git a/src/org/apache/pig/scripting/groovy/AlgebraicFinal.java b/pig/src/main/java/org/apache/pig/scripting/groovy/AlgebraicFinal.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/AlgebraicFinal.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/AlgebraicFinal.java
diff --git a/src/org/apache/pig/scripting/groovy/AlgebraicInitial.java b/pig/src/main/java/org/apache/pig/scripting/groovy/AlgebraicInitial.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/AlgebraicInitial.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/AlgebraicInitial.java
diff --git a/src/org/apache/pig/scripting/groovy/AlgebraicIntermed.java b/pig/src/main/java/org/apache/pig/scripting/groovy/AlgebraicIntermed.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/AlgebraicIntermed.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/AlgebraicIntermed.java
diff --git a/src/org/apache/pig/scripting/groovy/GroovyAccumulatorEvalFunc.java b/pig/src/main/java/org/apache/pig/scripting/groovy/GroovyAccumulatorEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/GroovyAccumulatorEvalFunc.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/GroovyAccumulatorEvalFunc.java
diff --git a/src/org/apache/pig/scripting/groovy/GroovyAlgebraicEvalFunc.java b/pig/src/main/java/org/apache/pig/scripting/groovy/GroovyAlgebraicEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/GroovyAlgebraicEvalFunc.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/GroovyAlgebraicEvalFunc.java
diff --git a/src/org/apache/pig/scripting/groovy/GroovyEvalFunc.java b/pig/src/main/java/org/apache/pig/scripting/groovy/GroovyEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/GroovyEvalFunc.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/GroovyEvalFunc.java
diff --git a/src/org/apache/pig/scripting/groovy/GroovyEvalFuncObject.java b/pig/src/main/java/org/apache/pig/scripting/groovy/GroovyEvalFuncObject.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/GroovyEvalFuncObject.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/GroovyEvalFuncObject.java
diff --git a/src/org/apache/pig/scripting/groovy/GroovyScriptEngine.java b/pig/src/main/java/org/apache/pig/scripting/groovy/GroovyScriptEngine.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/GroovyScriptEngine.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/GroovyScriptEngine.java
diff --git a/src/org/apache/pig/scripting/groovy/GroovyUtils.java b/pig/src/main/java/org/apache/pig/scripting/groovy/GroovyUtils.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/GroovyUtils.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/GroovyUtils.java
diff --git a/src/org/apache/pig/scripting/groovy/OutputSchemaFunction.java b/pig/src/main/java/org/apache/pig/scripting/groovy/OutputSchemaFunction.java
similarity index 100%
rename from src/org/apache/pig/scripting/groovy/OutputSchemaFunction.java
rename to pig/src/main/java/org/apache/pig/scripting/groovy/OutputSchemaFunction.java
diff --git a/src/org/apache/pig/scripting/jruby/JrubyAccumulatorEvalFunc.java b/pig/src/main/java/org/apache/pig/scripting/jruby/JrubyAccumulatorEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/JrubyAccumulatorEvalFunc.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/JrubyAccumulatorEvalFunc.java
diff --git a/src/org/apache/pig/scripting/jruby/JrubyAlgebraicEvalFunc.java b/pig/src/main/java/org/apache/pig/scripting/jruby/JrubyAlgebraicEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/JrubyAlgebraicEvalFunc.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/JrubyAlgebraicEvalFunc.java
diff --git a/src/org/apache/pig/scripting/jruby/JrubyEvalFunc.java b/pig/src/main/java/org/apache/pig/scripting/jruby/JrubyEvalFunc.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/JrubyEvalFunc.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/JrubyEvalFunc.java
diff --git a/src/org/apache/pig/scripting/jruby/JrubyScriptEngine.java b/pig/src/main/java/org/apache/pig/scripting/jruby/JrubyScriptEngine.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/JrubyScriptEngine.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/JrubyScriptEngine.java
diff --git a/src/org/apache/pig/scripting/jruby/PigJrubyLibrary.java b/pig/src/main/java/org/apache/pig/scripting/jruby/PigJrubyLibrary.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/PigJrubyLibrary.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/PigJrubyLibrary.java
diff --git a/src/org/apache/pig/scripting/jruby/RubyDataBag.java b/pig/src/main/java/org/apache/pig/scripting/jruby/RubyDataBag.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/RubyDataBag.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/RubyDataBag.java
diff --git a/src/org/apache/pig/scripting/jruby/RubyDataByteArray.java b/pig/src/main/java/org/apache/pig/scripting/jruby/RubyDataByteArray.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/RubyDataByteArray.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/RubyDataByteArray.java
diff --git a/src/org/apache/pig/scripting/jruby/RubySchema.java b/pig/src/main/java/org/apache/pig/scripting/jruby/RubySchema.java
similarity index 100%
rename from src/org/apache/pig/scripting/jruby/RubySchema.java
rename to pig/src/main/java/org/apache/pig/scripting/jruby/RubySchema.java
diff --git a/src/org/apache/pig/scripting/js/JSPig.java b/pig/src/main/java/org/apache/pig/scripting/js/JSPig.java
similarity index 100%
rename from src/org/apache/pig/scripting/js/JSPig.java
rename to pig/src/main/java/org/apache/pig/scripting/js/JSPig.java
diff --git a/src/org/apache/pig/scripting/js/JsFunction.java b/pig/src/main/java/org/apache/pig/scripting/js/JsFunction.java
similarity index 100%
rename from src/org/apache/pig/scripting/js/JsFunction.java
rename to pig/src/main/java/org/apache/pig/scripting/js/JsFunction.java
diff --git a/src/org/apache/pig/scripting/js/JsScriptEngine.java b/pig/src/main/java/org/apache/pig/scripting/js/JsScriptEngine.java
similarity index 100%
rename from src/org/apache/pig/scripting/js/JsScriptEngine.java
rename to pig/src/main/java/org/apache/pig/scripting/js/JsScriptEngine.java
diff --git a/src/org/apache/pig/scripting/jython/JythonFunction.java b/pig/src/main/java/org/apache/pig/scripting/jython/JythonFunction.java
similarity index 100%
rename from src/org/apache/pig/scripting/jython/JythonFunction.java
rename to pig/src/main/java/org/apache/pig/scripting/jython/JythonFunction.java
diff --git a/src/org/apache/pig/scripting/jython/JythonScriptEngine.java b/pig/src/main/java/org/apache/pig/scripting/jython/JythonScriptEngine.java
similarity index 100%
rename from src/org/apache/pig/scripting/jython/JythonScriptEngine.java
rename to pig/src/main/java/org/apache/pig/scripting/jython/JythonScriptEngine.java
diff --git a/src/org/apache/pig/scripting/jython/JythonUtils.java b/pig/src/main/java/org/apache/pig/scripting/jython/JythonUtils.java
similarity index 100%
rename from src/org/apache/pig/scripting/jython/JythonUtils.java
rename to pig/src/main/java/org/apache/pig/scripting/jython/JythonUtils.java
diff --git a/src/org/apache/pig/scripting/streaming/python/PythonScriptEngine.java b/pig/src/main/java/org/apache/pig/scripting/streaming/python/PythonScriptEngine.java
similarity index 100%
rename from src/org/apache/pig/scripting/streaming/python/PythonScriptEngine.java
rename to pig/src/main/java/org/apache/pig/scripting/streaming/python/PythonScriptEngine.java
diff --git a/src/org/apache/pig/tools/ToolsPigServer.java b/pig/src/main/java/org/apache/pig/tools/ToolsPigServer.java
similarity index 100%
rename from src/org/apache/pig/tools/ToolsPigServer.java
rename to pig/src/main/java/org/apache/pig/tools/ToolsPigServer.java
diff --git a/src/org/apache/pig/tools/cmdline/CmdLineParser.java b/pig/src/main/java/org/apache/pig/tools/cmdline/CmdLineParser.java
similarity index 100%
rename from src/org/apache/pig/tools/cmdline/CmdLineParser.java
rename to pig/src/main/java/org/apache/pig/tools/cmdline/CmdLineParser.java
diff --git a/src/org/apache/pig/tools/counters/PigCounterHelper.java b/pig/src/main/java/org/apache/pig/tools/counters/PigCounterHelper.java
similarity index 100%
rename from src/org/apache/pig/tools/counters/PigCounterHelper.java
rename to pig/src/main/java/org/apache/pig/tools/counters/PigCounterHelper.java
diff --git a/src/org/apache/pig/tools/grunt/Command.java b/pig/src/main/java/org/apache/pig/tools/grunt/Command.java
similarity index 100%
rename from src/org/apache/pig/tools/grunt/Command.java
rename to pig/src/main/java/org/apache/pig/tools/grunt/Command.java
diff --git a/src/org/apache/pig/tools/grunt/Grunt.java b/pig/src/main/java/org/apache/pig/tools/grunt/Grunt.java
similarity index 100%
rename from src/org/apache/pig/tools/grunt/Grunt.java
rename to pig/src/main/java/org/apache/pig/tools/grunt/Grunt.java
diff --git a/src/org/apache/pig/tools/grunt/GruntParser.java b/pig/src/main/java/org/apache/pig/tools/grunt/GruntParser.java
similarity index 100%
rename from src/org/apache/pig/tools/grunt/GruntParser.java
rename to pig/src/main/java/org/apache/pig/tools/grunt/GruntParser.java
diff --git a/src/org/apache/pig/tools/grunt/PigCompletor.java b/pig/src/main/java/org/apache/pig/tools/grunt/PigCompletor.java
similarity index 100%
rename from src/org/apache/pig/tools/grunt/PigCompletor.java
rename to pig/src/main/java/org/apache/pig/tools/grunt/PigCompletor.java
diff --git a/src/org/apache/pig/tools/grunt/PigCompletorAliases.java b/pig/src/main/java/org/apache/pig/tools/grunt/PigCompletorAliases.java
similarity index 100%
rename from src/org/apache/pig/tools/grunt/PigCompletorAliases.java
rename to pig/src/main/java/org/apache/pig/tools/grunt/PigCompletorAliases.java
diff --git a/src/org/apache/pig/tools/grunt/autocomplete b/pig/src/main/java/org/apache/pig/tools/grunt/autocomplete
similarity index 100%
rename from src/org/apache/pig/tools/grunt/autocomplete
rename to pig/src/main/java/org/apache/pig/tools/grunt/autocomplete
diff --git a/src/org/apache/pig/tools/grunt/autocomplete_aliases b/pig/src/main/java/org/apache/pig/tools/grunt/autocomplete_aliases
similarity index 100%
rename from src/org/apache/pig/tools/grunt/autocomplete_aliases
rename to pig/src/main/java/org/apache/pig/tools/grunt/autocomplete_aliases
diff --git a/src/org/apache/pig/tools/parameters/ParamLoader.jj b/pig/src/main/java/org/apache/pig/tools/parameters/ParamLoader.jj
similarity index 100%
rename from src/org/apache/pig/tools/parameters/ParamLoader.jj
rename to pig/src/main/java/org/apache/pig/tools/parameters/ParamLoader.jj
diff --git a/src/org/apache/pig/tools/parameters/ParameterSubstitutionException.java b/pig/src/main/java/org/apache/pig/tools/parameters/ParameterSubstitutionException.java
similarity index 100%
rename from src/org/apache/pig/tools/parameters/ParameterSubstitutionException.java
rename to pig/src/main/java/org/apache/pig/tools/parameters/ParameterSubstitutionException.java
diff --git a/src/org/apache/pig/tools/parameters/ParameterSubstitutionPreprocessor.java b/pig/src/main/java/org/apache/pig/tools/parameters/ParameterSubstitutionPreprocessor.java
similarity index 100%
rename from src/org/apache/pig/tools/parameters/ParameterSubstitutionPreprocessor.java
rename to pig/src/main/java/org/apache/pig/tools/parameters/ParameterSubstitutionPreprocessor.java
diff --git a/src/org/apache/pig/tools/parameters/PigFileParser.jj b/pig/src/main/java/org/apache/pig/tools/parameters/PigFileParser.jj
similarity index 100%
rename from src/org/apache/pig/tools/parameters/PigFileParser.jj
rename to pig/src/main/java/org/apache/pig/tools/parameters/PigFileParser.jj
diff --git a/src/org/apache/pig/tools/parameters/PreprocessorContext.java b/pig/src/main/java/org/apache/pig/tools/parameters/PreprocessorContext.java
similarity index 100%
rename from src/org/apache/pig/tools/parameters/PreprocessorContext.java
rename to pig/src/main/java/org/apache/pig/tools/parameters/PreprocessorContext.java
diff --git a/src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj b/pig/src/main/java/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj
similarity index 100%
rename from src/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj
rename to pig/src/main/java/org/apache/pig/tools/pigscript/parser/PigScriptParser.jj
diff --git a/src/org/apache/pig/tools/pigstats/EmbeddedPigStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/EmbeddedPigStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/EmbeddedPigStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/EmbeddedPigStats.java
diff --git a/src/org/apache/pig/tools/pigstats/EmptyPigStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/EmptyPigStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/EmptyPigStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/EmptyPigStats.java
diff --git a/src/org/apache/pig/tools/pigstats/InputStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/InputStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/InputStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/InputStats.java
diff --git a/src/org/apache/pig/tools/pigstats/JobStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/JobStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/JobStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/JobStats.java
diff --git a/src/org/apache/pig/tools/pigstats/OutputStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/OutputStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/OutputStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/OutputStats.java
diff --git a/src/org/apache/pig/tools/pigstats/PigProgressNotificationListener.java b/pig/src/main/java/org/apache/pig/tools/pigstats/PigProgressNotificationListener.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/PigProgressNotificationListener.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/PigProgressNotificationListener.java
diff --git a/src/org/apache/pig/tools/pigstats/PigStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/PigStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/PigStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/PigStats.java
diff --git a/src/org/apache/pig/tools/pigstats/PigStatsUtil.java b/pig/src/main/java/org/apache/pig/tools/pigstats/PigStatsUtil.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/PigStatsUtil.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/PigStatsUtil.java
diff --git a/src/org/apache/pig/tools/pigstats/PigStatusReporter.java b/pig/src/main/java/org/apache/pig/tools/pigstats/PigStatusReporter.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/PigStatusReporter.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/PigStatusReporter.java
diff --git a/src/org/apache/pig/tools/pigstats/ScriptState.java b/pig/src/main/java/org/apache/pig/tools/pigstats/ScriptState.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/ScriptState.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/ScriptState.java
diff --git a/src/org/apache/pig/tools/pigstats/mapreduce/MRJobStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/MRJobStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/mapreduce/MRJobStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/MRJobStats.java
diff --git a/src/org/apache/pig/tools/pigstats/mapreduce/MRPigStatsUtil.java b/pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/MRPigStatsUtil.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/mapreduce/MRPigStatsUtil.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/MRPigStatsUtil.java
diff --git a/src/org/apache/pig/tools/pigstats/mapreduce/MRScriptState.java b/pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/MRScriptState.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/mapreduce/MRScriptState.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/MRScriptState.java
diff --git a/src/org/apache/pig/tools/pigstats/mapreduce/SimplePigStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/SimplePigStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/mapreduce/SimplePigStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/mapreduce/SimplePigStats.java
diff --git a/src/org/apache/pig/tools/pigstats/tez/TezScriptState.java b/pig/src/main/java/org/apache/pig/tools/pigstats/tez/TezScriptState.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/tez/TezScriptState.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/tez/TezScriptState.java
diff --git a/src/org/apache/pig/tools/pigstats/tez/TezStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/tez/TezStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/tez/TezStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/tez/TezStats.java
diff --git a/src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java b/pig/src/main/java/org/apache/pig/tools/pigstats/tez/TezTaskStats.java
similarity index 100%
rename from src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java
rename to pig/src/main/java/org/apache/pig/tools/pigstats/tez/TezTaskStats.java
diff --git a/src/org/apache/pig/tools/streams/StreamGenerator.java b/pig/src/main/java/org/apache/pig/tools/streams/StreamGenerator.java
similarity index 100%
rename from src/org/apache/pig/tools/streams/StreamGenerator.java
rename to pig/src/main/java/org/apache/pig/tools/streams/StreamGenerator.java
diff --git a/src/org/apache/pig/tools/timer/PerformanceTimer.java b/pig/src/main/java/org/apache/pig/tools/timer/PerformanceTimer.java
similarity index 100%
rename from src/org/apache/pig/tools/timer/PerformanceTimer.java
rename to pig/src/main/java/org/apache/pig/tools/timer/PerformanceTimer.java
diff --git a/src/org/apache/pig/tools/timer/PerformanceTimerFactory.java b/pig/src/main/java/org/apache/pig/tools/timer/PerformanceTimerFactory.java
similarity index 100%
rename from src/org/apache/pig/tools/timer/PerformanceTimerFactory.java
rename to pig/src/main/java/org/apache/pig/tools/timer/PerformanceTimerFactory.java
diff --git a/src/org/apache/pig/validator/BlackAndWhitelistFilter.java b/pig/src/main/java/org/apache/pig/validator/BlackAndWhitelistFilter.java
similarity index 100%
rename from src/org/apache/pig/validator/BlackAndWhitelistFilter.java
rename to pig/src/main/java/org/apache/pig/validator/BlackAndWhitelistFilter.java
diff --git a/src/org/apache/pig/validator/BlackAndWhitelistValidator.java b/pig/src/main/java/org/apache/pig/validator/BlackAndWhitelistValidator.java
similarity index 100%
rename from src/org/apache/pig/validator/BlackAndWhitelistValidator.java
rename to pig/src/main/java/org/apache/pig/validator/BlackAndWhitelistValidator.java
diff --git a/src/org/apache/pig/validator/PigCommandFilter.java b/pig/src/main/java/org/apache/pig/validator/PigCommandFilter.java
similarity index 100%
rename from src/org/apache/pig/validator/PigCommandFilter.java
rename to pig/src/main/java/org/apache/pig/validator/PigCommandFilter.java
diff --git a/src/overview.html b/pig/src/main/javadocs/overview.html
similarity index 100%
rename from src/overview.html
rename to pig/src/main/javadocs/overview.html
diff --git a/src/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider b/pig/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider
similarity index 100%
rename from src/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider
rename to pig/src/main/resources/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider
diff --git a/src/META-INF/services/org.apache.pig.ExecType b/pig/src/main/resources/META-INF/services/org.apache.pig.ExecType
similarity index 100%
rename from src/META-INF/services/org.apache.pig.ExecType
rename to pig/src/main/resources/META-INF/services/org.apache.pig.ExecType
diff --git a/src/pig-default.properties b/pig/src/main/resources/pig-default.properties
similarity index 100%
rename from src/pig-default.properties
rename to pig/src/main/resources/pig-default.properties
diff --git a/src/main/jruby/pigudf.rb b/pig/src/main/resources/pigudf.rb
similarity index 100%
rename from src/main/jruby/pigudf.rb
rename to pig/src/main/resources/pigudf.rb
diff --git a/src/python/streaming/controller.py b/pig/src/main/resources/python/streaming/controller.py
similarity index 100%
rename from src/python/streaming/controller.py
rename to pig/src/main/resources/python/streaming/controller.py
diff --git a/src/python/streaming/pig_util.py b/pig/src/main/resources/python/streaming/pig_util.py
similarity index 100%
rename from src/python/streaming/pig_util.py
rename to pig/src/main/resources/python/streaming/pig_util.py
diff --git a/src/packages/pig-setup-conf.sh b/pig/src/packages/pig-setup-conf.sh
similarity index 100%
rename from src/packages/pig-setup-conf.sh
rename to pig/src/packages/pig-setup-conf.sh
diff --git a/src/packages/templates/conf/pig-env.sh b/pig/src/packages/templates/conf/pig-env.sh
similarity index 100%
rename from src/packages/templates/conf/pig-env.sh
rename to pig/src/packages/templates/conf/pig-env.sh
diff --git a/src/packages/update-pig-env.sh b/pig/src/packages/update-pig-env.sh
similarity index 100%
rename from src/packages/update-pig-env.sh
rename to pig/src/packages/update-pig-env.sh
diff --git a/test/all-tests b/pig/test/all-tests
similarity index 100%
rename from test/all-tests
rename to pig/test/all-tests
diff --git a/test/bin/test-patch.sh b/pig/test/bin/test-patch.sh
similarity index 100%
rename from test/bin/test-patch.sh
rename to pig/test/bin/test-patch.sh
diff --git a/test/checkstyle-noframes-sorted.xsl b/pig/test/checkstyle-noframes-sorted.xsl
similarity index 100%
rename from test/checkstyle-noframes-sorted.xsl
rename to pig/test/checkstyle-noframes-sorted.xsl
diff --git a/test/checkstyle.xml b/pig/test/checkstyle.xml
similarity index 100%
rename from test/checkstyle.xml
rename to pig/test/checkstyle.xml
diff --git a/test/commit-tests b/pig/test/commit-tests
similarity index 100%
rename from test/commit-tests
rename to pig/test/commit-tests
diff --git a/test/data/pigunit/top_queries.pig b/pig/test/data/pigunit/top_queries.pig
similarity index 100%
rename from test/data/pigunit/top_queries.pig
rename to pig/test/data/pigunit/top_queries.pig
diff --git a/test/data/pigunit/top_queries_expected_top_3.txt b/pig/test/data/pigunit/top_queries_expected_top_3.txt
similarity index 100%
rename from test/data/pigunit/top_queries_expected_top_3.txt
rename to pig/test/data/pigunit/top_queries_expected_top_3.txt
diff --git a/test/data/pigunit/top_queries_input_data.txt b/pig/test/data/pigunit/top_queries_input_data.txt
similarity index 100%
rename from test/data/pigunit/top_queries_input_data.txt
rename to pig/test/data/pigunit/top_queries_input_data.txt
diff --git a/test/data/pigunit/top_queries_macro.pig b/pig/test/data/pigunit/top_queries_macro.pig
similarity index 100%
rename from test/data/pigunit/top_queries_macro.pig
rename to pig/test/data/pigunit/top_queries_macro.pig
diff --git a/test/data/pigunit/top_queries_params.txt b/pig/test/data/pigunit/top_queries_params.txt
similarity index 100%
rename from test/data/pigunit/top_queries_params.txt
rename to pig/test/data/pigunit/top_queries_params.txt
diff --git a/test/e2e/harness/Insert2Mysql.pm b/pig/test/e2e/harness/Insert2Mysql.pm
similarity index 100%
rename from test/e2e/harness/Insert2Mysql.pm
rename to pig/test/e2e/harness/Insert2Mysql.pm
diff --git a/test/e2e/harness/Log.pm b/pig/test/e2e/harness/Log.pm
similarity index 100%
rename from test/e2e/harness/Log.pm
rename to pig/test/e2e/harness/Log.pm
diff --git a/test/e2e/harness/Properties.pm b/pig/test/e2e/harness/Properties.pm
similarity index 100%
rename from test/e2e/harness/Properties.pm
rename to pig/test/e2e/harness/Properties.pm
diff --git a/test/e2e/harness/TestDeployer.pm b/pig/test/e2e/harness/TestDeployer.pm
similarity index 100%
rename from test/e2e/harness/TestDeployer.pm
rename to pig/test/e2e/harness/TestDeployer.pm
diff --git a/test/e2e/harness/TestDeployerFactory.pm b/pig/test/e2e/harness/TestDeployerFactory.pm
similarity index 100%
rename from test/e2e/harness/TestDeployerFactory.pm
rename to pig/test/e2e/harness/TestDeployerFactory.pm
diff --git a/test/e2e/harness/TestDeployerTest.pm b/pig/test/e2e/harness/TestDeployerTest.pm
similarity index 100%
rename from test/e2e/harness/TestDeployerTest.pm
rename to pig/test/e2e/harness/TestDeployerTest.pm
diff --git a/test/e2e/harness/TestDriver.pm b/pig/test/e2e/harness/TestDriver.pm
similarity index 100%
rename from test/e2e/harness/TestDriver.pm
rename to pig/test/e2e/harness/TestDriver.pm
diff --git a/test/e2e/harness/TestDriverFactory.pm b/pig/test/e2e/harness/TestDriverFactory.pm
similarity index 100%
rename from test/e2e/harness/TestDriverFactory.pm
rename to pig/test/e2e/harness/TestDriverFactory.pm
diff --git a/test/e2e/harness/TestDriverTest.pm b/pig/test/e2e/harness/TestDriverTest.pm
similarity index 100%
rename from test/e2e/harness/TestDriverTest.pm
rename to pig/test/e2e/harness/TestDriverTest.pm
diff --git a/test/e2e/harness/TestReport.pm b/pig/test/e2e/harness/TestReport.pm
similarity index 100%
rename from test/e2e/harness/TestReport.pm
rename to pig/test/e2e/harness/TestReport.pm
diff --git a/test/e2e/harness/build.xml b/pig/test/e2e/harness/build.xml
similarity index 100%
rename from test/e2e/harness/build.xml
rename to pig/test/e2e/harness/build.xml
diff --git a/test/e2e/harness/test/conf/default.conf b/pig/test/e2e/harness/test/conf/default.conf
similarity index 100%
rename from test/e2e/harness/test/conf/default.conf
rename to pig/test/e2e/harness/test/conf/default.conf
diff --git a/test/e2e/harness/test/tests/deploy.conf b/pig/test/e2e/harness/test/tests/deploy.conf
similarity index 100%
rename from test/e2e/harness/test/tests/deploy.conf
rename to pig/test/e2e/harness/test/tests/deploy.conf
diff --git a/test/e2e/harness/test/tests/test.conf b/pig/test/e2e/harness/test/tests/test.conf
similarity index 100%
rename from test/e2e/harness/test/tests/test.conf
rename to pig/test/e2e/harness/test/tests/test.conf
diff --git a/test/e2e/harness/test_harness.pl b/pig/test/e2e/harness/test_harness.pl
similarity index 100%
rename from test/e2e/harness/test_harness.pl
rename to pig/test/e2e/harness/test_harness.pl
diff --git a/test/e2e/pig/build.xml b/pig/test/e2e/pig/build.xml
similarity index 100%
rename from test/e2e/pig/build.xml
rename to pig/test/e2e/pig/build.xml
diff --git a/test/e2e/pig/conf/default.conf b/pig/test/e2e/pig/conf/default.conf
similarity index 100%
rename from test/e2e/pig/conf/default.conf
rename to pig/test/e2e/pig/conf/default.conf
diff --git a/test/e2e/pig/conf/existing_deployer.conf b/pig/test/e2e/pig/conf/existing_deployer.conf
similarity index 100%
rename from test/e2e/pig/conf/existing_deployer.conf
rename to pig/test/e2e/pig/conf/existing_deployer.conf
diff --git a/test/e2e/pig/conf/local.conf b/pig/test/e2e/pig/conf/local.conf
similarity index 100%
rename from test/e2e/pig/conf/local.conf
rename to pig/test/e2e/pig/conf/local.conf
diff --git a/test/e2e/pig/conf/local_deployer.conf b/pig/test/e2e/pig/conf/local_deployer.conf
similarity index 100%
rename from test/e2e/pig/conf/local_deployer.conf
rename to pig/test/e2e/pig/conf/local_deployer.conf
diff --git a/test/e2e/pig/conf/rpm.conf b/pig/test/e2e/pig/conf/rpm.conf
similarity index 100%
rename from test/e2e/pig/conf/rpm.conf
rename to pig/test/e2e/pig/conf/rpm.conf
diff --git a/test/e2e/pig/conf/testpropertiesfile.conf b/pig/test/e2e/pig/conf/testpropertiesfile.conf
similarity index 100%
rename from test/e2e/pig/conf/testpropertiesfile.conf
rename to pig/test/e2e/pig/conf/testpropertiesfile.conf
diff --git a/test/e2e/pig/conf/tez.conf b/pig/test/e2e/pig/conf/tez.conf
similarity index 100%
rename from test/e2e/pig/conf/tez.conf
rename to pig/test/e2e/pig/conf/tez.conf
diff --git a/test/e2e/pig/deployers/ExistingClusterDeployer.pm b/pig/test/e2e/pig/deployers/ExistingClusterDeployer.pm
similarity index 100%
rename from test/e2e/pig/deployers/ExistingClusterDeployer.pm
rename to pig/test/e2e/pig/deployers/ExistingClusterDeployer.pm
diff --git a/test/e2e/pig/deployers/LocalDeployer.pm b/pig/test/e2e/pig/deployers/LocalDeployer.pm
similarity index 100%
rename from test/e2e/pig/deployers/LocalDeployer.pm
rename to pig/test/e2e/pig/deployers/LocalDeployer.pm
diff --git a/test/e2e/pig/drivers/TestDriverPig.pm b/pig/test/e2e/pig/drivers/TestDriverPig.pm
similarity index 100%
rename from test/e2e/pig/drivers/TestDriverPig.pm
rename to pig/test/e2e/pig/drivers/TestDriverPig.pm
diff --git a/test/e2e/pig/drivers/TestDriverScript.pm b/pig/test/e2e/pig/drivers/TestDriverScript.pm
similarity index 100%
rename from test/e2e/pig/drivers/TestDriverScript.pm
rename to pig/test/e2e/pig/drivers/TestDriverScript.pm
diff --git a/test/e2e/pig/drivers/Util.pm b/pig/test/e2e/pig/drivers/Util.pm
similarity index 100%
rename from test/e2e/pig/drivers/Util.pm
rename to pig/test/e2e/pig/drivers/Util.pm
diff --git a/test/e2e/pig/macros/macro1.pig b/pig/test/e2e/pig/macros/macro1.pig
similarity index 100%
rename from test/e2e/pig/macros/macro1.pig
rename to pig/test/e2e/pig/macros/macro1.pig
diff --git a/test/e2e/pig/macros/macro_bad1.pig b/pig/test/e2e/pig/macros/macro_bad1.pig
similarity index 100%
rename from test/e2e/pig/macros/macro_bad1.pig
rename to pig/test/e2e/pig/macros/macro_bad1.pig
diff --git a/test/e2e/pig/paramfiles/params_3 b/pig/test/e2e/pig/paramfiles/params_3
similarity index 100%
rename from test/e2e/pig/paramfiles/params_3
rename to pig/test/e2e/pig/paramfiles/params_3
diff --git a/test/e2e/pig/resource/default.res b/pig/test/e2e/pig/resource/default.res
similarity index 100%
rename from test/e2e/pig/resource/default.res
rename to pig/test/e2e/pig/resource/default.res
diff --git a/test/e2e/pig/resource/windows.res b/pig/test/e2e/pig/resource/windows.res
similarity index 100%
rename from test/e2e/pig/resource/windows.res
rename to pig/test/e2e/pig/resource/windows.res
diff --git a/test/e2e/pig/streaming/DieRandomly.pl b/pig/test/e2e/pig/streaming/DieRandomly.pl
old mode 100755
new mode 100644
similarity index 100%
rename from test/e2e/pig/streaming/DieRandomly.pl
rename to pig/test/e2e/pig/streaming/DieRandomly.pl
diff --git a/test/e2e/pig/streaming/GroupBy.pl b/pig/test/e2e/pig/streaming/GroupBy.pl
similarity index 100%
rename from test/e2e/pig/streaming/GroupBy.pl
rename to pig/test/e2e/pig/streaming/GroupBy.pl
diff --git a/test/e2e/pig/streaming/PigStreaming.pl b/pig/test/e2e/pig/streaming/PigStreaming.pl
similarity index 100%
rename from test/e2e/pig/streaming/PigStreaming.pl
rename to pig/test/e2e/pig/streaming/PigStreaming.pl
diff --git a/test/e2e/pig/streaming/PigStreamingBad.pl b/pig/test/e2e/pig/streaming/PigStreamingBad.pl
similarity index 100%
rename from test/e2e/pig/streaming/PigStreamingBad.pl
rename to pig/test/e2e/pig/streaming/PigStreamingBad.pl
diff --git a/test/e2e/pig/streaming/PigStreamingDepend.pl b/pig/test/e2e/pig/streaming/PigStreamingDepend.pl
similarity index 100%
rename from test/e2e/pig/streaming/PigStreamingDepend.pl
rename to pig/test/e2e/pig/streaming/PigStreamingDepend.pl
diff --git a/test/e2e/pig/streaming/PigStreamingModule.pm b/pig/test/e2e/pig/streaming/PigStreamingModule.pm
similarity index 100%
rename from test/e2e/pig/streaming/PigStreamingModule.pm
rename to pig/test/e2e/pig/streaming/PigStreamingModule.pm
diff --git a/test/e2e/pig/streaming/Split.pl b/pig/test/e2e/pig/streaming/Split.pl
similarity index 100%
rename from test/e2e/pig/streaming/Split.pl
rename to pig/test/e2e/pig/streaming/Split.pl
diff --git a/test/e2e/pig/streaming/nameMap b/pig/test/e2e/pig/streaming/nameMap
similarity index 100%
rename from test/e2e/pig/streaming/nameMap
rename to pig/test/e2e/pig/streaming/nameMap
diff --git a/test/e2e/pig/tests/bigdata.conf b/pig/test/e2e/pig/tests/bigdata.conf
similarity index 100%
rename from test/e2e/pig/tests/bigdata.conf
rename to pig/test/e2e/pig/tests/bigdata.conf
diff --git a/test/e2e/pig/tests/cmdline.conf b/pig/test/e2e/pig/tests/cmdline.conf
similarity index 100%
rename from test/e2e/pig/tests/cmdline.conf
rename to pig/test/e2e/pig/tests/cmdline.conf
diff --git a/test/e2e/pig/tests/grunt.conf b/pig/test/e2e/pig/tests/grunt.conf
similarity index 100%
rename from test/e2e/pig/tests/grunt.conf
rename to pig/test/e2e/pig/tests/grunt.conf
diff --git a/test/e2e/pig/tests/hcat.conf b/pig/test/e2e/pig/tests/hcat.conf
similarity index 100%
rename from test/e2e/pig/tests/hcat.conf
rename to pig/test/e2e/pig/tests/hcat.conf
diff --git a/test/e2e/pig/tests/macro.conf b/pig/test/e2e/pig/tests/macro.conf
similarity index 100%
rename from test/e2e/pig/tests/macro.conf
rename to pig/test/e2e/pig/tests/macro.conf
diff --git a/test/e2e/pig/tests/multiquery.conf b/pig/test/e2e/pig/tests/multiquery.conf
similarity index 100%
rename from test/e2e/pig/tests/multiquery.conf
rename to pig/test/e2e/pig/tests/multiquery.conf
diff --git a/test/e2e/pig/tests/negative.conf b/pig/test/e2e/pig/tests/negative.conf
similarity index 100%
rename from test/e2e/pig/tests/negative.conf
rename to pig/test/e2e/pig/tests/negative.conf
diff --git a/test/e2e/pig/tests/nightly.conf b/pig/test/e2e/pig/tests/nightly.conf
similarity index 100%
rename from test/e2e/pig/tests/nightly.conf
rename to pig/test/e2e/pig/tests/nightly.conf
diff --git a/test/e2e/pig/tests/orc.conf b/pig/test/e2e/pig/tests/orc.conf
similarity index 100%
rename from test/e2e/pig/tests/orc.conf
rename to pig/test/e2e/pig/tests/orc.conf
diff --git a/test/e2e/pig/tests/streaming.conf b/pig/test/e2e/pig/tests/streaming.conf
similarity index 100%
rename from test/e2e/pig/tests/streaming.conf
rename to pig/test/e2e/pig/tests/streaming.conf
diff --git a/test/e2e/pig/tests/streaming_local.conf b/pig/test/e2e/pig/tests/streaming_local.conf
similarity index 100%
rename from test/e2e/pig/tests/streaming_local.conf
rename to pig/test/e2e/pig/tests/streaming_local.conf
diff --git a/test/e2e/pig/tests/turing_jython.conf b/pig/test/e2e/pig/tests/turing_jython.conf
similarity index 100%
rename from test/e2e/pig/tests/turing_jython.conf
rename to pig/test/e2e/pig/tests/turing_jython.conf
diff --git a/test/e2e/pig/tools/generate/generate_data.pl b/pig/test/e2e/pig/tools/generate/generate_data.pl
similarity index 100%
rename from test/e2e/pig/tools/generate/generate_data.pl
rename to pig/test/e2e/pig/tools/generate/generate_data.pl
diff --git a/test/e2e/pig/tools/test/explainchk.pl b/pig/test/e2e/pig/tools/test/explainchk.pl
old mode 100755
new mode 100644
similarity index 100%
rename from test/e2e/pig/tools/test/explainchk.pl
rename to pig/test/e2e/pig/tools/test/explainchk.pl
diff --git a/test/e2e/pig/tools/test/floatpostprocessor.pl b/pig/test/e2e/pig/tools/test/floatpostprocessor.pl
similarity index 100%
rename from test/e2e/pig/tools/test/floatpostprocessor.pl
rename to pig/test/e2e/pig/tools/test/floatpostprocessor.pl
diff --git a/test/e2e/pig/udfs/cpython/morepythonudfs.py b/pig/test/e2e/pig/udfs/cpython/morepythonudfs.py
similarity index 100%
rename from test/e2e/pig/udfs/cpython/morepythonudfs.py
rename to pig/test/e2e/pig/udfs/cpython/morepythonudfs.py
diff --git a/test/e2e/pig/udfs/cpython/scriptingudf.py b/pig/test/e2e/pig/udfs/cpython/scriptingudf.py
similarity index 100%
rename from test/e2e/pig/udfs/cpython/scriptingudf.py
rename to pig/test/e2e/pig/udfs/cpython/scriptingudf.py
diff --git a/test/e2e/pig/udfs/java/build.xml b/pig/test/e2e/pig/udfs/java/build.xml
similarity index 100%
rename from test/e2e/pig/udfs/java/build.xml
rename to pig/test/e2e/pig/udfs/java/build.xml
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/TestingAccumulatorHelper.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/TestingAccumulatorHelper.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/TestingAccumulatorHelper.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/TestingAccumulatorHelper.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AllFirstLetter.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AllFirstLetter.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AllFirstLetter.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AllFirstLetter.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AppendIndex.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AppendIndex.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AppendIndex.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/AppendIndex.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitored.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitored.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitored.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitored.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitoredDefault.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitoredDefault.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitoredDefault.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadMonitoredDefault.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf2.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf2.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf2.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf2.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf3.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf3.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf3.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf3.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf4.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf4.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf4.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/BadUdf4.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateMap.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateMap.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateMap.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateMap.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateTupleBag.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateTupleBag.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateTupleBag.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/CreateTupleBag.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/DECODE.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/DECODE.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/DECODE.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/DECODE.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Fred.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Fred.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Fred.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Fred.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/GoodMonitored.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/GoodMonitored.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/GoodMonitored.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/GoodMonitored.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorCount.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorCount.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorCount.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorCount.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorIsEmpty.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorIsEmpty.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorIsEmpty.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorIsEmpty.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorSum.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorSum.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorSum.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/IteratingAccumulatorSum.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Nil.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Nil.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Nil.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Nil.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/NonAlgNonAccCount.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/NonAlgNonAccCount.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/NonAlgNonAccCount.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/NonAlgNonAccCount.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Swap.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Swap.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Swap.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Swap.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG2.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG2.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG2.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOBAG2.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOMAP.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOMAP.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOMAP.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TOMAP.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestBoolean.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestBoolean.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestBoolean.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestBoolean.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestConstructorArgs.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestConstructorArgs.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestConstructorArgs.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestConstructorArgs.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestEvalFunc.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestEvalFunc.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestEvalFunc.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestEvalFunc.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestWarningFunc.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestWarningFunc.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestWarningFunc.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/TestWarningFunc.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UDFContextTestUDF.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UDFContextTestUDF.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UDFContextTestUDF.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UDFContextTestUDF.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UPPER.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UPPER.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UPPER.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UPPER.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UdfContextFrontend.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UdfContextFrontend.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UdfContextFrontend.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/UdfContextFrontend.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Udfcachetest.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Udfcachetest.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Udfcachetest.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/Udfcachetest.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/VARBAG.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/VARBAG.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/VARBAG.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/evalfunc/VARBAG.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/orderby/OrdDesc.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/orderby/OrdDesc.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/orderby/OrdDesc.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/orderby/OrdDesc.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoader.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoader.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoader.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoader.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoaderBad.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoaderBad.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoaderBad.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/DumpLoaderBad.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/SimpleCollectableLoader.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/SimpleCollectableLoader.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/SimpleCollectableLoader.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/SimpleCollectableLoader.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStore.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStore.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStore.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStore.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStoreBad.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStoreBad.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStoreBad.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/storefunc/StringStoreBad.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamer.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamer.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamer.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamer.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamerBad.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamerBad.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamerBad.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/DumpStreamerBad.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/StreamingDump.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/StreamingDump.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/StreamingDump.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/udf/streaming/StreamingDump.java
diff --git a/test/e2e/pig/udfs/java/org/apache/pig/test/utils/SimpleCustomPartitioner2.java b/pig/test/e2e/pig/udfs/java/org/apache/pig/test/utils/SimpleCustomPartitioner2.java
similarity index 100%
rename from test/e2e/pig/udfs/java/org/apache/pig/test/utils/SimpleCustomPartitioner2.java
rename to pig/test/e2e/pig/udfs/java/org/apache/pig/test/utils/SimpleCustomPartitioner2.java
diff --git a/test/e2e/pig/udfs/python/morepythonudfs.py b/pig/test/e2e/pig/udfs/python/morepythonudfs.py
similarity index 100%
rename from test/e2e/pig/udfs/python/morepythonudfs.py
rename to pig/test/e2e/pig/udfs/python/morepythonudfs.py
diff --git a/test/e2e/pig/udfs/python/scriptingudf.py b/pig/test/e2e/pig/udfs/python/scriptingudf.py
similarity index 100%
rename from test/e2e/pig/udfs/python/scriptingudf.py
rename to pig/test/e2e/pig/udfs/python/scriptingudf.py
diff --git a/test/e2e/pig/udfs/python/stringutil.py b/pig/test/e2e/pig/udfs/python/stringutil.py
similarity index 100%
rename from test/e2e/pig/udfs/python/stringutil.py
rename to pig/test/e2e/pig/udfs/python/stringutil.py
diff --git a/test/e2e/pig/udfs/ruby/morerubyudfs.rb b/pig/test/e2e/pig/udfs/ruby/morerubyudfs.rb
similarity index 100%
rename from test/e2e/pig/udfs/ruby/morerubyudfs.rb
rename to pig/test/e2e/pig/udfs/ruby/morerubyudfs.rb
diff --git a/test/e2e/pig/udfs/ruby/scriptingudfs.rb b/pig/test/e2e/pig/udfs/ruby/scriptingudfs.rb
similarity index 100%
rename from test/e2e/pig/udfs/ruby/scriptingudfs.rb
rename to pig/test/e2e/pig/udfs/ruby/scriptingudfs.rb
diff --git a/test/e2e/pig/udfs/ruby/udf2.rb b/pig/test/e2e/pig/udfs/ruby/udf2.rb
similarity index 100%
rename from test/e2e/pig/udfs/ruby/udf2.rb
rename to pig/test/e2e/pig/udfs/ruby/udf2.rb
diff --git a/test/e2e/pig/whirr/README b/pig/test/e2e/pig/whirr/README
similarity index 100%
rename from test/e2e/pig/whirr/README
rename to pig/test/e2e/pig/whirr/README
diff --git a/test/e2e/pig/whirr/pigtest.properties b/pig/test/e2e/pig/whirr/pigtest.properties
similarity index 100%
rename from test/e2e/pig/whirr/pigtest.properties
rename to pig/test/e2e/pig/whirr/pigtest.properties
diff --git a/test/e2e/pig/whirr/whirr_test_patch.sh b/pig/test/e2e/pig/whirr/whirr_test_patch.sh
old mode 100755
new mode 100644
similarity index 100%
rename from test/e2e/pig/whirr/whirr_test_patch.sh
rename to pig/test/e2e/pig/whirr/whirr_test_patch.sh
diff --git a/test/excluded-tests b/pig/test/excluded-tests
similarity index 100%
rename from test/excluded-tests
rename to pig/test/excluded-tests
diff --git a/test/excluded-tests-20 b/pig/test/excluded-tests-20
similarity index 100%
rename from test/excluded-tests-20
rename to pig/test/excluded-tests-20
diff --git a/test/findbugsExcludeFile.xml b/pig/test/findbugsExcludeFile.xml
similarity index 100%
rename from test/findbugsExcludeFile.xml
rename to pig/test/findbugsExcludeFile.xml
diff --git a/test/hbase-site.xml b/pig/test/hbase-site.xml
similarity index 100%
rename from test/hbase-site.xml
rename to pig/test/hbase-site.xml
diff --git a/test/org/apache/pig/TestAlgebraicEvalWithParameterizedReturnType.java b/pig/test/org/apache/pig/TestAlgebraicEvalWithParameterizedReturnType.java
similarity index 100%
rename from test/org/apache/pig/TestAlgebraicEvalWithParameterizedReturnType.java
rename to pig/test/org/apache/pig/TestAlgebraicEvalWithParameterizedReturnType.java
diff --git a/test/org/apache/pig/TestLoadFuncMetadataWrapper.java b/pig/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
similarity index 100%
rename from test/org/apache/pig/TestLoadFuncMetadataWrapper.java
rename to pig/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
diff --git a/test/org/apache/pig/TestLoadFuncWrapper.java b/pig/test/org/apache/pig/TestLoadFuncWrapper.java
similarity index 100%
rename from test/org/apache/pig/TestLoadFuncWrapper.java
rename to pig/test/org/apache/pig/TestLoadFuncWrapper.java
diff --git a/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java b/pig/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
similarity index 100%
rename from test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
rename to pig/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
diff --git a/test/org/apache/pig/TestMain.java b/pig/test/org/apache/pig/TestMain.java
similarity index 100%
rename from test/org/apache/pig/TestMain.java
rename to pig/test/org/apache/pig/TestMain.java
diff --git a/test/org/apache/pig/TestPrimitiveEvalFunc.java b/pig/test/org/apache/pig/TestPrimitiveEvalFunc.java
similarity index 100%
rename from test/org/apache/pig/TestPrimitiveEvalFunc.java
rename to pig/test/org/apache/pig/TestPrimitiveEvalFunc.java
diff --git a/test/org/apache/pig/TestStoreFuncMetadataWrapper.java b/pig/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
similarity index 100%
rename from test/org/apache/pig/TestStoreFuncMetadataWrapper.java
rename to pig/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
diff --git a/test/org/apache/pig/TestStoreFuncWrapper.java b/pig/test/org/apache/pig/TestStoreFuncWrapper.java
similarity index 100%
rename from test/org/apache/pig/TestStoreFuncWrapper.java
rename to pig/test/org/apache/pig/TestStoreFuncWrapper.java
diff --git a/test/org/apache/pig/TestTypedOutputEvalFunc.java b/pig/test/org/apache/pig/TestTypedOutputEvalFunc.java
similarity index 100%
rename from test/org/apache/pig/TestTypedOutputEvalFunc.java
rename to pig/test/org/apache/pig/TestTypedOutputEvalFunc.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAbstractAccumuloStorage.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAbstractAccumuloStorage.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAbstractAccumuloStorage.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAbstractAccumuloStorage.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloBinaryConverter.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloBinaryConverter.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloBinaryConverter.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloBinaryConverter.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloColumns.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloColumns.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloColumns.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloColumns.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloPigCluster.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorage.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorage.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorage.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorage.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageConfiguration.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageConfiguration.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageConfiguration.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageConfiguration.java
diff --git a/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageOptions.java b/pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageOptions.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageOptions.java
rename to pig/test/org/apache/pig/backend/hadoop/accumulo/TestAccumuloStorageOptions.java
diff --git a/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestInputSizeReducerEstimator.java b/pig/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestInputSizeReducerEstimator.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestInputSizeReducerEstimator.java
rename to pig/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestInputSizeReducerEstimator.java
diff --git a/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java b/pig/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
rename to pig/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
diff --git a/test/org/apache/pig/backend/hadoop/hbase/TestHBaseStorageFiltering.java b/pig/test/org/apache/pig/backend/hadoop/hbase/TestHBaseStorageFiltering.java
similarity index 100%
rename from test/org/apache/pig/backend/hadoop/hbase/TestHBaseStorageFiltering.java
rename to pig/test/org/apache/pig/backend/hadoop/hbase/TestHBaseStorageFiltering.java
diff --git a/test/org/apache/pig/builtin/TestAvroStorage.java b/pig/test/org/apache/pig/builtin/TestAvroStorage.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestAvroStorage.java
rename to pig/test/org/apache/pig/builtin/TestAvroStorage.java
diff --git a/test/org/apache/pig/builtin/TestBigTypeSort.java b/pig/test/org/apache/pig/builtin/TestBigTypeSort.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestBigTypeSort.java
rename to pig/test/org/apache/pig/builtin/TestBigTypeSort.java
diff --git a/test/org/apache/pig/builtin/TestCurrentTime.java b/pig/test/org/apache/pig/builtin/TestCurrentTime.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestCurrentTime.java
rename to pig/test/org/apache/pig/builtin/TestCurrentTime.java
diff --git a/test/org/apache/pig/builtin/TestFunctionWrapperEvalFunc.java b/pig/test/org/apache/pig/builtin/TestFunctionWrapperEvalFunc.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestFunctionWrapperEvalFunc.java
rename to pig/test/org/apache/pig/builtin/TestFunctionWrapperEvalFunc.java
diff --git a/test/org/apache/pig/builtin/TestInvokerGenerator.java b/pig/test/org/apache/pig/builtin/TestInvokerGenerator.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestInvokerGenerator.java
rename to pig/test/org/apache/pig/builtin/TestInvokerGenerator.java
diff --git a/test/org/apache/pig/builtin/TestOrcStorage.java b/pig/test/org/apache/pig/builtin/TestOrcStorage.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestOrcStorage.java
rename to pig/test/org/apache/pig/builtin/TestOrcStorage.java
diff --git a/test/org/apache/pig/builtin/TestOrcStoragePushdown.java b/pig/test/org/apache/pig/builtin/TestOrcStoragePushdown.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestOrcStoragePushdown.java
rename to pig/test/org/apache/pig/builtin/TestOrcStoragePushdown.java
diff --git a/test/org/apache/pig/builtin/TestPluckTuple.java b/pig/test/org/apache/pig/builtin/TestPluckTuple.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestPluckTuple.java
rename to pig/test/org/apache/pig/builtin/TestPluckTuple.java
diff --git a/test/org/apache/pig/builtin/TestSUBTRACT.java b/pig/test/org/apache/pig/builtin/TestSUBTRACT.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestSUBTRACT.java
rename to pig/test/org/apache/pig/builtin/TestSUBTRACT.java
diff --git a/test/org/apache/pig/builtin/TestTOP.java b/pig/test/org/apache/pig/builtin/TestTOP.java
similarity index 100%
rename from test/org/apache/pig/builtin/TestTOP.java
rename to pig/test/org/apache/pig/builtin/TestTOP.java
diff --git a/test/org/apache/pig/builtin/avro/code/pig/directory_test.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/directory_test.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/directory_test.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/directory_test.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/identity.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/identity.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/identity.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/identity.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/identity_ai1_ao2.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/identity_ai1_ao2.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/identity_ai1_ao2.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/identity_ai1_ao2.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/identity_ao2.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/identity_ao2.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/identity_ao2.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/identity_ao2.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/identity_blank_first_args.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/identity_blank_first_args.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/identity_blank_first_args.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/identity_blank_first_args.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/identity_codec.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/identity_codec.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/identity_codec.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/identity_codec.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/identity_just_ao2.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/identity_just_ao2.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/identity_just_ao2.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/identity_just_ao2.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/namesWithDoubleColons.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/namesWithDoubleColons.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/namesWithDoubleColons.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/namesWithDoubleColons.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/projection_test.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/projection_test.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/projection_test.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/projection_test.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/projection_test_with_schema.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/projection_test_with_schema.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/projection_test_with_schema.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/projection_test_with_schema.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/recursive_tests.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/recursive_tests.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/recursive_tests.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/recursive_tests.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/trevni_to_avro.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/trevni_to_avro.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/trevni_to_avro.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/trevni_to_avro.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/trevni_to_trevni.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/trevni_to_trevni.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/trevni_to_trevni.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/trevni_to_trevni.pig
diff --git a/test/org/apache/pig/builtin/avro/code/pig/with_dates.pig b/pig/test/org/apache/pig/builtin/avro/code/pig/with_dates.pig
similarity index 100%
rename from test/org/apache/pig/builtin/avro/code/pig/with_dates.pig
rename to pig/test/org/apache/pig/builtin/avro/code/pig/with_dates.pig
diff --git a/test/org/apache/pig/builtin/avro/data/json/arrays.json b/pig/test/org/apache/pig/builtin/avro/data/json/arrays.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/arrays.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/arrays.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/arraysAsOutputByPig.json b/pig/test/org/apache/pig/builtin/avro/data/json/arraysAsOutputByPig.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/arraysAsOutputByPig.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/arraysAsOutputByPig.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/projectionTest.json b/pig/test/org/apache/pig/builtin/avro/data/json/projectionTest.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/projectionTest.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/projectionTest.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/projectionTestWithSchema.json b/pig/test/org/apache/pig/builtin/avro/data/json/projectionTestWithSchema.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/projectionTestWithSchema.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/projectionTestWithSchema.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordWithRepeatedSubRecords.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordWithRepeatedSubRecords.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordWithRepeatedSubRecords.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordWithRepeatedSubRecords.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/records.json b/pig/test/org/apache/pig/builtin/avro/data/json/records.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/records.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/records.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPig.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPig.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPig.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPig.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPigWithDates.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPigWithDates.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPigWithDates.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsAsOutputByPigWithDates.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsOfArrays.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsOfArrays.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsOfArrays.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsOfArrays.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsOfArraysOfRecords.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsOfArraysOfRecords.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsOfArraysOfRecords.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsOfArraysOfRecords.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsSubSchema.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsSubSchema.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsSubSchema.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsSubSchema.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsSubSchemaNullable.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsSubSchemaNullable.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsSubSchemaNullable.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsSubSchemaNullable.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithDoubleUnderscores.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithDoubleUnderscores.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithDoubleUnderscores.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithDoubleUnderscores.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithEnums.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithEnums.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithEnums.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithEnums.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithFixed.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithFixed.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithFixed.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithFixed.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithMaps.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithMaps.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithMaps.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithMaps.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithMapsOfRecords.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithMapsOfRecords.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithMapsOfRecords.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithMapsOfRecords.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithNullableUnions.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithNullableUnions.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithNullableUnions.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithNullableUnions.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnion.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnion.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnion.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnion.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnionOutput.json b/pig/test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnionOutput.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnionOutput.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recordsWithSimpleUnionOutput.json
diff --git a/test/org/apache/pig/builtin/avro/data/json/recursiveRecord.json b/pig/test/org/apache/pig/builtin/avro/data/json/recursiveRecord.json
similarity index 100%
rename from test/org/apache/pig/builtin/avro/data/json/recursiveRecord.json
rename to pig/test/org/apache/pig/builtin/avro/data/json/recursiveRecord.json
diff --git a/test/org/apache/pig/builtin/avro/schema/arrays.avsc b/pig/test/org/apache/pig/builtin/avro/schema/arrays.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/arrays.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/arrays.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/arraysAsOutputByPig.avsc b/pig/test/org/apache/pig/builtin/avro/schema/arraysAsOutputByPig.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/arraysAsOutputByPig.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/arraysAsOutputByPig.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/projectionTest.avsc b/pig/test/org/apache/pig/builtin/avro/schema/projectionTest.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/projectionTest.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/projectionTest.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/projectionTestWithSchema.avsc b/pig/test/org/apache/pig/builtin/avro/schema/projectionTestWithSchema.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/projectionTestWithSchema.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/projectionTestWithSchema.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordWithRepeatedSubRecords.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordWithRepeatedSubRecords.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordWithRepeatedSubRecords.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordWithRepeatedSubRecords.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/records.avsc b/pig/test/org/apache/pig/builtin/avro/schema/records.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/records.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/records.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPig.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPig.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPig.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPig.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPigWithDates.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPigWithDates.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPigWithDates.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsAsOutputByPigWithDates.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsOfArrays.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsOfArrays.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsOfArrays.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsOfArrays.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsOfArraysOfRecords.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsOfArraysOfRecords.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsOfArraysOfRecords.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsOfArraysOfRecords.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsSubSchema.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsSubSchema.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsSubSchema.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsSubSchema.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsSubSchemaNullable.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsSubSchemaNullable.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsSubSchemaNullable.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsSubSchemaNullable.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithDoubleUnderscores.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithDoubleUnderscores.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithDoubleUnderscores.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithDoubleUnderscores.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithEnums.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithEnums.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithEnums.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithEnums.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithFixed.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithFixed.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithFixed.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithFixed.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithMaps.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithMaps.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithMaps.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithMaps.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithMapsOfRecords.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithMapsOfRecords.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithMapsOfRecords.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithMapsOfRecords.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithNullableUnions.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithNullableUnions.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithNullableUnions.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithNullableUnions.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnion.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnion.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnion.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnion.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnionOutput.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnionOutput.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnionOutput.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recordsWithSimpleUnionOutput.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/recursiveRecord.avsc b/pig/test/org/apache/pig/builtin/avro/schema/recursiveRecord.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/recursiveRecord.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/recursiveRecord.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/simpleRecordsTrevni.avsc b/pig/test/org/apache/pig/builtin/avro/schema/simpleRecordsTrevni.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/simpleRecordsTrevni.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/simpleRecordsTrevni.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/testDirectory.avsc b/pig/test/org/apache/pig/builtin/avro/schema/testDirectory.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/testDirectory.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/testDirectory.avsc
diff --git a/test/org/apache/pig/builtin/avro/schema/testDirectoryCounts.avsc b/pig/test/org/apache/pig/builtin/avro/schema/testDirectoryCounts.avsc
similarity index 100%
rename from test/org/apache/pig/builtin/avro/schema/testDirectoryCounts.avsc
rename to pig/test/org/apache/pig/builtin/avro/schema/testDirectoryCounts.avsc
diff --git a/test/org/apache/pig/builtin/mock/TestMockStorage.java b/pig/test/org/apache/pig/builtin/mock/TestMockStorage.java
similarity index 100%
rename from test/org/apache/pig/builtin/mock/TestMockStorage.java
rename to pig/test/org/apache/pig/builtin/mock/TestMockStorage.java
diff --git a/test/org/apache/pig/data/TestSchemaTuple.java b/pig/test/org/apache/pig/data/TestSchemaTuple.java
similarity index 100%
rename from test/org/apache/pig/data/TestSchemaTuple.java
rename to pig/test/org/apache/pig/data/TestSchemaTuple.java
diff --git a/test/org/apache/pig/data/utils/TestMethodHelper.java b/pig/test/org/apache/pig/data/utils/TestMethodHelper.java
similarity index 100%
rename from test/org/apache/pig/data/utils/TestMethodHelper.java
rename to pig/test/org/apache/pig/data/utils/TestMethodHelper.java
diff --git a/test/org/apache/pig/impl/builtin/TestStreamingUDF.java b/pig/test/org/apache/pig/impl/builtin/TestStreamingUDF.java
similarity index 100%
rename from test/org/apache/pig/impl/builtin/TestStreamingUDF.java
rename to pig/test/org/apache/pig/impl/builtin/TestStreamingUDF.java
diff --git a/test/org/apache/pig/impl/streaming/TestPigStreamingUDF.java b/pig/test/org/apache/pig/impl/streaming/TestPigStreamingUDF.java
similarity index 100%
rename from test/org/apache/pig/impl/streaming/TestPigStreamingUDF.java
rename to pig/test/org/apache/pig/impl/streaming/TestPigStreamingUDF.java
diff --git a/test/org/apache/pig/impl/streaming/TestStreamingUDFOutputHandler.java b/pig/test/org/apache/pig/impl/streaming/TestStreamingUDFOutputHandler.java
similarity index 100%
rename from test/org/apache/pig/impl/streaming/TestStreamingUDFOutputHandler.java
rename to pig/test/org/apache/pig/impl/streaming/TestStreamingUDFOutputHandler.java
diff --git a/test/org/apache/pig/impl/streaming/TestStreamingUtil.java b/pig/test/org/apache/pig/impl/streaming/TestStreamingUtil.java
similarity index 100%
rename from test/org/apache/pig/impl/streaming/TestStreamingUtil.java
rename to pig/test/org/apache/pig/impl/streaming/TestStreamingUtil.java
diff --git a/test/org/apache/pig/newplan/logical/optimizer/TestImplicitSplitOnTuple.java b/pig/test/org/apache/pig/newplan/logical/optimizer/TestImplicitSplitOnTuple.java
similarity index 100%
rename from test/org/apache/pig/newplan/logical/optimizer/TestImplicitSplitOnTuple.java
rename to pig/test/org/apache/pig/newplan/logical/optimizer/TestImplicitSplitOnTuple.java
diff --git a/test/org/apache/pig/newplan/logical/optimizer/TestSchemaResetter.java b/pig/test/org/apache/pig/newplan/logical/optimizer/TestSchemaResetter.java
similarity index 100%
rename from test/org/apache/pig/newplan/logical/optimizer/TestSchemaResetter.java
rename to pig/test/org/apache/pig/newplan/logical/optimizer/TestSchemaResetter.java
diff --git a/test/org/apache/pig/newplan/logical/relational/LOTestHelper.java b/pig/test/org/apache/pig/newplan/logical/relational/LOTestHelper.java
similarity index 100%
rename from test/org/apache/pig/newplan/logical/relational/LOTestHelper.java
rename to pig/test/org/apache/pig/newplan/logical/relational/LOTestHelper.java
diff --git a/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java b/pig/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
similarity index 100%
rename from test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
rename to pig/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
diff --git a/test/org/apache/pig/parser/ParserTestingUtils.java b/pig/test/org/apache/pig/parser/ParserTestingUtils.java
similarity index 100%
rename from test/org/apache/pig/parser/ParserTestingUtils.java
rename to pig/test/org/apache/pig/parser/ParserTestingUtils.java
diff --git a/test/org/apache/pig/parser/ParsingFailureException.java b/pig/test/org/apache/pig/parser/ParsingFailureException.java
similarity index 100%
rename from test/org/apache/pig/parser/ParsingFailureException.java
rename to pig/test/org/apache/pig/parser/ParsingFailureException.java
diff --git a/test/org/apache/pig/parser/TestAST.pig b/pig/test/org/apache/pig/parser/TestAST.pig
similarity index 100%
rename from test/org/apache/pig/parser/TestAST.pig
rename to pig/test/org/apache/pig/parser/TestAST.pig
diff --git a/test/org/apache/pig/parser/TestAstValidator.java b/pig/test/org/apache/pig/parser/TestAstValidator.java
similarity index 100%
rename from test/org/apache/pig/parser/TestAstValidator.java
rename to pig/test/org/apache/pig/parser/TestAstValidator.java
diff --git a/test/org/apache/pig/parser/TestColumnAliasConversion.java b/pig/test/org/apache/pig/parser/TestColumnAliasConversion.java
similarity index 100%
rename from test/org/apache/pig/parser/TestColumnAliasConversion.java
rename to pig/test/org/apache/pig/parser/TestColumnAliasConversion.java
diff --git a/test/org/apache/pig/parser/TestDefaultDataTypeInserter.pig b/pig/test/org/apache/pig/parser/TestDefaultDataTypeInserter.pig
similarity index 100%
rename from test/org/apache/pig/parser/TestDefaultDataTypeInserter.pig
rename to pig/test/org/apache/pig/parser/TestDefaultDataTypeInserter.pig
diff --git a/test/org/apache/pig/parser/TestErrorHandling.java b/pig/test/org/apache/pig/parser/TestErrorHandling.java
similarity index 100%
rename from test/org/apache/pig/parser/TestErrorHandling.java
rename to pig/test/org/apache/pig/parser/TestErrorHandling.java
diff --git a/test/org/apache/pig/parser/TestLexer.pig b/pig/test/org/apache/pig/parser/TestLexer.pig
similarity index 100%
rename from test/org/apache/pig/parser/TestLexer.pig
rename to pig/test/org/apache/pig/parser/TestLexer.pig
diff --git a/test/org/apache/pig/parser/TestLogicalPlanGenerator.java b/pig/test/org/apache/pig/parser/TestLogicalPlanGenerator.java
similarity index 100%
rename from test/org/apache/pig/parser/TestLogicalPlanGenerator.java
rename to pig/test/org/apache/pig/parser/TestLogicalPlanGenerator.java
diff --git a/test/org/apache/pig/parser/TestParser.pig b/pig/test/org/apache/pig/parser/TestParser.pig
similarity index 100%
rename from test/org/apache/pig/parser/TestParser.pig
rename to pig/test/org/apache/pig/parser/TestParser.pig
diff --git a/test/org/apache/pig/parser/TestQueryLexer.java b/pig/test/org/apache/pig/parser/TestQueryLexer.java
similarity index 100%
rename from test/org/apache/pig/parser/TestQueryLexer.java
rename to pig/test/org/apache/pig/parser/TestQueryLexer.java
diff --git a/test/org/apache/pig/parser/TestQueryParser.java b/pig/test/org/apache/pig/parser/TestQueryParser.java
similarity index 100%
rename from test/org/apache/pig/parser/TestQueryParser.java
rename to pig/test/org/apache/pig/parser/TestQueryParser.java
diff --git a/test/org/apache/pig/parser/TestQueryParserUtils.java b/pig/test/org/apache/pig/parser/TestQueryParserUtils.java
similarity index 100%
rename from test/org/apache/pig/parser/TestQueryParserUtils.java
rename to pig/test/org/apache/pig/parser/TestQueryParserUtils.java
diff --git a/test/org/apache/pig/parser/TestScalarVisitor.java b/pig/test/org/apache/pig/parser/TestScalarVisitor.java
similarity index 100%
rename from test/org/apache/pig/parser/TestScalarVisitor.java
rename to pig/test/org/apache/pig/parser/TestScalarVisitor.java
diff --git a/test/org/apache/pig/parser/TestSchemaAliasVisitor.java b/pig/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
similarity index 100%
rename from test/org/apache/pig/parser/TestSchemaAliasVisitor.java
rename to pig/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
diff --git a/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java b/pig/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
similarity index 100%
rename from test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
rename to pig/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
diff --git a/test/org/apache/pig/parser/TreePrinter.java b/pig/test/org/apache/pig/parser/TreePrinter.java
similarity index 100%
rename from test/org/apache/pig/parser/TreePrinter.java
rename to pig/test/org/apache/pig/parser/TreePrinter.java
diff --git a/test/org/apache/pig/pigunit/Cluster.java b/pig/test/org/apache/pig/pigunit/Cluster.java
similarity index 100%
rename from test/org/apache/pig/pigunit/Cluster.java
rename to pig/test/org/apache/pig/pigunit/Cluster.java
diff --git a/test/org/apache/pig/pigunit/MiniClusterRunner.java b/pig/test/org/apache/pig/pigunit/MiniClusterRunner.java
similarity index 100%
rename from test/org/apache/pig/pigunit/MiniClusterRunner.java
rename to pig/test/org/apache/pig/pigunit/MiniClusterRunner.java
diff --git a/test/org/apache/pig/pigunit/PigTest.java b/pig/test/org/apache/pig/pigunit/PigTest.java
similarity index 100%
rename from test/org/apache/pig/pigunit/PigTest.java
rename to pig/test/org/apache/pig/pigunit/PigTest.java
diff --git a/test/org/apache/pig/pigunit/pig/GruntParser.java b/pig/test/org/apache/pig/pigunit/pig/GruntParser.java
similarity index 100%
rename from test/org/apache/pig/pigunit/pig/GruntParser.java
rename to pig/test/org/apache/pig/pigunit/pig/GruntParser.java
diff --git a/test/org/apache/pig/pigunit/pig/PigServer.java b/pig/test/org/apache/pig/pigunit/pig/PigServer.java
similarity index 100%
rename from test/org/apache/pig/pigunit/pig/PigServer.java
rename to pig/test/org/apache/pig/pigunit/pig/PigServer.java
diff --git a/test/org/apache/pig/test/FakeFSInputStream.java b/pig/test/org/apache/pig/test/FakeFSInputStream.java
similarity index 100%
rename from test/org/apache/pig/test/FakeFSInputStream.java
rename to pig/test/org/apache/pig/test/FakeFSInputStream.java
diff --git a/test/org/apache/pig/test/FakeFSOutputStream.java b/pig/test/org/apache/pig/test/FakeFSOutputStream.java
similarity index 100%
rename from test/org/apache/pig/test/FakeFSOutputStream.java
rename to pig/test/org/apache/pig/test/FakeFSOutputStream.java
diff --git a/test/org/apache/pig/test/InputSchemaUDF.java b/pig/test/org/apache/pig/test/InputSchemaUDF.java
similarity index 100%
rename from test/org/apache/pig/test/InputSchemaUDF.java
rename to pig/test/org/apache/pig/test/InputSchemaUDF.java
diff --git a/test/org/apache/pig/test/MiniGenericCluster.java b/pig/test/org/apache/pig/test/MiniGenericCluster.java
similarity index 100%
rename from test/org/apache/pig/test/MiniGenericCluster.java
rename to pig/test/org/apache/pig/test/MiniGenericCluster.java
diff --git a/test/org/apache/pig/test/NonDefaultBagFactory.java b/pig/test/org/apache/pig/test/NonDefaultBagFactory.java
similarity index 100%
rename from test/org/apache/pig/test/NonDefaultBagFactory.java
rename to pig/test/org/apache/pig/test/NonDefaultBagFactory.java
diff --git a/test/org/apache/pig/test/OptimizeLimitPlanPrinter.java b/pig/test/org/apache/pig/test/OptimizeLimitPlanPrinter.java
similarity index 100%
rename from test/org/apache/pig/test/OptimizeLimitPlanPrinter.java
rename to pig/test/org/apache/pig/test/OptimizeLimitPlanPrinter.java
diff --git a/test/org/apache/pig/test/OrdAsc.java b/pig/test/org/apache/pig/test/OrdAsc.java
similarity index 100%
rename from test/org/apache/pig/test/OrdAsc.java
rename to pig/test/org/apache/pig/test/OrdAsc.java
diff --git a/test/org/apache/pig/test/OrdDesc.java b/pig/test/org/apache/pig/test/OrdDesc.java
similarity index 100%
rename from test/org/apache/pig/test/OrdDesc.java
rename to pig/test/org/apache/pig/test/OrdDesc.java
diff --git a/test/org/apache/pig/test/OrdDescNumeric.java b/pig/test/org/apache/pig/test/OrdDescNumeric.java
similarity index 100%
rename from test/org/apache/pig/test/OrdDescNumeric.java
rename to pig/test/org/apache/pig/test/OrdDescNumeric.java
diff --git a/test/org/apache/pig/test/PORead.java b/pig/test/org/apache/pig/test/PORead.java
similarity index 100%
rename from test/org/apache/pig/test/PORead.java
rename to pig/test/org/apache/pig/test/PORead.java
diff --git a/test/org/apache/pig/test/PigExecTestCase.java b/pig/test/org/apache/pig/test/PigExecTestCase.java
similarity index 100%
rename from test/org/apache/pig/test/PigExecTestCase.java
rename to pig/test/org/apache/pig/test/PigExecTestCase.java
diff --git a/test/org/apache/pig/test/PigStorageNoDefCtor.java b/pig/test/org/apache/pig/test/PigStorageNoDefCtor.java
similarity index 100%
rename from test/org/apache/pig/test/PigStorageNoDefCtor.java
rename to pig/test/org/apache/pig/test/PigStorageNoDefCtor.java
diff --git a/test/org/apache/pig/test/PigStorageWithDifferentCaster.java b/pig/test/org/apache/pig/test/PigStorageWithDifferentCaster.java
similarity index 100%
rename from test/org/apache/pig/test/PigStorageWithDifferentCaster.java
rename to pig/test/org/apache/pig/test/PigStorageWithDifferentCaster.java
diff --git a/test/org/apache/pig/test/PigStorageWithSchema.java b/pig/test/org/apache/pig/test/PigStorageWithSchema.java
similarity index 100%
rename from test/org/apache/pig/test/PigStorageWithSchema.java
rename to pig/test/org/apache/pig/test/PigStorageWithSchema.java
diff --git a/test/org/apache/pig/test/PigStorageWithStatistics.java b/pig/test/org/apache/pig/test/PigStorageWithStatistics.java
similarity index 100%
rename from test/org/apache/pig/test/PigStorageWithStatistics.java
rename to pig/test/org/apache/pig/test/PigStorageWithStatistics.java
diff --git a/test/org/apache/pig/test/PigTestLoader.java b/pig/test/org/apache/pig/test/PigTestLoader.java
similarity index 100%
rename from test/org/apache/pig/test/PigTestLoader.java
rename to pig/test/org/apache/pig/test/PigTestLoader.java
diff --git a/test/org/apache/pig/test/RegexGroupCount.java b/pig/test/org/apache/pig/test/RegexGroupCount.java
similarity index 100%
rename from test/org/apache/pig/test/RegexGroupCount.java
rename to pig/test/org/apache/pig/test/RegexGroupCount.java
diff --git a/test/org/apache/pig/test/TestAccumulator.java b/pig/test/org/apache/pig/test/TestAccumulator.java
similarity index 100%
rename from test/org/apache/pig/test/TestAccumulator.java
rename to pig/test/org/apache/pig/test/TestAccumulator.java
diff --git a/test/org/apache/pig/test/TestAdd.java b/pig/test/org/apache/pig/test/TestAdd.java
similarity index 100%
rename from test/org/apache/pig/test/TestAdd.java
rename to pig/test/org/apache/pig/test/TestAdd.java
diff --git a/test/org/apache/pig/test/TestAlgebraicEval.java b/pig/test/org/apache/pig/test/TestAlgebraicEval.java
similarity index 100%
rename from test/org/apache/pig/test/TestAlgebraicEval.java
rename to pig/test/org/apache/pig/test/TestAlgebraicEval.java
diff --git a/test/org/apache/pig/test/TestAlgebraicEvalLocal.java b/pig/test/org/apache/pig/test/TestAlgebraicEvalLocal.java
similarity index 100%
rename from test/org/apache/pig/test/TestAlgebraicEvalLocal.java
rename to pig/test/org/apache/pig/test/TestAlgebraicEvalLocal.java
diff --git a/test/org/apache/pig/test/TestAlgebraicInstantiation.java b/pig/test/org/apache/pig/test/TestAlgebraicInstantiation.java
similarity index 100%
rename from test/org/apache/pig/test/TestAlgebraicInstantiation.java
rename to pig/test/org/apache/pig/test/TestAlgebraicInstantiation.java
diff --git a/test/org/apache/pig/test/TestAssert.java b/pig/test/org/apache/pig/test/TestAssert.java
similarity index 100%
rename from test/org/apache/pig/test/TestAssert.java
rename to pig/test/org/apache/pig/test/TestAssert.java
diff --git a/test/org/apache/pig/test/TestAutoLocalMode.java b/pig/test/org/apache/pig/test/TestAutoLocalMode.java
similarity index 100%
rename from test/org/apache/pig/test/TestAutoLocalMode.java
rename to pig/test/org/apache/pig/test/TestAutoLocalMode.java
diff --git a/test/org/apache/pig/test/TestBZip.java b/pig/test/org/apache/pig/test/TestBZip.java
similarity index 100%
rename from test/org/apache/pig/test/TestBZip.java
rename to pig/test/org/apache/pig/test/TestBZip.java
diff --git a/test/org/apache/pig/test/TestBagFormat.java b/pig/test/org/apache/pig/test/TestBagFormat.java
similarity index 100%
rename from test/org/apache/pig/test/TestBagFormat.java
rename to pig/test/org/apache/pig/test/TestBagFormat.java
diff --git a/test/org/apache/pig/test/TestBatchAliases.java b/pig/test/org/apache/pig/test/TestBatchAliases.java
similarity index 100%
rename from test/org/apache/pig/test/TestBatchAliases.java
rename to pig/test/org/apache/pig/test/TestBatchAliases.java
diff --git a/test/org/apache/pig/test/TestBestFitCast.java b/pig/test/org/apache/pig/test/TestBestFitCast.java
similarity index 100%
rename from test/org/apache/pig/test/TestBestFitCast.java
rename to pig/test/org/apache/pig/test/TestBestFitCast.java
diff --git a/test/org/apache/pig/test/TestBinInterSedes.java b/pig/test/org/apache/pig/test/TestBinInterSedes.java
similarity index 100%
rename from test/org/apache/pig/test/TestBinInterSedes.java
rename to pig/test/org/apache/pig/test/TestBinInterSedes.java
diff --git a/test/org/apache/pig/test/TestBinaryExpressionOps.java b/pig/test/org/apache/pig/test/TestBinaryExpressionOps.java
similarity index 100%
rename from test/org/apache/pig/test/TestBinaryExpressionOps.java
rename to pig/test/org/apache/pig/test/TestBinaryExpressionOps.java
diff --git a/test/org/apache/pig/test/TestBlackAndWhitelistValidator.java b/pig/test/org/apache/pig/test/TestBlackAndWhitelistValidator.java
similarity index 100%
rename from test/org/apache/pig/test/TestBlackAndWhitelistValidator.java
rename to pig/test/org/apache/pig/test/TestBlackAndWhitelistValidator.java
diff --git a/test/org/apache/pig/test/TestBloom.java b/pig/test/org/apache/pig/test/TestBloom.java
similarity index 100%
rename from test/org/apache/pig/test/TestBloom.java
rename to pig/test/org/apache/pig/test/TestBloom.java
diff --git a/test/org/apache/pig/test/TestBoolean.java b/pig/test/org/apache/pig/test/TestBoolean.java
similarity index 100%
rename from test/org/apache/pig/test/TestBoolean.java
rename to pig/test/org/apache/pig/test/TestBoolean.java
diff --git a/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java b/pig/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
similarity index 100%
rename from test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
rename to pig/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
diff --git a/test/org/apache/pig/test/TestBuiltin.java b/pig/test/org/apache/pig/test/TestBuiltin.java
similarity index 100%
rename from test/org/apache/pig/test/TestBuiltin.java
rename to pig/test/org/apache/pig/test/TestBuiltin.java
diff --git a/test/org/apache/pig/test/TestBuiltinInvoker.java b/pig/test/org/apache/pig/test/TestBuiltinInvoker.java
similarity index 100%
rename from test/org/apache/pig/test/TestBuiltinInvoker.java
rename to pig/test/org/apache/pig/test/TestBuiltinInvoker.java
diff --git a/test/org/apache/pig/test/TestCase.java b/pig/test/org/apache/pig/test/TestCase.java
similarity index 100%
rename from test/org/apache/pig/test/TestCase.java
rename to pig/test/org/apache/pig/test/TestCase.java
diff --git a/test/org/apache/pig/test/TestCharArrayToNumeric.java b/pig/test/org/apache/pig/test/TestCharArrayToNumeric.java
similarity index 100%
rename from test/org/apache/pig/test/TestCharArrayToNumeric.java
rename to pig/test/org/apache/pig/test/TestCharArrayToNumeric.java
diff --git a/test/org/apache/pig/test/TestCmdLineParser.java b/pig/test/org/apache/pig/test/TestCmdLineParser.java
similarity index 100%
rename from test/org/apache/pig/test/TestCmdLineParser.java
rename to pig/test/org/apache/pig/test/TestCmdLineParser.java
diff --git a/test/org/apache/pig/test/TestCollectedGroup.java b/pig/test/org/apache/pig/test/TestCollectedGroup.java
similarity index 100%
rename from test/org/apache/pig/test/TestCollectedGroup.java
rename to pig/test/org/apache/pig/test/TestCollectedGroup.java
diff --git a/test/org/apache/pig/test/TestCombiner.java b/pig/test/org/apache/pig/test/TestCombiner.java
similarity index 100%
rename from test/org/apache/pig/test/TestCombiner.java
rename to pig/test/org/apache/pig/test/TestCombiner.java
diff --git a/test/org/apache/pig/test/TestCommit.java b/pig/test/org/apache/pig/test/TestCommit.java
similarity index 100%
rename from test/org/apache/pig/test/TestCommit.java
rename to pig/test/org/apache/pig/test/TestCommit.java
diff --git a/test/org/apache/pig/test/TestCompressedFiles.java b/pig/test/org/apache/pig/test/TestCompressedFiles.java
similarity index 100%
rename from test/org/apache/pig/test/TestCompressedFiles.java
rename to pig/test/org/apache/pig/test/TestCompressedFiles.java
diff --git a/test/org/apache/pig/test/TestConstExpr.java b/pig/test/org/apache/pig/test/TestConstExpr.java
similarity index 100%
rename from test/org/apache/pig/test/TestConstExpr.java
rename to pig/test/org/apache/pig/test/TestConstExpr.java
diff --git a/test/org/apache/pig/test/TestConversions.java b/pig/test/org/apache/pig/test/TestConversions.java
similarity index 100%
rename from test/org/apache/pig/test/TestConversions.java
rename to pig/test/org/apache/pig/test/TestConversions.java
diff --git a/test/org/apache/pig/test/TestCounters.java b/pig/test/org/apache/pig/test/TestCounters.java
similarity index 100%
rename from test/org/apache/pig/test/TestCounters.java
rename to pig/test/org/apache/pig/test/TestCounters.java
diff --git a/test/org/apache/pig/test/TestCubeDimensions.java b/pig/test/org/apache/pig/test/TestCubeDimensions.java
similarity index 100%
rename from test/org/apache/pig/test/TestCubeDimensions.java
rename to pig/test/org/apache/pig/test/TestCubeDimensions.java
diff --git a/test/org/apache/pig/test/TestCubeOperator.java b/pig/test/org/apache/pig/test/TestCubeOperator.java
similarity index 100%
rename from test/org/apache/pig/test/TestCubeOperator.java
rename to pig/test/org/apache/pig/test/TestCubeOperator.java
diff --git a/test/org/apache/pig/test/TestCustomPartitioner.java b/pig/test/org/apache/pig/test/TestCustomPartitioner.java
similarity index 100%
rename from test/org/apache/pig/test/TestCustomPartitioner.java
rename to pig/test/org/apache/pig/test/TestCustomPartitioner.java
diff --git a/test/org/apache/pig/test/TestDataBag.java b/pig/test/org/apache/pig/test/TestDataBag.java
similarity index 100%
rename from test/org/apache/pig/test/TestDataBag.java
rename to pig/test/org/apache/pig/test/TestDataBag.java
diff --git a/test/org/apache/pig/test/TestDataBagAccess.java b/pig/test/org/apache/pig/test/TestDataBagAccess.java
similarity index 100%
rename from test/org/apache/pig/test/TestDataBagAccess.java
rename to pig/test/org/apache/pig/test/TestDataBagAccess.java
diff --git a/test/org/apache/pig/test/TestDataModel.java b/pig/test/org/apache/pig/test/TestDataModel.java
similarity index 100%
rename from test/org/apache/pig/test/TestDataModel.java
rename to pig/test/org/apache/pig/test/TestDataModel.java
diff --git a/test/org/apache/pig/test/TestDefaultDateTimeZone.java b/pig/test/org/apache/pig/test/TestDefaultDateTimeZone.java
similarity index 100%
rename from test/org/apache/pig/test/TestDefaultDateTimeZone.java
rename to pig/test/org/apache/pig/test/TestDefaultDateTimeZone.java
diff --git a/test/org/apache/pig/test/TestDeleteOnFail.java b/pig/test/org/apache/pig/test/TestDeleteOnFail.java
similarity index 100%
rename from test/org/apache/pig/test/TestDeleteOnFail.java
rename to pig/test/org/apache/pig/test/TestDeleteOnFail.java
diff --git a/test/org/apache/pig/test/TestDivide.java b/pig/test/org/apache/pig/test/TestDivide.java
similarity index 100%
rename from test/org/apache/pig/test/TestDivide.java
rename to pig/test/org/apache/pig/test/TestDivide.java
diff --git a/test/org/apache/pig/test/TestEmptyInputDir.java b/pig/test/org/apache/pig/test/TestEmptyInputDir.java
similarity index 100%
rename from test/org/apache/pig/test/TestEmptyInputDir.java
rename to pig/test/org/apache/pig/test/TestEmptyInputDir.java
diff --git a/test/org/apache/pig/test/TestEqualTo.java b/pig/test/org/apache/pig/test/TestEqualTo.java
similarity index 100%
rename from test/org/apache/pig/test/TestEqualTo.java
rename to pig/test/org/apache/pig/test/TestEqualTo.java
diff --git a/test/org/apache/pig/test/TestEvalFuncOutputAnnotation.java b/pig/test/org/apache/pig/test/TestEvalFuncOutputAnnotation.java
similarity index 100%
rename from test/org/apache/pig/test/TestEvalFuncOutputAnnotation.java
rename to pig/test/org/apache/pig/test/TestEvalFuncOutputAnnotation.java
diff --git a/test/org/apache/pig/test/TestEvalPipeline.java b/pig/test/org/apache/pig/test/TestEvalPipeline.java
similarity index 100%
rename from test/org/apache/pig/test/TestEvalPipeline.java
rename to pig/test/org/apache/pig/test/TestEvalPipeline.java
diff --git a/test/org/apache/pig/test/TestEvalPipeline2.java b/pig/test/org/apache/pig/test/TestEvalPipeline2.java
similarity index 100%
rename from test/org/apache/pig/test/TestEvalPipeline2.java
rename to pig/test/org/apache/pig/test/TestEvalPipeline2.java
diff --git a/test/org/apache/pig/test/TestEvalPipelineLocal.java b/pig/test/org/apache/pig/test/TestEvalPipelineLocal.java
similarity index 100%
rename from test/org/apache/pig/test/TestEvalPipelineLocal.java
rename to pig/test/org/apache/pig/test/TestEvalPipelineLocal.java
diff --git a/test/org/apache/pig/test/TestExampleGenerator.java b/pig/test/org/apache/pig/test/TestExampleGenerator.java
similarity index 100%
rename from test/org/apache/pig/test/TestExampleGenerator.java
rename to pig/test/org/apache/pig/test/TestExampleGenerator.java
diff --git a/test/org/apache/pig/test/TestFRJoin.java b/pig/test/org/apache/pig/test/TestFRJoin.java
similarity index 100%
rename from test/org/apache/pig/test/TestFRJoin.java
rename to pig/test/org/apache/pig/test/TestFRJoin.java
diff --git a/test/org/apache/pig/test/TestFRJoin2.java b/pig/test/org/apache/pig/test/TestFRJoin2.java
similarity index 100%
rename from test/org/apache/pig/test/TestFRJoin2.java
rename to pig/test/org/apache/pig/test/TestFRJoin2.java
diff --git a/test/org/apache/pig/test/TestFRJoinNullValue.java b/pig/test/org/apache/pig/test/TestFRJoinNullValue.java
similarity index 100%
rename from test/org/apache/pig/test/TestFRJoinNullValue.java
rename to pig/test/org/apache/pig/test/TestFRJoinNullValue.java
diff --git a/test/org/apache/pig/test/TestFetch.java b/pig/test/org/apache/pig/test/TestFetch.java
similarity index 100%
rename from test/org/apache/pig/test/TestFetch.java
rename to pig/test/org/apache/pig/test/TestFetch.java
diff --git a/test/org/apache/pig/test/TestFilter.java b/pig/test/org/apache/pig/test/TestFilter.java
similarity index 100%
rename from test/org/apache/pig/test/TestFilter.java
rename to pig/test/org/apache/pig/test/TestFilter.java
diff --git a/test/org/apache/pig/test/TestFilterOpNumeric.java b/pig/test/org/apache/pig/test/TestFilterOpNumeric.java
similarity index 100%
rename from test/org/apache/pig/test/TestFilterOpNumeric.java
rename to pig/test/org/apache/pig/test/TestFilterOpNumeric.java
diff --git a/test/org/apache/pig/test/TestFilterOpString.java b/pig/test/org/apache/pig/test/TestFilterOpString.java
similarity index 100%
rename from test/org/apache/pig/test/TestFilterOpString.java
rename to pig/test/org/apache/pig/test/TestFilterOpString.java
diff --git a/test/org/apache/pig/test/TestFilterSimplification.java b/pig/test/org/apache/pig/test/TestFilterSimplification.java
similarity index 100%
rename from test/org/apache/pig/test/TestFilterSimplification.java
rename to pig/test/org/apache/pig/test/TestFilterSimplification.java
diff --git a/test/org/apache/pig/test/TestFilterUDF.java b/pig/test/org/apache/pig/test/TestFilterUDF.java
similarity index 100%
rename from test/org/apache/pig/test/TestFilterUDF.java
rename to pig/test/org/apache/pig/test/TestFilterUDF.java
diff --git a/test/org/apache/pig/test/TestFindQuantiles.java b/pig/test/org/apache/pig/test/TestFindQuantiles.java
similarity index 100%
rename from test/org/apache/pig/test/TestFindQuantiles.java
rename to pig/test/org/apache/pig/test/TestFindQuantiles.java
diff --git a/test/org/apache/pig/test/TestFinish.java b/pig/test/org/apache/pig/test/TestFinish.java
similarity index 100%
rename from test/org/apache/pig/test/TestFinish.java
rename to pig/test/org/apache/pig/test/TestFinish.java
diff --git a/test/org/apache/pig/test/TestForEach.java b/pig/test/org/apache/pig/test/TestForEach.java
similarity index 100%
rename from test/org/apache/pig/test/TestForEach.java
rename to pig/test/org/apache/pig/test/TestForEach.java
diff --git a/test/org/apache/pig/test/TestForEachNestedPlan.java b/pig/test/org/apache/pig/test/TestForEachNestedPlan.java
similarity index 100%
rename from test/org/apache/pig/test/TestForEachNestedPlan.java
rename to pig/test/org/apache/pig/test/TestForEachNestedPlan.java
diff --git a/test/org/apache/pig/test/TestForEachNestedPlanLocal.java b/pig/test/org/apache/pig/test/TestForEachNestedPlanLocal.java
similarity index 100%
rename from test/org/apache/pig/test/TestForEachNestedPlanLocal.java
rename to pig/test/org/apache/pig/test/TestForEachNestedPlanLocal.java
diff --git a/test/org/apache/pig/test/TestForEachStar.java b/pig/test/org/apache/pig/test/TestForEachStar.java
similarity index 100%
rename from test/org/apache/pig/test/TestForEachStar.java
rename to pig/test/org/apache/pig/test/TestForEachStar.java
diff --git a/test/org/apache/pig/test/TestFuncSpec.java b/pig/test/org/apache/pig/test/TestFuncSpec.java
similarity index 100%
rename from test/org/apache/pig/test/TestFuncSpec.java
rename to pig/test/org/apache/pig/test/TestFuncSpec.java
diff --git a/test/org/apache/pig/test/TestGFCross.java b/pig/test/org/apache/pig/test/TestGFCross.java
similarity index 100%
rename from test/org/apache/pig/test/TestGFCross.java
rename to pig/test/org/apache/pig/test/TestGFCross.java
diff --git a/test/org/apache/pig/test/TestGTOrEqual.java b/pig/test/org/apache/pig/test/TestGTOrEqual.java
similarity index 100%
rename from test/org/apache/pig/test/TestGTOrEqual.java
rename to pig/test/org/apache/pig/test/TestGTOrEqual.java
diff --git a/test/org/apache/pig/test/TestGreaterThan.java b/pig/test/org/apache/pig/test/TestGreaterThan.java
similarity index 100%
rename from test/org/apache/pig/test/TestGreaterThan.java
rename to pig/test/org/apache/pig/test/TestGreaterThan.java
diff --git a/test/org/apache/pig/test/TestGroupConstParallel.java b/pig/test/org/apache/pig/test/TestGroupConstParallel.java
similarity index 100%
rename from test/org/apache/pig/test/TestGroupConstParallel.java
rename to pig/test/org/apache/pig/test/TestGroupConstParallel.java
diff --git a/test/org/apache/pig/test/TestGrunt.java b/pig/test/org/apache/pig/test/TestGrunt.java
similarity index 100%
rename from test/org/apache/pig/test/TestGrunt.java
rename to pig/test/org/apache/pig/test/TestGrunt.java
diff --git a/test/org/apache/pig/test/TestHBaseStorage.java b/pig/test/org/apache/pig/test/TestHBaseStorage.java
similarity index 100%
rename from test/org/apache/pig/test/TestHBaseStorage.java
rename to pig/test/org/apache/pig/test/TestHBaseStorage.java
diff --git a/test/org/apache/pig/test/TestHBaseStorageParams.java b/pig/test/org/apache/pig/test/TestHBaseStorageParams.java
similarity index 100%
rename from test/org/apache/pig/test/TestHBaseStorageParams.java
rename to pig/test/org/apache/pig/test/TestHBaseStorageParams.java
diff --git a/test/org/apache/pig/test/TestImplicitSplit.java b/pig/test/org/apache/pig/test/TestImplicitSplit.java
similarity index 100%
rename from test/org/apache/pig/test/TestImplicitSplit.java
rename to pig/test/org/apache/pig/test/TestImplicitSplit.java
diff --git a/test/org/apache/pig/test/TestIn.java b/pig/test/org/apache/pig/test/TestIn.java
similarity index 100%
rename from test/org/apache/pig/test/TestIn.java
rename to pig/test/org/apache/pig/test/TestIn.java
diff --git a/test/org/apache/pig/test/TestInfixArithmetic.java b/pig/test/org/apache/pig/test/TestInfixArithmetic.java
similarity index 100%
rename from test/org/apache/pig/test/TestInfixArithmetic.java
rename to pig/test/org/apache/pig/test/TestInfixArithmetic.java
diff --git a/test/org/apache/pig/test/TestInputOutputFileValidator.java b/pig/test/org/apache/pig/test/TestInputOutputFileValidator.java
similarity index 100%
rename from test/org/apache/pig/test/TestInputOutputFileValidator.java
rename to pig/test/org/apache/pig/test/TestInputOutputFileValidator.java
diff --git a/test/org/apache/pig/test/TestInputOutputMiniClusterFileValidator.java b/pig/test/org/apache/pig/test/TestInputOutputMiniClusterFileValidator.java
similarity index 100%
rename from test/org/apache/pig/test/TestInputOutputMiniClusterFileValidator.java
rename to pig/test/org/apache/pig/test/TestInputOutputMiniClusterFileValidator.java
diff --git a/test/org/apache/pig/test/TestInstantiateFunc.java b/pig/test/org/apache/pig/test/TestInstantiateFunc.java
similarity index 100%
rename from test/org/apache/pig/test/TestInstantiateFunc.java
rename to pig/test/org/apache/pig/test/TestInstantiateFunc.java
diff --git a/test/org/apache/pig/test/TestInvoker.java b/pig/test/org/apache/pig/test/TestInvoker.java
similarity index 100%
rename from test/org/apache/pig/test/TestInvoker.java
rename to pig/test/org/apache/pig/test/TestInvoker.java
diff --git a/test/org/apache/pig/test/TestJobControlCompiler.java b/pig/test/org/apache/pig/test/TestJobControlCompiler.java
similarity index 100%
rename from test/org/apache/pig/test/TestJobControlCompiler.java
rename to pig/test/org/apache/pig/test/TestJobControlCompiler.java
diff --git a/test/org/apache/pig/test/TestJobSubmission.java b/pig/test/org/apache/pig/test/TestJobSubmission.java
similarity index 100%
rename from test/org/apache/pig/test/TestJobSubmission.java
rename to pig/test/org/apache/pig/test/TestJobSubmission.java
diff --git a/test/org/apache/pig/test/TestJoin.java b/pig/test/org/apache/pig/test/TestJoin.java
similarity index 100%
rename from test/org/apache/pig/test/TestJoin.java
rename to pig/test/org/apache/pig/test/TestJoin.java
diff --git a/test/org/apache/pig/test/TestJoinSmoke.java b/pig/test/org/apache/pig/test/TestJoinSmoke.java
similarity index 100%
rename from test/org/apache/pig/test/TestJoinSmoke.java
rename to pig/test/org/apache/pig/test/TestJoinSmoke.java
diff --git a/test/org/apache/pig/test/TestJsonLoaderStorage.java b/pig/test/org/apache/pig/test/TestJsonLoaderStorage.java
similarity index 100%
rename from test/org/apache/pig/test/TestJsonLoaderStorage.java
rename to pig/test/org/apache/pig/test/TestJsonLoaderStorage.java
diff --git a/test/org/apache/pig/test/TestKeyTypeDiscoveryVisitor.java b/pig/test/org/apache/pig/test/TestKeyTypeDiscoveryVisitor.java
similarity index 100%
rename from test/org/apache/pig/test/TestKeyTypeDiscoveryVisitor.java
rename to pig/test/org/apache/pig/test/TestKeyTypeDiscoveryVisitor.java
diff --git a/test/org/apache/pig/test/TestLOLoadDeterminedSchema.java b/pig/test/org/apache/pig/test/TestLOLoadDeterminedSchema.java
similarity index 100%
rename from test/org/apache/pig/test/TestLOLoadDeterminedSchema.java
rename to pig/test/org/apache/pig/test/TestLOLoadDeterminedSchema.java
diff --git a/test/org/apache/pig/test/TestLTOrEqual.java b/pig/test/org/apache/pig/test/TestLTOrEqual.java
similarity index 100%
rename from test/org/apache/pig/test/TestLTOrEqual.java
rename to pig/test/org/apache/pig/test/TestLTOrEqual.java
diff --git a/test/org/apache/pig/test/TestLargeFile.java b/pig/test/org/apache/pig/test/TestLargeFile.java
similarity index 100%
rename from test/org/apache/pig/test/TestLargeFile.java
rename to pig/test/org/apache/pig/test/TestLargeFile.java
diff --git a/test/org/apache/pig/test/TestLessThan.java b/pig/test/org/apache/pig/test/TestLessThan.java
similarity index 100%
rename from test/org/apache/pig/test/TestLessThan.java
rename to pig/test/org/apache/pig/test/TestLessThan.java
diff --git a/test/org/apache/pig/test/TestLimitAdjuster.java b/pig/test/org/apache/pig/test/TestLimitAdjuster.java
similarity index 100%
rename from test/org/apache/pig/test/TestLimitAdjuster.java
rename to pig/test/org/apache/pig/test/TestLimitAdjuster.java
diff --git a/test/org/apache/pig/test/TestLimitSchemaStore.java b/pig/test/org/apache/pig/test/TestLimitSchemaStore.java
similarity index 100%
rename from test/org/apache/pig/test/TestLimitSchemaStore.java
rename to pig/test/org/apache/pig/test/TestLimitSchemaStore.java
diff --git a/test/org/apache/pig/test/TestLimitVariable.java b/pig/test/org/apache/pig/test/TestLimitVariable.java
similarity index 100%
rename from test/org/apache/pig/test/TestLimitVariable.java
rename to pig/test/org/apache/pig/test/TestLimitVariable.java
diff --git a/test/org/apache/pig/test/TestLineageFindRelVisitor.java b/pig/test/org/apache/pig/test/TestLineageFindRelVisitor.java
similarity index 100%
rename from test/org/apache/pig/test/TestLineageFindRelVisitor.java
rename to pig/test/org/apache/pig/test/TestLineageFindRelVisitor.java
diff --git a/test/org/apache/pig/test/TestLoad.java b/pig/test/org/apache/pig/test/TestLoad.java
similarity index 100%
rename from test/org/apache/pig/test/TestLoad.java
rename to pig/test/org/apache/pig/test/TestLoad.java
diff --git a/test/org/apache/pig/test/TestLoadFunc.java b/pig/test/org/apache/pig/test/TestLoadFunc.java
similarity index 100%
rename from test/org/apache/pig/test/TestLoadFunc.java
rename to pig/test/org/apache/pig/test/TestLoadFunc.java
diff --git a/test/org/apache/pig/test/TestLocal.java b/pig/test/org/apache/pig/test/TestLocal.java
similarity index 100%
rename from test/org/apache/pig/test/TestLocal.java
rename to pig/test/org/apache/pig/test/TestLocal.java
diff --git a/test/org/apache/pig/test/TestLocal2.java b/pig/test/org/apache/pig/test/TestLocal2.java
similarity index 100%
rename from test/org/apache/pig/test/TestLocal2.java
rename to pig/test/org/apache/pig/test/TestLocal2.java
diff --git a/test/org/apache/pig/test/TestLocalRearrange.java b/pig/test/org/apache/pig/test/TestLocalRearrange.java
similarity index 100%
rename from test/org/apache/pig/test/TestLocalRearrange.java
rename to pig/test/org/apache/pig/test/TestLocalRearrange.java
diff --git a/test/org/apache/pig/test/TestLogToPhyCompiler.java b/pig/test/org/apache/pig/test/TestLogToPhyCompiler.java
similarity index 100%
rename from test/org/apache/pig/test/TestLogToPhyCompiler.java
rename to pig/test/org/apache/pig/test/TestLogToPhyCompiler.java
diff --git a/test/org/apache/pig/test/TestLogicalPlanBuilder.java b/pig/test/org/apache/pig/test/TestLogicalPlanBuilder.java
similarity index 100%
rename from test/org/apache/pig/test/TestLogicalPlanBuilder.java
rename to pig/test/org/apache/pig/test/TestLogicalPlanBuilder.java
diff --git a/test/org/apache/pig/test/TestMRCompiler.java b/pig/test/org/apache/pig/test/TestMRCompiler.java
similarity index 100%
rename from test/org/apache/pig/test/TestMRCompiler.java
rename to pig/test/org/apache/pig/test/TestMRCompiler.java
diff --git a/test/org/apache/pig/test/TestMRExecutionEngine.java b/pig/test/org/apache/pig/test/TestMRExecutionEngine.java
similarity index 100%
rename from test/org/apache/pig/test/TestMRExecutionEngine.java
rename to pig/test/org/apache/pig/test/TestMRExecutionEngine.java
diff --git a/test/org/apache/pig/test/TestMRJobStats.java b/pig/test/org/apache/pig/test/TestMRJobStats.java
similarity index 100%
rename from test/org/apache/pig/test/TestMRJobStats.java
rename to pig/test/org/apache/pig/test/TestMRJobStats.java
diff --git a/test/org/apache/pig/test/TestMacroExpansion.java b/pig/test/org/apache/pig/test/TestMacroExpansion.java
similarity index 100%
rename from test/org/apache/pig/test/TestMacroExpansion.java
rename to pig/test/org/apache/pig/test/TestMacroExpansion.java
diff --git a/test/org/apache/pig/test/TestMapProjectionDuplicate.java b/pig/test/org/apache/pig/test/TestMapProjectionDuplicate.java
similarity index 100%
rename from test/org/apache/pig/test/TestMapProjectionDuplicate.java
rename to pig/test/org/apache/pig/test/TestMapProjectionDuplicate.java
diff --git a/test/org/apache/pig/test/TestMapReduce.java b/pig/test/org/apache/pig/test/TestMapReduce.java
similarity index 100%
rename from test/org/apache/pig/test/TestMapReduce.java
rename to pig/test/org/apache/pig/test/TestMapReduce.java
diff --git a/test/org/apache/pig/test/TestMapReduce2.java b/pig/test/org/apache/pig/test/TestMapReduce2.java
similarity index 100%
rename from test/org/apache/pig/test/TestMapReduce2.java
rename to pig/test/org/apache/pig/test/TestMapReduce2.java
diff --git a/test/org/apache/pig/test/TestMapSideCogroup.java b/pig/test/org/apache/pig/test/TestMapSideCogroup.java
similarity index 95%
rename from test/org/apache/pig/test/TestMapSideCogroup.java
rename to pig/test/org/apache/pig/test/TestMapSideCogroup.java
index 060b88a..7b1a2ce 100644
--- a/test/org/apache/pig/test/TestMapSideCogroup.java
+++ b/pig/test/org/apache/pig/test/TestMapSideCogroup.java
@@ -68,7 +68,7 @@
private static final String EMPTY_FILE = "empty.txt";
private static final String DATA_WITH_NULL_KEYS = "null.txt";
- private static MiniGenericCluster cluster = MiniGenericCluster.buildCluster();
+ private static MiniCluster cluster = MiniCluster.buildCluster();
@Before
public void setUp() throws Exception {
@@ -148,7 +148,7 @@
@Test
public void testCompilation(){
try{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
String query = "A = LOAD 'data1' using "+ DummyCollectableLoader.class.getName() +"() as (id, name, grade);" +
"B = LOAD 'data2' using "+ DummyIndexableLoader.class.getName() +"() as (id, name, grade);" +
"D = LOAD 'data2' using "+ DummyIndexableLoader.class.getName() +"() as (id, name, grade);" +
@@ -218,7 +218,7 @@
@Test
public void testFailure2() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
String query = "A = LOAD 'data1' using "+ DummyCollectableLoader.class.getName() +"() as (id, name, grade);" +
"B = LOAD 'data2' using "+ DummyIndexableLoader.class.getName() +"() as (id, name, grade);" +
"D = LOAD 'data2' using "+ DummyIndexableLoader.class.getName() +"() as (id, name, grade);" +
@@ -243,7 +243,7 @@
@Test
public void testSimple() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
pigServer.registerQuery("A = LOAD '" + INPUT_FILE1 + "' using "+ DummyCollectableLoader.class.getName() +"() as (c1:chararray,c2:int);");
pigServer.registerQuery("B = LOAD '" + INPUT_FILE2 + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:int);");
@@ -273,7 +273,7 @@
@Test
public void test3Way() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
pigServer.registerQuery("A = LOAD '" + INPUT_FILE1 + "' using "+ DummyCollectableLoader.class.getName() +"() as (c1:chararray,c2:int);");
pigServer.registerQuery("B = LOAD '" + INPUT_FILE2 + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:int);");
pigServer.registerQuery("E = LOAD '" + INPUT_FILE3 + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:int);");
@@ -307,7 +307,7 @@
@Test
public void testMultiSplits() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
pigServer.registerQuery("A = LOAD '" + INPUT_FILE1 + "," + INPUT_FILE4 + "' using "+ DummyCollectableLoader.class.getName() +"() as (c1:chararray,c2:int);");
pigServer.registerQuery("B = LOAD '" + INPUT_FILE5 + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:int);");
@@ -346,7 +346,7 @@
@Test
public void testCogrpOnMultiKeys() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
pigServer.registerQuery("A = LOAD '" + INPUT_FILE1 + "' using "+ DummyCollectableLoader.class.getName() +"() as (c1:chararray,c2:chararray);");
pigServer.registerQuery("B = LOAD '" + INPUT_FILE2 + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:chararray);");
@@ -382,7 +382,7 @@
@Test
public void testEmptyDeltaFile() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
pigServer.registerQuery("A = LOAD '" + INPUT_FILE1 + "' using "+ DummyCollectableLoader.class.getName() +"() as (c1:chararray,c2:int);");
pigServer.registerQuery("B = LOAD '" + EMPTY_FILE + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:int);");
@@ -413,7 +413,7 @@
@Test
public void testDataWithNullKeys() throws Exception{
- PigServer pigServer = new PigServer(cluster.getExecType(), cluster.getProperties());
+ PigServer pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
pigServer.registerQuery("A = LOAD '" + DATA_WITH_NULL_KEYS + "' using "+ DummyCollectableLoader.class.getName() +"() as (c1:chararray,c2:int);");
pigServer.registerQuery("B = LOAD '" + DATA_WITH_NULL_KEYS + "' using "+ DummyIndexableLoader.class.getName() +"() as (c1:chararray,c2:int);");
diff --git a/test/org/apache/pig/test/TestMergeForEachOptimization.java b/pig/test/org/apache/pig/test/TestMergeForEachOptimization.java
similarity index 100%
rename from test/org/apache/pig/test/TestMergeForEachOptimization.java
rename to pig/test/org/apache/pig/test/TestMergeForEachOptimization.java
diff --git a/test/org/apache/pig/test/TestMergeJoin.java b/pig/test/org/apache/pig/test/TestMergeJoin.java
similarity index 100%
rename from test/org/apache/pig/test/TestMergeJoin.java
rename to pig/test/org/apache/pig/test/TestMergeJoin.java
diff --git a/test/org/apache/pig/test/TestMergeJoinOuter.java b/pig/test/org/apache/pig/test/TestMergeJoinOuter.java
similarity index 98%
rename from test/org/apache/pig/test/TestMergeJoinOuter.java
rename to pig/test/org/apache/pig/test/TestMergeJoinOuter.java
index 81aee55..0ab67fe 100644
--- a/test/org/apache/pig/test/TestMergeJoinOuter.java
+++ b/pig/test/org/apache/pig/test/TestMergeJoinOuter.java
@@ -60,14 +60,14 @@
private static final String INPUT_FILE1 = "testMergeJoinInput.txt";
private static final String INPUT_FILE2 = "testMergeJoinInput2.txt";
private PigServer pigServer;
- private static MiniGenericCluster cluster = MiniGenericCluster.buildCluster();
+ private static MiniCluster cluster = MiniCluster.buildCluster();
public TestMergeJoinOuter() throws ExecException{
Properties props = cluster.getProperties();
props.setProperty(MRConfiguration.MAP_MAX_ATTEMPTS, "1");
props.setProperty(MRConfiguration.REDUCE_MAX_ATTEMPTS, "1");
- pigServer = new PigServer(cluster.getExecType(), props);
+ pigServer = new PigServer(ExecType.MAPREDUCE, props);
}
@Before
diff --git a/test/org/apache/pig/test/TestMod.java b/pig/test/org/apache/pig/test/TestMod.java
similarity index 100%
rename from test/org/apache/pig/test/TestMod.java
rename to pig/test/org/apache/pig/test/TestMod.java
diff --git a/test/org/apache/pig/test/TestMonitoredUDF.java b/pig/test/org/apache/pig/test/TestMonitoredUDF.java
similarity index 100%
rename from test/org/apache/pig/test/TestMonitoredUDF.java
rename to pig/test/org/apache/pig/test/TestMonitoredUDF.java
diff --git a/test/org/apache/pig/test/TestMultiQuery.java b/pig/test/org/apache/pig/test/TestMultiQuery.java
similarity index 100%
rename from test/org/apache/pig/test/TestMultiQuery.java
rename to pig/test/org/apache/pig/test/TestMultiQuery.java
diff --git a/test/org/apache/pig/test/TestMultiQueryBasic.java b/pig/test/org/apache/pig/test/TestMultiQueryBasic.java
similarity index 100%
rename from test/org/apache/pig/test/TestMultiQueryBasic.java
rename to pig/test/org/apache/pig/test/TestMultiQueryBasic.java
diff --git a/test/org/apache/pig/test/TestMultiQueryCompiler.java b/pig/test/org/apache/pig/test/TestMultiQueryCompiler.java
similarity index 100%
rename from test/org/apache/pig/test/TestMultiQueryCompiler.java
rename to pig/test/org/apache/pig/test/TestMultiQueryCompiler.java
diff --git a/test/org/apache/pig/test/TestMultiQueryLocal.java b/pig/test/org/apache/pig/test/TestMultiQueryLocal.java
similarity index 100%
rename from test/org/apache/pig/test/TestMultiQueryLocal.java
rename to pig/test/org/apache/pig/test/TestMultiQueryLocal.java
diff --git a/test/org/apache/pig/test/TestMultiply.java b/pig/test/org/apache/pig/test/TestMultiply.java
similarity index 100%
rename from test/org/apache/pig/test/TestMultiply.java
rename to pig/test/org/apache/pig/test/TestMultiply.java
diff --git a/test/org/apache/pig/test/TestNativeMapReduce.java b/pig/test/org/apache/pig/test/TestNativeMapReduce.java
similarity index 100%
rename from test/org/apache/pig/test/TestNativeMapReduce.java
rename to pig/test/org/apache/pig/test/TestNativeMapReduce.java
diff --git a/test/org/apache/pig/test/TestNestedForeach.java b/pig/test/org/apache/pig/test/TestNestedForeach.java
similarity index 100%
rename from test/org/apache/pig/test/TestNestedForeach.java
rename to pig/test/org/apache/pig/test/TestNestedForeach.java
diff --git a/test/org/apache/pig/test/TestNewPartitionFilterPushDown.java b/pig/test/org/apache/pig/test/TestNewPartitionFilterPushDown.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPartitionFilterPushDown.java
rename to pig/test/org/apache/pig/test/TestNewPartitionFilterPushDown.java
diff --git a/test/org/apache/pig/test/TestNewPlanColumnPrune.java b/pig/test/org/apache/pig/test/TestNewPlanColumnPrune.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanColumnPrune.java
rename to pig/test/org/apache/pig/test/TestNewPlanColumnPrune.java
diff --git a/test/org/apache/pig/test/TestNewPlanFilterAboveForeach.java b/pig/test/org/apache/pig/test/TestNewPlanFilterAboveForeach.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanFilterAboveForeach.java
rename to pig/test/org/apache/pig/test/TestNewPlanFilterAboveForeach.java
diff --git a/test/org/apache/pig/test/TestNewPlanFilterRule.java b/pig/test/org/apache/pig/test/TestNewPlanFilterRule.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanFilterRule.java
rename to pig/test/org/apache/pig/test/TestNewPlanFilterRule.java
diff --git a/test/org/apache/pig/test/TestNewPlanImplicitSplit.java b/pig/test/org/apache/pig/test/TestNewPlanImplicitSplit.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanImplicitSplit.java
rename to pig/test/org/apache/pig/test/TestNewPlanImplicitSplit.java
diff --git a/test/org/apache/pig/test/TestNewPlanListener.java b/pig/test/org/apache/pig/test/TestNewPlanListener.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanListener.java
rename to pig/test/org/apache/pig/test/TestNewPlanListener.java
diff --git a/test/org/apache/pig/test/TestNewPlanLogToPhyTranslationVisitor.java b/pig/test/org/apache/pig/test/TestNewPlanLogToPhyTranslationVisitor.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanLogToPhyTranslationVisitor.java
rename to pig/test/org/apache/pig/test/TestNewPlanLogToPhyTranslationVisitor.java
diff --git a/test/org/apache/pig/test/TestNewPlanLogicalOptimizer.java b/pig/test/org/apache/pig/test/TestNewPlanLogicalOptimizer.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanLogicalOptimizer.java
rename to pig/test/org/apache/pig/test/TestNewPlanLogicalOptimizer.java
diff --git a/test/org/apache/pig/test/TestNewPlanOperatorPlan.java b/pig/test/org/apache/pig/test/TestNewPlanOperatorPlan.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanOperatorPlan.java
rename to pig/test/org/apache/pig/test/TestNewPlanOperatorPlan.java
diff --git a/test/org/apache/pig/test/TestNewPlanPruneMapKeys.java b/pig/test/org/apache/pig/test/TestNewPlanPruneMapKeys.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanPruneMapKeys.java
rename to pig/test/org/apache/pig/test/TestNewPlanPruneMapKeys.java
diff --git a/test/org/apache/pig/test/TestNewPlanPushDownForeachFlatten.java b/pig/test/org/apache/pig/test/TestNewPlanPushDownForeachFlatten.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanPushDownForeachFlatten.java
rename to pig/test/org/apache/pig/test/TestNewPlanPushDownForeachFlatten.java
diff --git a/test/org/apache/pig/test/TestNewPlanPushUpFilter.java b/pig/test/org/apache/pig/test/TestNewPlanPushUpFilter.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanPushUpFilter.java
rename to pig/test/org/apache/pig/test/TestNewPlanPushUpFilter.java
diff --git a/test/org/apache/pig/test/TestNewPlanRule.java b/pig/test/org/apache/pig/test/TestNewPlanRule.java
similarity index 100%
rename from test/org/apache/pig/test/TestNewPlanRule.java
rename to pig/test/org/apache/pig/test/TestNewPlanRule.java
diff --git a/test/org/apache/pig/test/TestNotEqualTo.java b/pig/test/org/apache/pig/test/TestNotEqualTo.java
similarity index 100%
rename from test/org/apache/pig/test/TestNotEqualTo.java
rename to pig/test/org/apache/pig/test/TestNotEqualTo.java
diff --git a/test/org/apache/pig/test/TestNull.java b/pig/test/org/apache/pig/test/TestNull.java
similarity index 100%
rename from test/org/apache/pig/test/TestNull.java
rename to pig/test/org/apache/pig/test/TestNull.java
diff --git a/test/org/apache/pig/test/TestNullConstant.java b/pig/test/org/apache/pig/test/TestNullConstant.java
similarity index 100%
rename from test/org/apache/pig/test/TestNullConstant.java
rename to pig/test/org/apache/pig/test/TestNullConstant.java
diff --git a/test/org/apache/pig/test/TestNumberOfReducers.java b/pig/test/org/apache/pig/test/TestNumberOfReducers.java
similarity index 100%
rename from test/org/apache/pig/test/TestNumberOfReducers.java
rename to pig/test/org/apache/pig/test/TestNumberOfReducers.java
diff --git a/test/org/apache/pig/test/TestOptimizeLimit.java b/pig/test/org/apache/pig/test/TestOptimizeLimit.java
similarity index 100%
rename from test/org/apache/pig/test/TestOptimizeLimit.java
rename to pig/test/org/apache/pig/test/TestOptimizeLimit.java
diff --git a/test/org/apache/pig/test/TestOrderBy.java b/pig/test/org/apache/pig/test/TestOrderBy.java
similarity index 100%
rename from test/org/apache/pig/test/TestOrderBy.java
rename to pig/test/org/apache/pig/test/TestOrderBy.java
diff --git a/test/org/apache/pig/test/TestOrderBy2.java b/pig/test/org/apache/pig/test/TestOrderBy2.java
similarity index 100%
rename from test/org/apache/pig/test/TestOrderBy2.java
rename to pig/test/org/apache/pig/test/TestOrderBy2.java
diff --git a/test/org/apache/pig/test/TestOrderBy3.java b/pig/test/org/apache/pig/test/TestOrderBy3.java
similarity index 100%
rename from test/org/apache/pig/test/TestOrderBy3.java
rename to pig/test/org/apache/pig/test/TestOrderBy3.java
diff --git a/test/org/apache/pig/test/TestPOBinCond.java b/pig/test/org/apache/pig/test/TestPOBinCond.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOBinCond.java
rename to pig/test/org/apache/pig/test/TestPOBinCond.java
diff --git a/test/org/apache/pig/test/TestPOCast.java b/pig/test/org/apache/pig/test/TestPOCast.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOCast.java
rename to pig/test/org/apache/pig/test/TestPOCast.java
diff --git a/test/org/apache/pig/test/TestPODistinct.java b/pig/test/org/apache/pig/test/TestPODistinct.java
similarity index 100%
rename from test/org/apache/pig/test/TestPODistinct.java
rename to pig/test/org/apache/pig/test/TestPODistinct.java
diff --git a/test/org/apache/pig/test/TestPOGenerate.java b/pig/test/org/apache/pig/test/TestPOGenerate.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOGenerate.java
rename to pig/test/org/apache/pig/test/TestPOGenerate.java
diff --git a/test/org/apache/pig/test/TestPOMapLookUp.java b/pig/test/org/apache/pig/test/TestPOMapLookUp.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOMapLookUp.java
rename to pig/test/org/apache/pig/test/TestPOMapLookUp.java
diff --git a/test/org/apache/pig/test/TestPONegative.java b/pig/test/org/apache/pig/test/TestPONegative.java
similarity index 100%
rename from test/org/apache/pig/test/TestPONegative.java
rename to pig/test/org/apache/pig/test/TestPONegative.java
diff --git a/test/org/apache/pig/test/TestPOPartialAgg.java b/pig/test/org/apache/pig/test/TestPOPartialAgg.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOPartialAgg.java
rename to pig/test/org/apache/pig/test/TestPOPartialAgg.java
diff --git a/test/org/apache/pig/test/TestPOPartialAggPlan.java b/pig/test/org/apache/pig/test/TestPOPartialAggPlan.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOPartialAggPlan.java
rename to pig/test/org/apache/pig/test/TestPOPartialAggPlan.java
diff --git a/test/org/apache/pig/test/TestPORegexp.java b/pig/test/org/apache/pig/test/TestPORegexp.java
similarity index 100%
rename from test/org/apache/pig/test/TestPORegexp.java
rename to pig/test/org/apache/pig/test/TestPORegexp.java
diff --git a/test/org/apache/pig/test/TestPOSort.java b/pig/test/org/apache/pig/test/TestPOSort.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOSort.java
rename to pig/test/org/apache/pig/test/TestPOSort.java
diff --git a/test/org/apache/pig/test/TestPOSplit.java b/pig/test/org/apache/pig/test/TestPOSplit.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOSplit.java
rename to pig/test/org/apache/pig/test/TestPOSplit.java
diff --git a/test/org/apache/pig/test/TestPOUserFunc.java b/pig/test/org/apache/pig/test/TestPOUserFunc.java
similarity index 100%
rename from test/org/apache/pig/test/TestPOUserFunc.java
rename to pig/test/org/apache/pig/test/TestPOUserFunc.java
diff --git a/test/org/apache/pig/test/TestPackage.java b/pig/test/org/apache/pig/test/TestPackage.java
similarity index 100%
rename from test/org/apache/pig/test/TestPackage.java
rename to pig/test/org/apache/pig/test/TestPackage.java
diff --git a/test/org/apache/pig/test/TestParamSubPreproc.java b/pig/test/org/apache/pig/test/TestParamSubPreproc.java
similarity index 100%
rename from test/org/apache/pig/test/TestParamSubPreproc.java
rename to pig/test/org/apache/pig/test/TestParamSubPreproc.java
diff --git a/test/org/apache/pig/test/TestParser.java b/pig/test/org/apache/pig/test/TestParser.java
similarity index 100%
rename from test/org/apache/pig/test/TestParser.java
rename to pig/test/org/apache/pig/test/TestParser.java
diff --git a/test/org/apache/pig/test/TestPhyOp.java b/pig/test/org/apache/pig/test/TestPhyOp.java
similarity index 100%
rename from test/org/apache/pig/test/TestPhyOp.java
rename to pig/test/org/apache/pig/test/TestPhyOp.java
diff --git a/test/org/apache/pig/test/TestPhyPatternMatch.java b/pig/test/org/apache/pig/test/TestPhyPatternMatch.java
similarity index 100%
rename from test/org/apache/pig/test/TestPhyPatternMatch.java
rename to pig/test/org/apache/pig/test/TestPhyPatternMatch.java
diff --git a/test/org/apache/pig/test/TestPi.java b/pig/test/org/apache/pig/test/TestPi.java
similarity index 100%
rename from test/org/apache/pig/test/TestPi.java
rename to pig/test/org/apache/pig/test/TestPi.java
diff --git a/test/org/apache/pig/test/TestPigContext.java b/pig/test/org/apache/pig/test/TestPigContext.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigContext.java
rename to pig/test/org/apache/pig/test/TestPigContext.java
diff --git a/test/org/apache/pig/test/TestPigContextClassCache.java b/pig/test/org/apache/pig/test/TestPigContextClassCache.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigContextClassCache.java
rename to pig/test/org/apache/pig/test/TestPigContextClassCache.java
diff --git a/test/org/apache/pig/test/TestPigException.java b/pig/test/org/apache/pig/test/TestPigException.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigException.java
rename to pig/test/org/apache/pig/test/TestPigException.java
diff --git a/test/org/apache/pig/test/TestPigProgressReporting.java b/pig/test/org/apache/pig/test/TestPigProgressReporting.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigProgressReporting.java
rename to pig/test/org/apache/pig/test/TestPigProgressReporting.java
diff --git a/test/org/apache/pig/test/TestPigRunner.java b/pig/test/org/apache/pig/test/TestPigRunner.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigRunner.java
rename to pig/test/org/apache/pig/test/TestPigRunner.java
diff --git a/test/org/apache/pig/test/TestPigScriptParser.java b/pig/test/org/apache/pig/test/TestPigScriptParser.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigScriptParser.java
rename to pig/test/org/apache/pig/test/TestPigScriptParser.java
diff --git a/test/org/apache/pig/test/TestPigServer.java b/pig/test/org/apache/pig/test/TestPigServer.java
similarity index 98%
rename from test/org/apache/pig/test/TestPigServer.java
rename to pig/test/org/apache/pig/test/TestPigServer.java
index 649b0be..92b9105 100644
--- a/test/org/apache/pig/test/TestPigServer.java
+++ b/pig/test/org/apache/pig/test/TestPigServer.java
@@ -69,7 +69,6 @@
import org.apache.pig.impl.io.FileLocalizer;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.util.JarManager;
import org.apache.pig.impl.util.PropertiesUtil;
import org.apache.pig.impl.util.Utils;
import org.apache.pig.tools.grunt.Grunt;
@@ -982,17 +981,6 @@
assertTrue(validationExceptionCaptured);
}
- @Test
- // See PIG-4109
- public void testRegisterJarRemoteScript() throws Throwable {
- if (Util.WINDOWS) {
- properties.setProperty("pig.jars.relative.to.dfs", "true");
- String jarName = JarManager.findContainingJar(org.codehaus.jackson.JsonParser.class);
- PigServer pig = new PigServer(cluster.getExecType(), properties);
- pig.registerJar(jarName);
- }
- }
-
private void _testSkipParseInRegisterForBatch(boolean skipParseInRegisterForBatch,
int numTimesInitiated, int numTimesSchemaCalled) throws Throwable {
MockTrackingStorage.numTimesInitiated = 0;
diff --git a/test/org/apache/pig/test/TestPigServerWithMacros.java b/pig/test/org/apache/pig/test/TestPigServerWithMacros.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigServerWithMacros.java
rename to pig/test/org/apache/pig/test/TestPigServerWithMacros.java
diff --git a/test/org/apache/pig/test/TestPigSplit.java b/pig/test/org/apache/pig/test/TestPigSplit.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigSplit.java
rename to pig/test/org/apache/pig/test/TestPigSplit.java
diff --git a/test/org/apache/pig/test/TestPigStats.java b/pig/test/org/apache/pig/test/TestPigStats.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigStats.java
rename to pig/test/org/apache/pig/test/TestPigStats.java
diff --git a/test/org/apache/pig/test/TestPigStorage.java b/pig/test/org/apache/pig/test/TestPigStorage.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigStorage.java
rename to pig/test/org/apache/pig/test/TestPigStorage.java
diff --git a/test/org/apache/pig/test/TestPigStreaming.java b/pig/test/org/apache/pig/test/TestPigStreaming.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigStreaming.java
rename to pig/test/org/apache/pig/test/TestPigStreaming.java
diff --git a/test/org/apache/pig/test/TestPigTupleRawComparator.java b/pig/test/org/apache/pig/test/TestPigTupleRawComparator.java
similarity index 100%
rename from test/org/apache/pig/test/TestPigTupleRawComparator.java
rename to pig/test/org/apache/pig/test/TestPigTupleRawComparator.java
diff --git a/test/org/apache/pig/test/TestPinOptions.java b/pig/test/org/apache/pig/test/TestPinOptions.java
similarity index 100%
rename from test/org/apache/pig/test/TestPinOptions.java
rename to pig/test/org/apache/pig/test/TestPinOptions.java
diff --git a/test/org/apache/pig/test/TestPlanGeneration.java b/pig/test/org/apache/pig/test/TestPlanGeneration.java
similarity index 100%
rename from test/org/apache/pig/test/TestPlanGeneration.java
rename to pig/test/org/apache/pig/test/TestPlanGeneration.java
diff --git a/test/org/apache/pig/test/TestPoissonSampleLoader.java b/pig/test/org/apache/pig/test/TestPoissonSampleLoader.java
similarity index 100%
rename from test/org/apache/pig/test/TestPoissonSampleLoader.java
rename to pig/test/org/apache/pig/test/TestPoissonSampleLoader.java
diff --git a/test/org/apache/pig/test/TestPredeployedJar.java b/pig/test/org/apache/pig/test/TestPredeployedJar.java
similarity index 100%
rename from test/org/apache/pig/test/TestPredeployedJar.java
rename to pig/test/org/apache/pig/test/TestPredeployedJar.java
diff --git a/test/org/apache/pig/test/TestProject.java b/pig/test/org/apache/pig/test/TestProject.java
similarity index 100%
rename from test/org/apache/pig/test/TestProject.java
rename to pig/test/org/apache/pig/test/TestProject.java
diff --git a/test/org/apache/pig/test/TestProjectRange.java b/pig/test/org/apache/pig/test/TestProjectRange.java
similarity index 100%
rename from test/org/apache/pig/test/TestProjectRange.java
rename to pig/test/org/apache/pig/test/TestProjectRange.java
diff --git a/test/org/apache/pig/test/TestProjectStarExpander.java b/pig/test/org/apache/pig/test/TestProjectStarExpander.java
similarity index 100%
rename from test/org/apache/pig/test/TestProjectStarExpander.java
rename to pig/test/org/apache/pig/test/TestProjectStarExpander.java
diff --git a/test/org/apache/pig/test/TestProjectStarRangeInUdf.java b/pig/test/org/apache/pig/test/TestProjectStarRangeInUdf.java
similarity index 100%
rename from test/org/apache/pig/test/TestProjectStarRangeInUdf.java
rename to pig/test/org/apache/pig/test/TestProjectStarRangeInUdf.java
diff --git a/test/org/apache/pig/test/TestPruneColumn.java b/pig/test/org/apache/pig/test/TestPruneColumn.java
similarity index 100%
rename from test/org/apache/pig/test/TestPruneColumn.java
rename to pig/test/org/apache/pig/test/TestPruneColumn.java
diff --git a/test/org/apache/pig/test/TestRank1.java b/pig/test/org/apache/pig/test/TestRank1.java
similarity index 100%
rename from test/org/apache/pig/test/TestRank1.java
rename to pig/test/org/apache/pig/test/TestRank1.java
diff --git a/test/org/apache/pig/test/TestRank2.java b/pig/test/org/apache/pig/test/TestRank2.java
similarity index 100%
rename from test/org/apache/pig/test/TestRank2.java
rename to pig/test/org/apache/pig/test/TestRank2.java
diff --git a/test/org/apache/pig/test/TestRank3.java b/pig/test/org/apache/pig/test/TestRank3.java
similarity index 100%
rename from test/org/apache/pig/test/TestRank3.java
rename to pig/test/org/apache/pig/test/TestRank3.java
diff --git a/test/org/apache/pig/test/TestRegexp.java b/pig/test/org/apache/pig/test/TestRegexp.java
similarity index 100%
rename from test/org/apache/pig/test/TestRegexp.java
rename to pig/test/org/apache/pig/test/TestRegexp.java
diff --git a/test/org/apache/pig/test/TestRegisteredJarVisibility.java b/pig/test/org/apache/pig/test/TestRegisteredJarVisibility.java
similarity index 100%
rename from test/org/apache/pig/test/TestRegisteredJarVisibility.java
rename to pig/test/org/apache/pig/test/TestRegisteredJarVisibility.java
diff --git a/test/org/apache/pig/test/TestRelationToExprProject.java b/pig/test/org/apache/pig/test/TestRelationToExprProject.java
similarity index 100%
rename from test/org/apache/pig/test/TestRelationToExprProject.java
rename to pig/test/org/apache/pig/test/TestRelationToExprProject.java
diff --git a/test/org/apache/pig/test/TestResourceSchema.java b/pig/test/org/apache/pig/test/TestResourceSchema.java
similarity index 100%
rename from test/org/apache/pig/test/TestResourceSchema.java
rename to pig/test/org/apache/pig/test/TestResourceSchema.java
diff --git a/test/org/apache/pig/test/TestRollupDimensions.java b/pig/test/org/apache/pig/test/TestRollupDimensions.java
similarity index 100%
rename from test/org/apache/pig/test/TestRollupDimensions.java
rename to pig/test/org/apache/pig/test/TestRollupDimensions.java
diff --git a/test/org/apache/pig/test/TestSample.java b/pig/test/org/apache/pig/test/TestSample.java
similarity index 100%
rename from test/org/apache/pig/test/TestSample.java
rename to pig/test/org/apache/pig/test/TestSample.java
diff --git a/test/org/apache/pig/test/TestSampleOptimizer.java b/pig/test/org/apache/pig/test/TestSampleOptimizer.java
similarity index 100%
rename from test/org/apache/pig/test/TestSampleOptimizer.java
rename to pig/test/org/apache/pig/test/TestSampleOptimizer.java
diff --git a/test/org/apache/pig/test/TestScalarAliases.java b/pig/test/org/apache/pig/test/TestScalarAliases.java
similarity index 100%
rename from test/org/apache/pig/test/TestScalarAliases.java
rename to pig/test/org/apache/pig/test/TestScalarAliases.java
diff --git a/test/org/apache/pig/test/TestSchema.java b/pig/test/org/apache/pig/test/TestSchema.java
similarity index 100%
rename from test/org/apache/pig/test/TestSchema.java
rename to pig/test/org/apache/pig/test/TestSchema.java
diff --git a/test/org/apache/pig/test/TestSchemaUtil.java b/pig/test/org/apache/pig/test/TestSchemaUtil.java
similarity index 100%
rename from test/org/apache/pig/test/TestSchemaUtil.java
rename to pig/test/org/apache/pig/test/TestSchemaUtil.java
diff --git a/test/org/apache/pig/test/TestScriptLanguage.java b/pig/test/org/apache/pig/test/TestScriptLanguage.java
similarity index 100%
rename from test/org/apache/pig/test/TestScriptLanguage.java
rename to pig/test/org/apache/pig/test/TestScriptLanguage.java
diff --git a/test/org/apache/pig/test/TestScriptLanguageJavaScript.java b/pig/test/org/apache/pig/test/TestScriptLanguageJavaScript.java
similarity index 100%
rename from test/org/apache/pig/test/TestScriptLanguageJavaScript.java
rename to pig/test/org/apache/pig/test/TestScriptLanguageJavaScript.java
diff --git a/test/org/apache/pig/test/TestScriptUDF.java b/pig/test/org/apache/pig/test/TestScriptUDF.java
similarity index 100%
rename from test/org/apache/pig/test/TestScriptUDF.java
rename to pig/test/org/apache/pig/test/TestScriptUDF.java
diff --git a/test/org/apache/pig/test/TestScriptingLanguagePython.java b/pig/test/org/apache/pig/test/TestScriptingLanguagePython.java
similarity index 100%
rename from test/org/apache/pig/test/TestScriptingLanguagePython.java
rename to pig/test/org/apache/pig/test/TestScriptingLanguagePython.java
diff --git a/test/org/apache/pig/test/TestSecondarySort.java b/pig/test/org/apache/pig/test/TestSecondarySort.java
similarity index 100%
rename from test/org/apache/pig/test/TestSecondarySort.java
rename to pig/test/org/apache/pig/test/TestSecondarySort.java
diff --git a/test/org/apache/pig/test/TestSecondarySortMR.java b/pig/test/org/apache/pig/test/TestSecondarySortMR.java
similarity index 100%
rename from test/org/apache/pig/test/TestSecondarySortMR.java
rename to pig/test/org/apache/pig/test/TestSecondarySortMR.java
diff --git a/test/org/apache/pig/test/TestShortcuts.java b/pig/test/org/apache/pig/test/TestShortcuts.java
similarity index 100%
rename from test/org/apache/pig/test/TestShortcuts.java
rename to pig/test/org/apache/pig/test/TestShortcuts.java
diff --git a/test/org/apache/pig/test/TestSkewedJoin.java b/pig/test/org/apache/pig/test/TestSkewedJoin.java
similarity index 100%
rename from test/org/apache/pig/test/TestSkewedJoin.java
rename to pig/test/org/apache/pig/test/TestSkewedJoin.java
diff --git a/test/org/apache/pig/test/TestSplit.java b/pig/test/org/apache/pig/test/TestSplit.java
similarity index 100%
rename from test/org/apache/pig/test/TestSplit.java
rename to pig/test/org/apache/pig/test/TestSplit.java
diff --git a/test/org/apache/pig/test/TestSplitCombine.java b/pig/test/org/apache/pig/test/TestSplitCombine.java
similarity index 100%
rename from test/org/apache/pig/test/TestSplitCombine.java
rename to pig/test/org/apache/pig/test/TestSplitCombine.java
diff --git a/test/org/apache/pig/test/TestSplitIndex.java b/pig/test/org/apache/pig/test/TestSplitIndex.java
similarity index 100%
rename from test/org/apache/pig/test/TestSplitIndex.java
rename to pig/test/org/apache/pig/test/TestSplitIndex.java
diff --git a/test/org/apache/pig/test/TestSplitStore.java b/pig/test/org/apache/pig/test/TestSplitStore.java
similarity index 100%
rename from test/org/apache/pig/test/TestSplitStore.java
rename to pig/test/org/apache/pig/test/TestSplitStore.java
diff --git a/test/org/apache/pig/test/TestStore.java b/pig/test/org/apache/pig/test/TestStore.java
similarity index 100%
rename from test/org/apache/pig/test/TestStore.java
rename to pig/test/org/apache/pig/test/TestStore.java
diff --git a/test/org/apache/pig/test/TestStoreInstances.java b/pig/test/org/apache/pig/test/TestStoreInstances.java
similarity index 100%
rename from test/org/apache/pig/test/TestStoreInstances.java
rename to pig/test/org/apache/pig/test/TestStoreInstances.java
diff --git a/test/org/apache/pig/test/TestStoreOld.java b/pig/test/org/apache/pig/test/TestStoreOld.java
similarity index 100%
rename from test/org/apache/pig/test/TestStoreOld.java
rename to pig/test/org/apache/pig/test/TestStoreOld.java
diff --git a/test/org/apache/pig/test/TestStreaming.java b/pig/test/org/apache/pig/test/TestStreaming.java
similarity index 100%
rename from test/org/apache/pig/test/TestStreaming.java
rename to pig/test/org/apache/pig/test/TestStreaming.java
diff --git a/test/org/apache/pig/test/TestStreamingLocal.java b/pig/test/org/apache/pig/test/TestStreamingLocal.java
similarity index 100%
rename from test/org/apache/pig/test/TestStreamingLocal.java
rename to pig/test/org/apache/pig/test/TestStreamingLocal.java
diff --git a/test/org/apache/pig/test/TestStringUDFs.java b/pig/test/org/apache/pig/test/TestStringUDFs.java
similarity index 100%
rename from test/org/apache/pig/test/TestStringUDFs.java
rename to pig/test/org/apache/pig/test/TestStringUDFs.java
diff --git a/test/org/apache/pig/test/TestSubtract.java b/pig/test/org/apache/pig/test/TestSubtract.java
similarity index 100%
rename from test/org/apache/pig/test/TestSubtract.java
rename to pig/test/org/apache/pig/test/TestSubtract.java
diff --git a/test/org/apache/pig/test/TestTextDataParser.java b/pig/test/org/apache/pig/test/TestTextDataParser.java
similarity index 100%
rename from test/org/apache/pig/test/TestTextDataParser.java
rename to pig/test/org/apache/pig/test/TestTextDataParser.java
diff --git a/test/org/apache/pig/test/TestTmpFileCompression.java b/pig/test/org/apache/pig/test/TestTmpFileCompression.java
similarity index 100%
rename from test/org/apache/pig/test/TestTmpFileCompression.java
rename to pig/test/org/apache/pig/test/TestTmpFileCompression.java
diff --git a/test/org/apache/pig/test/TestToolsPigServer.java b/pig/test/org/apache/pig/test/TestToolsPigServer.java
similarity index 100%
rename from test/org/apache/pig/test/TestToolsPigServer.java
rename to pig/test/org/apache/pig/test/TestToolsPigServer.java
diff --git a/test/org/apache/pig/test/TestTuple.java b/pig/test/org/apache/pig/test/TestTuple.java
similarity index 100%
rename from test/org/apache/pig/test/TestTuple.java
rename to pig/test/org/apache/pig/test/TestTuple.java
diff --git a/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java b/pig/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
similarity index 100%
rename from test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
rename to pig/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
diff --git a/test/org/apache/pig/test/TestTypedMap.java b/pig/test/org/apache/pig/test/TestTypedMap.java
similarity index 100%
rename from test/org/apache/pig/test/TestTypedMap.java
rename to pig/test/org/apache/pig/test/TestTypedMap.java
diff --git a/test/org/apache/pig/test/TestUDF.java b/pig/test/org/apache/pig/test/TestUDF.java
similarity index 100%
rename from test/org/apache/pig/test/TestUDF.java
rename to pig/test/org/apache/pig/test/TestUDF.java
diff --git a/test/org/apache/pig/test/TestUDFContext.java b/pig/test/org/apache/pig/test/TestUDFContext.java
similarity index 100%
rename from test/org/apache/pig/test/TestUDFContext.java
rename to pig/test/org/apache/pig/test/TestUDFContext.java
diff --git a/test/org/apache/pig/test/TestUDFGroovy.java b/pig/test/org/apache/pig/test/TestUDFGroovy.java
similarity index 100%
rename from test/org/apache/pig/test/TestUDFGroovy.java
rename to pig/test/org/apache/pig/test/TestUDFGroovy.java
diff --git a/test/org/apache/pig/test/TestUDFWithoutParameter.java b/pig/test/org/apache/pig/test/TestUDFWithoutParameter.java
similarity index 100%
rename from test/org/apache/pig/test/TestUDFWithoutParameter.java
rename to pig/test/org/apache/pig/test/TestUDFWithoutParameter.java
diff --git a/test/org/apache/pig/test/TestUTF8.java b/pig/test/org/apache/pig/test/TestUTF8.java
similarity index 100%
rename from test/org/apache/pig/test/TestUTF8.java
rename to pig/test/org/apache/pig/test/TestUTF8.java
diff --git a/test/org/apache/pig/test/TestUnion.java b/pig/test/org/apache/pig/test/TestUnion.java
similarity index 100%
rename from test/org/apache/pig/test/TestUnion.java
rename to pig/test/org/apache/pig/test/TestUnion.java
diff --git a/test/org/apache/pig/test/TestUnionOnSchema.java b/pig/test/org/apache/pig/test/TestUnionOnSchema.java
similarity index 100%
rename from test/org/apache/pig/test/TestUnionOnSchema.java
rename to pig/test/org/apache/pig/test/TestUnionOnSchema.java
diff --git a/test/org/apache/pig/test/Util.java b/pig/test/org/apache/pig/test/Util.java
similarity index 100%
rename from test/org/apache/pig/test/Util.java
rename to pig/test/org/apache/pig/test/Util.java
diff --git a/test/org/apache/pig/test/data/ConfFile1.txt b/pig/test/org/apache/pig/test/data/ConfFile1.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFile1.txt
rename to pig/test/org/apache/pig/test/data/ConfFile1.txt
diff --git a/test/org/apache/pig/test/data/ConfFile2.txt b/pig/test/org/apache/pig/test/data/ConfFile2.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFile2.txt
rename to pig/test/org/apache/pig/test/data/ConfFile2.txt
diff --git a/test/org/apache/pig/test/data/ConfFile3.txt b/pig/test/org/apache/pig/test/data/ConfFile3.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFile3.txt
rename to pig/test/org/apache/pig/test/data/ConfFile3.txt
diff --git a/test/org/apache/pig/test/data/ConfFileComplexVal.txt b/pig/test/org/apache/pig/test/data/ConfFileComplexVal.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFileComplexVal.txt
rename to pig/test/org/apache/pig/test/data/ConfFileComplexVal.txt
diff --git a/test/org/apache/pig/test/data/ConfFileDuplicates.txt b/pig/test/org/apache/pig/test/data/ConfFileDuplicates.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFileDuplicates.txt
rename to pig/test/org/apache/pig/test/data/ConfFileDuplicates.txt
diff --git a/test/org/apache/pig/test/data/ConfFileSameParamMultipleTimes.txt b/pig/test/org/apache/pig/test/data/ConfFileSameParamMultipleTimes.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFileSameParamMultipleTimes.txt
rename to pig/test/org/apache/pig/test/data/ConfFileSameParamMultipleTimes.txt
diff --git a/test/org/apache/pig/test/data/ConfFileWithEmptyComments.txt b/pig/test/org/apache/pig/test/data/ConfFileWithEmptyComments.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFileWithEmptyComments.txt
rename to pig/test/org/apache/pig/test/data/ConfFileWithEmptyComments.txt
diff --git a/test/org/apache/pig/test/data/ConfFileWithInvalidLines.txt b/pig/test/org/apache/pig/test/data/ConfFileWithInvalidLines.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFileWithInvalidLines.txt
rename to pig/test/org/apache/pig/test/data/ConfFileWithInvalidLines.txt
diff --git a/test/org/apache/pig/test/data/ConfFileWithValidLines.txt b/pig/test/org/apache/pig/test/data/ConfFileWithValidLines.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ConfFileWithValidLines.txt
rename to pig/test/org/apache/pig/test/data/ConfFileWithValidLines.txt
diff --git a/test/org/apache/pig/test/data/DotFiles/explain1.dot b/pig/test/org/apache/pig/test/data/DotFiles/explain1.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/explain1.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/explain1.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan1.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan1.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan1.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan1.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan10.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan2.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan2.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan2.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan2.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan3.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan4.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan5.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan5.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan5.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan5.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan6.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan6.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan6.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan6.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan7.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan8.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan8.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan8.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan8.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/new-optlimitplan9.dot b/pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan9.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/new-optlimitplan9.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/new-optlimitplan9.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan1.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan1.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan1.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan1.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan10.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan10.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan10.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan10.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan12.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan12.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan12.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan12.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan2.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan2.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan2.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan2.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan3.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan3.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan3.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan3.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan4.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan5.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan6.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan7.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan8.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot b/pig/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optlimitplan9.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/optplan1.dot b/pig/test/org/apache/pig/test/data/DotFiles/optplan1.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/optplan1.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/optplan1.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/plan1.dot b/pig/test/org/apache/pig/test/data/DotFiles/plan1.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/plan1.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/plan1.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/testScript1.dot b/pig/test/org/apache/pig/test/data/DotFiles/testScript1.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/testScript1.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/testScript1.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/testScript2.dot b/pig/test/org/apache/pig/test/data/DotFiles/testScript2.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/testScript2.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/testScript2.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/testScript3.dot b/pig/test/org/apache/pig/test/data/DotFiles/testScript3.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/testScript3.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/testScript3.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/testScript4.dot b/pig/test/org/apache/pig/test/data/DotFiles/testScript4.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/testScript4.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/testScript4.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/testScript5.dot b/pig/test/org/apache/pig/test/data/DotFiles/testScript5.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/testScript5.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/testScript5.dot
diff --git a/test/org/apache/pig/test/data/DotFiles/testScript6.dot b/pig/test/org/apache/pig/test/data/DotFiles/testScript6.dot
similarity index 100%
rename from test/org/apache/pig/test/data/DotFiles/testScript6.dot
rename to pig/test/org/apache/pig/test/data/DotFiles/testScript6.dot
diff --git a/test/org/apache/pig/test/data/ExpectedResult.pig b/pig/test/org/apache/pig/test/data/ExpectedResult.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResult.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResult.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResult2.pig b/pig/test/org/apache/pig/test/data/ExpectedResult2.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResult2.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResult2.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResult3.txt b/pig/test/org/apache/pig/test/data/ExpectedResult3.txt
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResult3.txt
rename to pig/test/org/apache/pig/test/data/ExpectedResult3.txt
diff --git a/test/org/apache/pig/test/data/ExpectedResult4.pig b/pig/test/org/apache/pig/test/data/ExpectedResult4.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResult4.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResult4.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResult6.pig b/pig/test/org/apache/pig/test/data/ExpectedResult6.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResult6.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResult6.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResult7.pig b/pig/test/org/apache/pig/test/data/ExpectedResult7.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResult7.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResult7.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResultCmdLnPriorDeclare.pig b/pig/test/org/apache/pig/test/data/ExpectedResultCmdLnPriorDeclare.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResultCmdLnPriorDeclare.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResultCmdLnPriorDeclare.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResultComment.pig b/pig/test/org/apache/pig/test/data/ExpectedResultComment.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResultComment.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResultComment.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResultDefault.pig b/pig/test/org/apache/pig/test/data/ExpectedResultDefault.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResultDefault.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResultDefault.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResultDollarSign.pig b/pig/test/org/apache/pig/test/data/ExpectedResultDollarSign.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResultDollarSign.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResultDollarSign.pig
diff --git a/test/org/apache/pig/test/data/ExpectedResultMulDecs.pig b/pig/test/org/apache/pig/test/data/ExpectedResultMulDecs.pig
similarity index 100%
rename from test/org/apache/pig/test/data/ExpectedResultMulDecs.pig
rename to pig/test/org/apache/pig/test/data/ExpectedResultMulDecs.pig
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Arithmetic.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/BinCond.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Cogroup.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Comparison.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/ComplexForeach.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Distinct.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Generate.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Generate.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Generate.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/IsNull1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/IsNull2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Limit.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Limit.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Limit.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Limit.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC10.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC10.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC11.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC11.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC12.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC12.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC13.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC13.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC14.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC14.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC15.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC16.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC17.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC17.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC19.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC19.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC3.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC3.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC4.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC4.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC4.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC4.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC5.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC5.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC6.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC6.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC7.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC7.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC8.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC8.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/MRC9.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/MRC9.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Sort.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Sort.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Sort.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Split1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Split1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Split1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Split2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Split2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Split2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Split2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC10.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC10.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC10.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC10.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC11.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC11.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC11.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC11.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC12.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC12.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC12.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC12.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC13.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC13.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC13.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC13.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC14.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC14.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC14.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC14.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC15.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC15.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC15.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC15.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC16.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC17.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC17.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC17.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC17.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC18.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC18.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC18.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC18.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC3.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC3.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC3.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC3.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC4.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/TEZC5.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/TEZC5.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/TEZC5.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/TEZC5.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/Union.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/Union.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/Union.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/Union.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/jsTst3 b/pig/test/org/apache/pig/test/data/GoldenFiles/jsTst3
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/jsTst3
rename to pig/test/org/apache/pig/test/data/GoldenFiles/jsTst3
diff --git a/test/org/apache/pig/test/data/GoldenFiles/jsTst4 b/pig/test/org/apache/pig/test/data/GoldenFiles/jsTst4
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/jsTst4
rename to pig/test/org/apache/pig/test/data/GoldenFiles/jsTst4
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-3.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-4.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-MQ-5.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Rank-2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-1.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-10.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-2.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-3.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-4.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-5.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-6.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-7.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-8.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9-OPTOFF.gld
diff --git a/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld b/pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
similarity index 100%
rename from test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
rename to pig/test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-Union-9.gld
diff --git a/test/org/apache/pig/test/data/InputFiles/jsTst1.txt b/pig/test/org/apache/pig/test/data/InputFiles/jsTst1.txt
similarity index 100%
rename from test/org/apache/pig/test/data/InputFiles/jsTst1.txt
rename to pig/test/org/apache/pig/test/data/InputFiles/jsTst1.txt
diff --git a/test/org/apache/pig/test/data/InputFiles/jsTst2.txt b/pig/test/org/apache/pig/test/data/InputFiles/jsTst2.txt
similarity index 100%
rename from test/org/apache/pig/test/data/InputFiles/jsTst2.txt
rename to pig/test/org/apache/pig/test/data/InputFiles/jsTst2.txt
diff --git a/test/org/apache/pig/test/data/InputFiles/jsTst5.txt b/pig/test/org/apache/pig/test/data/InputFiles/jsTst5.txt
similarity index 100%
rename from test/org/apache/pig/test/data/InputFiles/jsTst5.txt
rename to pig/test/org/apache/pig/test/data/InputFiles/jsTst5.txt
diff --git a/test/org/apache/pig/test/data/InputFiles/passwd b/pig/test/org/apache/pig/test/data/InputFiles/passwd
similarity index 100%
rename from test/org/apache/pig/test/data/InputFiles/passwd
rename to pig/test/org/apache/pig/test/data/InputFiles/passwd
diff --git a/test/org/apache/pig/test/data/TestIllustrateInput.txt b/pig/test/org/apache/pig/test/data/TestIllustrateInput.txt
similarity index 100%
rename from test/org/apache/pig/test/data/TestIllustrateInput.txt
rename to pig/test/org/apache/pig/test/data/TestIllustrateInput.txt
diff --git a/test/org/apache/pig/test/data/TestIllustrateInput2.txt b/pig/test/org/apache/pig/test/data/TestIllustrateInput2.txt
similarity index 100%
rename from test/org/apache/pig/test/data/TestIllustrateInput2.txt
rename to pig/test/org/apache/pig/test/data/TestIllustrateInput2.txt
diff --git a/test/org/apache/pig/test/data/TestIllustrateInput_invalid.txt b/pig/test/org/apache/pig/test/data/TestIllustrateInput_invalid.txt
similarity index 100%
rename from test/org/apache/pig/test/data/TestIllustrateInput_invalid.txt
rename to pig/test/org/apache/pig/test/data/TestIllustrateInput_invalid.txt
diff --git a/test/org/apache/pig/test/data/TestRelationToExprProjectInput.txt b/pig/test/org/apache/pig/test/data/TestRelationToExprProjectInput.txt
similarity index 100%
rename from test/org/apache/pig/test/data/TestRelationToExprProjectInput.txt
rename to pig/test/org/apache/pig/test/data/TestRelationToExprProjectInput.txt
diff --git a/test/org/apache/pig/test/data/explainScript.pig b/pig/test/org/apache/pig/test/data/explainScript.pig
similarity index 100%
rename from test/org/apache/pig/test/data/explainScript.pig
rename to pig/test/org/apache/pig/test/data/explainScript.pig
diff --git a/test/org/apache/pig/test/data/generate_date.bat b/pig/test/org/apache/pig/test/data/generate_date.bat
similarity index 100%
rename from test/org/apache/pig/test/data/generate_date.bat
rename to pig/test/org/apache/pig/test/data/generate_date.bat
diff --git a/test/org/apache/pig/test/data/generate_date.sh b/pig/test/org/apache/pig/test/data/generate_date.sh
similarity index 100%
rename from test/org/apache/pig/test/data/generate_date.sh
rename to pig/test/org/apache/pig/test/data/generate_date.sh
diff --git a/test/org/apache/pig/test/data/illustrate.pig b/pig/test/org/apache/pig/test/data/illustrate.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate.pig
rename to pig/test/org/apache/pig/test/data/illustrate.pig
diff --git a/test/org/apache/pig/test/data/illustrate2.pig b/pig/test/org/apache/pig/test/data/illustrate2.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate2.pig
rename to pig/test/org/apache/pig/test/data/illustrate2.pig
diff --git a/test/org/apache/pig/test/data/illustrate3.pig b/pig/test/org/apache/pig/test/data/illustrate3.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate3.pig
rename to pig/test/org/apache/pig/test/data/illustrate3.pig
diff --git a/test/org/apache/pig/test/data/illustrate4.pig b/pig/test/org/apache/pig/test/data/illustrate4.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate4.pig
rename to pig/test/org/apache/pig/test/data/illustrate4.pig
diff --git a/test/org/apache/pig/test/data/illustrate5.pig b/pig/test/org/apache/pig/test/data/illustrate5.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate5.pig
rename to pig/test/org/apache/pig/test/data/illustrate5.pig
diff --git a/test/org/apache/pig/test/data/illustrate6.pig b/pig/test/org/apache/pig/test/data/illustrate6.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate6.pig
rename to pig/test/org/apache/pig/test/data/illustrate6.pig
diff --git a/test/org/apache/pig/test/data/illustrate7.pig b/pig/test/org/apache/pig/test/data/illustrate7.pig
similarity index 100%
rename from test/org/apache/pig/test/data/illustrate7.pig
rename to pig/test/org/apache/pig/test/data/illustrate7.pig
diff --git a/test/org/apache/pig/test/data/input1.pig b/pig/test/org/apache/pig/test/data/input1.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input1.pig
rename to pig/test/org/apache/pig/test/data/input1.pig
diff --git a/test/org/apache/pig/test/data/input2.pig b/pig/test/org/apache/pig/test/data/input2.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input2.pig
rename to pig/test/org/apache/pig/test/data/input2.pig
diff --git a/test/org/apache/pig/test/data/input3.pig b/pig/test/org/apache/pig/test/data/input3.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input3.pig
rename to pig/test/org/apache/pig/test/data/input3.pig
diff --git a/test/org/apache/pig/test/data/input4.pig b/pig/test/org/apache/pig/test/data/input4.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input4.pig
rename to pig/test/org/apache/pig/test/data/input4.pig
diff --git a/test/org/apache/pig/test/data/input5.pig b/pig/test/org/apache/pig/test/data/input5.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input5.pig
rename to pig/test/org/apache/pig/test/data/input5.pig
diff --git a/test/org/apache/pig/test/data/input6.pig b/pig/test/org/apache/pig/test/data/input6.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input6.pig
rename to pig/test/org/apache/pig/test/data/input6.pig
diff --git a/test/org/apache/pig/test/data/input7.pig b/pig/test/org/apache/pig/test/data/input7.pig
similarity index 100%
rename from test/org/apache/pig/test/data/input7.pig
rename to pig/test/org/apache/pig/test/data/input7.pig
diff --git a/test/org/apache/pig/test/data/inputCmdlineParamPriortoDeclare.pig b/pig/test/org/apache/pig/test/data/inputCmdlineParamPriortoDeclare.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputCmdlineParamPriortoDeclare.pig
rename to pig/test/org/apache/pig/test/data/inputCmdlineParamPriortoDeclare.pig
diff --git a/test/org/apache/pig/test/data/inputCmdnameAsParamDeclare.pig b/pig/test/org/apache/pig/test/data/inputCmdnameAsParamDeclare.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputCmdnameAsParamDeclare.pig
rename to pig/test/org/apache/pig/test/data/inputCmdnameAsParamDeclare.pig
diff --git a/test/org/apache/pig/test/data/inputComment.pig b/pig/test/org/apache/pig/test/data/inputComment.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputComment.pig
rename to pig/test/org/apache/pig/test/data/inputComment.pig
diff --git a/test/org/apache/pig/test/data/inputDefault.pig b/pig/test/org/apache/pig/test/data/inputDefault.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputDefault.pig
rename to pig/test/org/apache/pig/test/data/inputDefault.pig
diff --git a/test/org/apache/pig/test/data/inputDollarSign.pig b/pig/test/org/apache/pig/test/data/inputDollarSign.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputDollarSign.pig
rename to pig/test/org/apache/pig/test/data/inputDollarSign.pig
diff --git a/test/org/apache/pig/test/data/inputEscape.pig b/pig/test/org/apache/pig/test/data/inputEscape.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputEscape.pig
rename to pig/test/org/apache/pig/test/data/inputEscape.pig
diff --git a/test/org/apache/pig/test/data/inputMultipleDeclares.pig b/pig/test/org/apache/pig/test/data/inputMultipleDeclares.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputMultipleDeclares.pig
rename to pig/test/org/apache/pig/test/data/inputMultipleDeclares.pig
diff --git a/test/org/apache/pig/test/data/inputMultipleParams.pig b/pig/test/org/apache/pig/test/data/inputMultipleParams.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputMultipleParams.pig
rename to pig/test/org/apache/pig/test/data/inputMultipleParams.pig
diff --git a/test/org/apache/pig/test/data/inputNoVars.pig b/pig/test/org/apache/pig/test/data/inputNoVars.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputNoVars.pig
rename to pig/test/org/apache/pig/test/data/inputNoVars.pig
diff --git a/test/org/apache/pig/test/data/inputSubWithinLiteral.pig b/pig/test/org/apache/pig/test/data/inputSubWithinLiteral.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputSubWithinLiteral.pig
rename to pig/test/org/apache/pig/test/data/inputSubWithinLiteral.pig
diff --git a/test/org/apache/pig/test/data/inputSubstitutionWithinShellCommand.pig b/pig/test/org/apache/pig/test/data/inputSubstitutionWithinShellCommand.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputSubstitutionWithinShellCommand.pig
rename to pig/test/org/apache/pig/test/data/inputSubstitutionWithinShellCommand.pig
diff --git a/test/org/apache/pig/test/data/inputSubstitutionWithinValue.pig b/pig/test/org/apache/pig/test/data/inputSubstitutionWithinValue.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputSubstitutionWithinValue.pig
rename to pig/test/org/apache/pig/test/data/inputSubstitutionWithinValue.pig
diff --git a/test/org/apache/pig/test/data/inputThreeParams.pig b/pig/test/org/apache/pig/test/data/inputThreeParams.pig
similarity index 100%
rename from test/org/apache/pig/test/data/inputThreeParams.pig
rename to pig/test/org/apache/pig/test/data/inputThreeParams.pig
diff --git a/test/org/apache/pig/test/data/newinputS.txt b/pig/test/org/apache/pig/test/data/newinputS.txt
similarity index 100%
rename from test/org/apache/pig/test/data/newinputS.txt
rename to pig/test/org/apache/pig/test/data/newinputS.txt
diff --git a/test/org/apache/pig/test/data/output1.pig b/pig/test/org/apache/pig/test/data/output1.pig
similarity index 100%
rename from test/org/apache/pig/test/data/output1.pig
rename to pig/test/org/apache/pig/test/data/output1.pig
diff --git a/test/org/apache/pig/test/data/output26.pig b/pig/test/org/apache/pig/test/data/output26.pig
similarity index 100%
rename from test/org/apache/pig/test/data/output26.pig
rename to pig/test/org/apache/pig/test/data/output26.pig
diff --git a/test/org/apache/pig/test/data/output3.pig b/pig/test/org/apache/pig/test/data/output3.pig
similarity index 100%
rename from test/org/apache/pig/test/data/output3.pig
rename to pig/test/org/apache/pig/test/data/output3.pig
diff --git a/test/org/apache/pig/test/data/passwd b/pig/test/org/apache/pig/test/data/passwd
similarity index 100%
rename from test/org/apache/pig/test/data/passwd
rename to pig/test/org/apache/pig/test/data/passwd
diff --git a/test/org/apache/pig/test/data/passwd2 b/pig/test/org/apache/pig/test/data/passwd2
similarity index 100%
rename from test/org/apache/pig/test/data/passwd2
rename to pig/test/org/apache/pig/test/data/passwd2
diff --git a/test/org/apache/pig/test/data/tc.js b/pig/test/org/apache/pig/test/data/tc.js
similarity index 100%
rename from test/org/apache/pig/test/data/tc.js
rename to pig/test/org/apache/pig/test/data/tc.js
diff --git a/test/org/apache/pig/test/data/test.ppf b/pig/test/org/apache/pig/test/data/test.ppf
similarity index 100%
rename from test/org/apache/pig/test/data/test.ppf
rename to pig/test/org/apache/pig/test/data/test.ppf
diff --git a/test/org/apache/pig/test/data/test_broken.ppf b/pig/test/org/apache/pig/test/data/test_broken.ppf
similarity index 100%
rename from test/org/apache/pig/test/data/test_broken.ppf
rename to pig/test/org/apache/pig/test/data/test_broken.ppf
diff --git a/test/org/apache/pig/test/data/testsub.pig b/pig/test/org/apache/pig/test/data/testsub.pig
similarity index 100%
rename from test/org/apache/pig/test/data/testsub.pig
rename to pig/test/org/apache/pig/test/data/testsub.pig
diff --git a/test/org/apache/pig/test/data/testsubnested_exec.pig b/pig/test/org/apache/pig/test/data/testsubnested_exec.pig
similarity index 100%
rename from test/org/apache/pig/test/data/testsubnested_exec.pig
rename to pig/test/org/apache/pig/test/data/testsubnested_exec.pig
diff --git a/test/org/apache/pig/test/data/testsubnested_run.pig b/pig/test/org/apache/pig/test/data/testsubnested_run.pig
similarity index 100%
rename from test/org/apache/pig/test/data/testsubnested_run.pig
rename to pig/test/org/apache/pig/test/data/testsubnested_run.pig
diff --git a/test/org/apache/pig/test/junit/OrderedJUnit4Runner.java b/pig/test/org/apache/pig/test/junit/OrderedJUnit4Runner.java
similarity index 100%
rename from test/org/apache/pig/test/junit/OrderedJUnit4Runner.java
rename to pig/test/org/apache/pig/test/junit/OrderedJUnit4Runner.java
diff --git a/test/org/apache/pig/test/pigunit/TestPigTest.java b/pig/test/org/apache/pig/test/pigunit/TestPigTest.java
similarity index 100%
rename from test/org/apache/pig/test/pigunit/TestPigTest.java
rename to pig/test/org/apache/pig/test/pigunit/TestPigTest.java
diff --git a/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java b/pig/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
similarity index 100%
rename from test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
rename to pig/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
diff --git a/test/org/apache/pig/test/utils/AccumulativeSumBag.java b/pig/test/org/apache/pig/test/utils/AccumulativeSumBag.java
similarity index 100%
rename from test/org/apache/pig/test/utils/AccumulativeSumBag.java
rename to pig/test/org/apache/pig/test/utils/AccumulativeSumBag.java
diff --git a/test/org/apache/pig/test/utils/AccumulatorBagCount.java b/pig/test/org/apache/pig/test/utils/AccumulatorBagCount.java
similarity index 100%
rename from test/org/apache/pig/test/utils/AccumulatorBagCount.java
rename to pig/test/org/apache/pig/test/utils/AccumulatorBagCount.java
diff --git a/test/org/apache/pig/test/utils/BagCount.java b/pig/test/org/apache/pig/test/utils/BagCount.java
similarity index 100%
rename from test/org/apache/pig/test/utils/BagCount.java
rename to pig/test/org/apache/pig/test/utils/BagCount.java
diff --git a/test/org/apache/pig/test/utils/FILTERFROMFILE.java b/pig/test/org/apache/pig/test/utils/FILTERFROMFILE.java
similarity index 100%
rename from test/org/apache/pig/test/utils/FILTERFROMFILE.java
rename to pig/test/org/apache/pig/test/utils/FILTERFROMFILE.java
diff --git a/test/org/apache/pig/test/utils/GenPhyOp.java b/pig/test/org/apache/pig/test/utils/GenPhyOp.java
similarity index 100%
rename from test/org/apache/pig/test/utils/GenPhyOp.java
rename to pig/test/org/apache/pig/test/utils/GenPhyOp.java
diff --git a/test/org/apache/pig/test/utils/GenRandomData.java b/pig/test/org/apache/pig/test/utils/GenRandomData.java
similarity index 100%
rename from test/org/apache/pig/test/utils/GenRandomData.java
rename to pig/test/org/apache/pig/test/utils/GenRandomData.java
diff --git a/test/org/apache/pig/test/utils/HelperEvalFuncUtils.java b/pig/test/org/apache/pig/test/utils/HelperEvalFuncUtils.java
similarity index 100%
rename from test/org/apache/pig/test/utils/HelperEvalFuncUtils.java
rename to pig/test/org/apache/pig/test/utils/HelperEvalFuncUtils.java
diff --git a/test/org/apache/pig/test/utils/Identity.java b/pig/test/org/apache/pig/test/utils/Identity.java
similarity index 100%
rename from test/org/apache/pig/test/utils/Identity.java
rename to pig/test/org/apache/pig/test/utils/Identity.java
diff --git a/test/org/apache/pig/test/utils/LocalSeekableInputStream.java b/pig/test/org/apache/pig/test/utils/LocalSeekableInputStream.java
similarity index 100%
rename from test/org/apache/pig/test/utils/LocalSeekableInputStream.java
rename to pig/test/org/apache/pig/test/utils/LocalSeekableInputStream.java
diff --git a/test/org/apache/pig/test/utils/MultiLevelDerivedUDF1.java b/pig/test/org/apache/pig/test/utils/MultiLevelDerivedUDF1.java
similarity index 100%
rename from test/org/apache/pig/test/utils/MultiLevelDerivedUDF1.java
rename to pig/test/org/apache/pig/test/utils/MultiLevelDerivedUDF1.java
diff --git a/test/org/apache/pig/test/utils/MultiLevelDerivedUDF2.java b/pig/test/org/apache/pig/test/utils/MultiLevelDerivedUDF2.java
similarity index 100%
rename from test/org/apache/pig/test/utils/MultiLevelDerivedUDF2.java
rename to pig/test/org/apache/pig/test/utils/MultiLevelDerivedUDF2.java
diff --git a/test/org/apache/pig/test/utils/MultiLevelDerivedUDF3.java b/pig/test/org/apache/pig/test/utils/MultiLevelDerivedUDF3.java
similarity index 100%
rename from test/org/apache/pig/test/utils/MultiLevelDerivedUDF3.java
rename to pig/test/org/apache/pig/test/utils/MultiLevelDerivedUDF3.java
diff --git a/test/org/apache/pig/test/utils/MyUDFReturnMap.java b/pig/test/org/apache/pig/test/utils/MyUDFReturnMap.java
similarity index 100%
rename from test/org/apache/pig/test/utils/MyUDFReturnMap.java
rename to pig/test/org/apache/pig/test/utils/MyUDFReturnMap.java
diff --git a/test/org/apache/pig/test/utils/MyUDFWithoutParameter.java b/pig/test/org/apache/pig/test/utils/MyUDFWithoutParameter.java
similarity index 100%
rename from test/org/apache/pig/test/utils/MyUDFWithoutParameter.java
rename to pig/test/org/apache/pig/test/utils/MyUDFWithoutParameter.java
diff --git a/test/org/apache/pig/test/utils/NewLogicalPlanUtil.java b/pig/test/org/apache/pig/test/utils/NewLogicalPlanUtil.java
similarity index 100%
rename from test/org/apache/pig/test/utils/NewLogicalPlanUtil.java
rename to pig/test/org/apache/pig/test/utils/NewLogicalPlanUtil.java
diff --git a/test/org/apache/pig/test/utils/POCastDummy.java b/pig/test/org/apache/pig/test/utils/POCastDummy.java
similarity index 100%
rename from test/org/apache/pig/test/utils/POCastDummy.java
rename to pig/test/org/apache/pig/test/utils/POCastDummy.java
diff --git a/test/org/apache/pig/test/utils/ReportingUDF.java b/pig/test/org/apache/pig/test/utils/ReportingUDF.java
similarity index 100%
rename from test/org/apache/pig/test/utils/ReportingUDF.java
rename to pig/test/org/apache/pig/test/utils/ReportingUDF.java
diff --git a/test/org/apache/pig/test/utils/ScriptSchemaTestLoader.java b/pig/test/org/apache/pig/test/utils/ScriptSchemaTestLoader.java
similarity index 100%
rename from test/org/apache/pig/test/utils/ScriptSchemaTestLoader.java
rename to pig/test/org/apache/pig/test/utils/ScriptSchemaTestLoader.java
diff --git a/test/org/apache/pig/test/utils/SimpleCustomPartitioner.java b/pig/test/org/apache/pig/test/utils/SimpleCustomPartitioner.java
similarity index 100%
rename from test/org/apache/pig/test/utils/SimpleCustomPartitioner.java
rename to pig/test/org/apache/pig/test/utils/SimpleCustomPartitioner.java
diff --git a/test/org/apache/pig/test/utils/SimpleCustomPartitioner3.java b/pig/test/org/apache/pig/test/utils/SimpleCustomPartitioner3.java
similarity index 100%
rename from test/org/apache/pig/test/utils/SimpleCustomPartitioner3.java
rename to pig/test/org/apache/pig/test/utils/SimpleCustomPartitioner3.java
diff --git a/test/org/apache/pig/test/utils/TestHelper.java b/pig/test/org/apache/pig/test/utils/TestHelper.java
similarity index 100%
rename from test/org/apache/pig/test/utils/TestHelper.java
rename to pig/test/org/apache/pig/test/utils/TestHelper.java
diff --git a/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java b/pig/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java
similarity index 100%
rename from test/org/apache/pig/test/utils/TypeCheckingTestUtil.java
rename to pig/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java
diff --git a/test/org/apache/pig/test/utils/UDFContextTestEvalFunc.java b/pig/test/org/apache/pig/test/utils/UDFContextTestEvalFunc.java
similarity index 100%
rename from test/org/apache/pig/test/utils/UDFContextTestEvalFunc.java
rename to pig/test/org/apache/pig/test/utils/UDFContextTestEvalFunc.java
diff --git a/test/org/apache/pig/test/utils/UDFContextTestEvalFunc2.java b/pig/test/org/apache/pig/test/utils/UDFContextTestEvalFunc2.java
similarity index 100%
rename from test/org/apache/pig/test/utils/UDFContextTestEvalFunc2.java
rename to pig/test/org/apache/pig/test/utils/UDFContextTestEvalFunc2.java
diff --git a/test/org/apache/pig/test/utils/UDFContextTestEvalFunc3.java b/pig/test/org/apache/pig/test/utils/UDFContextTestEvalFunc3.java
similarity index 100%
rename from test/org/apache/pig/test/utils/UDFContextTestEvalFunc3.java
rename to pig/test/org/apache/pig/test/utils/UDFContextTestEvalFunc3.java
diff --git a/test/org/apache/pig/test/utils/UDFContextTestLoader.java b/pig/test/org/apache/pig/test/utils/UDFContextTestLoader.java
similarity index 100%
rename from test/org/apache/pig/test/utils/UDFContextTestLoader.java
rename to pig/test/org/apache/pig/test/utils/UDFContextTestLoader.java
diff --git a/test/org/apache/pig/test/utils/UDFContextTestLoaderWithSignature.java b/pig/test/org/apache/pig/test/utils/UDFContextTestLoaderWithSignature.java
similarity index 100%
rename from test/org/apache/pig/test/utils/UDFContextTestLoaderWithSignature.java
rename to pig/test/org/apache/pig/test/utils/UDFContextTestLoaderWithSignature.java
diff --git a/test/org/apache/pig/test/utils/UPPER.java b/pig/test/org/apache/pig/test/utils/UPPER.java
similarity index 100%
rename from test/org/apache/pig/test/utils/UPPER.java
rename to pig/test/org/apache/pig/test/utils/UPPER.java
diff --git a/test/org/apache/pig/test/utils/URLPARSE.java b/pig/test/org/apache/pig/test/utils/URLPARSE.java
similarity index 100%
rename from test/org/apache/pig/test/utils/URLPARSE.java
rename to pig/test/org/apache/pig/test/utils/URLPARSE.java
diff --git a/test/org/apache/pig/test/utils/WordCount.java b/pig/test/org/apache/pig/test/utils/WordCount.java
similarity index 100%
rename from test/org/apache/pig/test/utils/WordCount.java
rename to pig/test/org/apache/pig/test/utils/WordCount.java
diff --git a/test/org/apache/pig/test/utils/WrongCustomPartitioner.java b/pig/test/org/apache/pig/test/utils/WrongCustomPartitioner.java
similarity index 100%
rename from test/org/apache/pig/test/utils/WrongCustomPartitioner.java
rename to pig/test/org/apache/pig/test/utils/WrongCustomPartitioner.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt b/pig/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt
rename to pig/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt
diff --git a/test/org/apache/pig/test/utils/dotGraph/DotEdge.java b/pig/test/org/apache/pig/test/utils/dotGraph/DotEdge.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/DotEdge.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/DotEdge.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/DotGraph.java b/pig/test/org/apache/pig/test/utils/dotGraph/DotGraph.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/DotGraph.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/DotGraph.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/DotGraphReader.java b/pig/test/org/apache/pig/test/utils/dotGraph/DotGraphReader.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/DotGraphReader.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/DotGraphReader.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/DotNode.java b/pig/test/org/apache/pig/test/utils/dotGraph/DotNode.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/DotNode.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/DotNode.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/ExactKeyMatcher.java b/pig/test/org/apache/pig/test/utils/dotGraph/ExactKeyMatcher.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/ExactKeyMatcher.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/ExactKeyMatcher.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/IncreasingKeyMatcher.java b/pig/test/org/apache/pig/test/utils/dotGraph/IncreasingKeyMatcher.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/IncreasingKeyMatcher.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/IncreasingKeyMatcher.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/NodeMatcher.java b/pig/test/org/apache/pig/test/utils/dotGraph/NodeMatcher.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/NodeMatcher.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/NodeMatcher.java
diff --git a/test/org/apache/pig/test/utils/dotGraph/OperatorPlanLoader.java b/pig/test/org/apache/pig/test/utils/dotGraph/OperatorPlanLoader.java
similarity index 100%
rename from test/org/apache/pig/test/utils/dotGraph/OperatorPlanLoader.java
rename to pig/test/org/apache/pig/test/utils/dotGraph/OperatorPlanLoader.java
diff --git a/test/org/apache/pig/test/utils/planComparer/PlanStructuralComparer.java b/pig/test/org/apache/pig/test/utils/planComparer/PlanStructuralComparer.java
similarity index 100%
rename from test/org/apache/pig/test/utils/planComparer/PlanStructuralComparer.java
rename to pig/test/org/apache/pig/test/utils/planComparer/PlanStructuralComparer.java
diff --git a/test/org/apache/pig/tez/TestSecondarySortTez.java b/pig/test/org/apache/pig/tez/TestSecondarySortTez.java
similarity index 100%
rename from test/org/apache/pig/tez/TestSecondarySortTez.java
rename to pig/test/org/apache/pig/tez/TestSecondarySortTez.java
diff --git a/test/org/apache/pig/tez/TestTezAutoParallelism.java b/pig/test/org/apache/pig/tez/TestTezAutoParallelism.java
similarity index 100%
rename from test/org/apache/pig/tez/TestTezAutoParallelism.java
rename to pig/test/org/apache/pig/tez/TestTezAutoParallelism.java
diff --git a/test/org/apache/pig/tez/TestTezCompiler.java b/pig/test/org/apache/pig/tez/TestTezCompiler.java
similarity index 98%
rename from test/org/apache/pig/tez/TestTezCompiler.java
rename to pig/test/org/apache/pig/tez/TestTezCompiler.java
index fb69c1d..4b403cc 100644
--- a/test/org/apache/pig/tez/TestTezCompiler.java
+++ b/pig/test/org/apache/pig/tez/TestTezCompiler.java
@@ -23,7 +23,6 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.PrintStream;
-import java.util.Map;
import java.util.Properties;
import org.apache.pig.PigConfiguration;
@@ -32,13 +31,10 @@
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
import org.apache.pig.backend.hadoop.executionengine.tez.TezLauncher;
import org.apache.pig.backend.hadoop.executionengine.tez.TezLocalExecType;
-import org.apache.pig.backend.hadoop.executionengine.tez.TezOperPlan;
import org.apache.pig.backend.hadoop.executionengine.tez.TezPlanContainer;
-import org.apache.pig.backend.hadoop.executionengine.tez.TezPlanContainerNode;
import org.apache.pig.backend.hadoop.executionengine.tez.TezPlanContainerPrinter;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.plan.NodeIdGenerator;
-import org.apache.pig.impl.plan.OperatorKey;
import org.apache.pig.test.Util;
import org.apache.pig.test.utils.TestHelper;
import org.junit.AfterClass;
@@ -557,10 +553,6 @@
TezLauncher launcher = new TezLauncher();
pc.inExplain = true;
TezPlanContainer tezPlanContainer = launcher.compile(pp, pc);
- for (Map.Entry<OperatorKey,TezPlanContainerNode> entry : tezPlanContainer.getKeys().entrySet()) {
- TezOperPlan tezPlan = entry.getValue().getNode();
- TezLauncher.optimize(tezPlan, pc);
- }
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos);
diff --git a/test/org/apache/pig/tez/TestTezJobControlCompiler.java b/pig/test/org/apache/pig/tez/TestTezJobControlCompiler.java
similarity index 100%
rename from test/org/apache/pig/tez/TestTezJobControlCompiler.java
rename to pig/test/org/apache/pig/tez/TestTezJobControlCompiler.java
diff --git a/test/org/apache/pig/tez/TestTezLauncher.java b/pig/test/org/apache/pig/tez/TestTezLauncher.java
similarity index 100%
rename from test/org/apache/pig/tez/TestTezLauncher.java
rename to pig/test/org/apache/pig/tez/TestTezLauncher.java
diff --git a/test/org/apache/pig/tools/grunt/TestGruntParser.java b/pig/test/org/apache/pig/tools/grunt/TestGruntParser.java
similarity index 100%
rename from test/org/apache/pig/tools/grunt/TestGruntParser.java
rename to pig/test/org/apache/pig/tools/grunt/TestGruntParser.java
diff --git a/test/pigunit-tests b/pig/test/pigunit-tests
similarity index 100%
rename from test/pigunit-tests
rename to pig/test/pigunit-tests
diff --git a/test/python/streaming/test_controller.py b/pig/test/python/streaming/test_controller.py
similarity index 100%
rename from test/python/streaming/test_controller.py
rename to pig/test/python/streaming/test_controller.py
diff --git a/test/resources/org/apache/pig/test/ClassLoaderSanityCheck.java b/pig/test/resources/org/apache/pig/test/ClassLoaderSanityCheck.java
similarity index 100%
rename from test/resources/org/apache/pig/test/ClassLoaderSanityCheck.java
rename to pig/test/resources/org/apache/pig/test/ClassLoaderSanityCheck.java
diff --git a/test/resources/org/apache/pig/test/RegisteredJarVisibilityLoader.java b/pig/test/resources/org/apache/pig/test/RegisteredJarVisibilityLoader.java
similarity index 100%
rename from test/resources/org/apache/pig/test/RegisteredJarVisibilityLoader.java
rename to pig/test/resources/org/apache/pig/test/RegisteredJarVisibilityLoader.java
diff --git a/test/resources/org/apache/pig/test/RegisteredJarVisibilitySchema.java b/pig/test/resources/org/apache/pig/test/RegisteredJarVisibilitySchema.java
similarity index 100%
rename from test/resources/org/apache/pig/test/RegisteredJarVisibilitySchema.java
rename to pig/test/resources/org/apache/pig/test/RegisteredJarVisibilitySchema.java
diff --git a/test/smoke-tests b/pig/test/smoke-tests
similarity index 100%
rename from test/smoke-tests
rename to pig/test/smoke-tests
diff --git a/test/tez-tests b/pig/test/tez-tests
similarity index 96%
rename from test/tez-tests
rename to pig/test/tez-tests
index e881764..3aa48c1 100644
--- a/test/tez-tests
+++ b/pig/test/tez-tests
@@ -27,9 +27,7 @@
**/TestLimitAdjuster.java
**/TestLimitVariable.java
**/TestMapReduce.java
-**/TestMapSideCogroup.java
**/TestMapReduce2.java
-**/TestMergeJoinOuter.java
**/TestNestedForeach.java
**/TestNewPlanImplicitSplit.java
**/TestParser.java
diff --git a/test/unit-tests b/pig/test/unit-tests
similarity index 100%
rename from test/unit-tests
rename to pig/test/unit-tests
diff --git a/tutorial/build.xml b/pig/tutorial/build.xml
old mode 100755
new mode 100644
similarity index 100%
rename from tutorial/build.xml
rename to pig/tutorial/build.xml
diff --git a/tutorial/data/excite-small.log b/pig/tutorial/data/excite-small.log
old mode 100755
new mode 100644
similarity index 100%
rename from tutorial/data/excite-small.log
rename to pig/tutorial/data/excite-small.log
diff --git a/tutorial/scripts/script1-hadoop.pig b/pig/tutorial/scripts/script1-hadoop.pig
old mode 100755
new mode 100644
similarity index 100%
rename from tutorial/scripts/script1-hadoop.pig
rename to pig/tutorial/scripts/script1-hadoop.pig
diff --git a/tutorial/scripts/script1-local.pig b/pig/tutorial/scripts/script1-local.pig
old mode 100755
new mode 100644
similarity index 100%
rename from tutorial/scripts/script1-local.pig
rename to pig/tutorial/scripts/script1-local.pig
diff --git a/tutorial/scripts/script2-hadoop.pig b/pig/tutorial/scripts/script2-hadoop.pig
old mode 100755
new mode 100644
similarity index 100%
rename from tutorial/scripts/script2-hadoop.pig
rename to pig/tutorial/scripts/script2-hadoop.pig
diff --git a/tutorial/scripts/script2-local.pig b/pig/tutorial/scripts/script2-local.pig
old mode 100755
new mode 100644
similarity index 100%
rename from tutorial/scripts/script2-local.pig
rename to pig/tutorial/scripts/script2-local.pig
diff --git a/tutorial/src/org/apache/pig/tutorial/ExtractHour.java b/pig/tutorial/src/org/apache/pig/tutorial/ExtractHour.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/ExtractHour.java
rename to pig/tutorial/src/org/apache/pig/tutorial/ExtractHour.java
diff --git a/tutorial/src/org/apache/pig/tutorial/NGramGenerator.java b/pig/tutorial/src/org/apache/pig/tutorial/NGramGenerator.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/NGramGenerator.java
rename to pig/tutorial/src/org/apache/pig/tutorial/NGramGenerator.java
diff --git a/tutorial/src/org/apache/pig/tutorial/NonURLDetector.java b/pig/tutorial/src/org/apache/pig/tutorial/NonURLDetector.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/NonURLDetector.java
rename to pig/tutorial/src/org/apache/pig/tutorial/NonURLDetector.java
diff --git a/tutorial/src/org/apache/pig/tutorial/ScoreGenerator.java b/pig/tutorial/src/org/apache/pig/tutorial/ScoreGenerator.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/ScoreGenerator.java
rename to pig/tutorial/src/org/apache/pig/tutorial/ScoreGenerator.java
diff --git a/tutorial/src/org/apache/pig/tutorial/ToLower.java b/pig/tutorial/src/org/apache/pig/tutorial/ToLower.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/ToLower.java
rename to pig/tutorial/src/org/apache/pig/tutorial/ToLower.java
diff --git a/tutorial/src/org/apache/pig/tutorial/TutorialTest.java b/pig/tutorial/src/org/apache/pig/tutorial/TutorialTest.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/TutorialTest.java
rename to pig/tutorial/src/org/apache/pig/tutorial/TutorialTest.java
diff --git a/tutorial/src/org/apache/pig/tutorial/TutorialUtil.java b/pig/tutorial/src/org/apache/pig/tutorial/TutorialUtil.java
similarity index 100%
rename from tutorial/src/org/apache/pig/tutorial/TutorialUtil.java
rename to pig/tutorial/src/org/apache/pig/tutorial/TutorialUtil.java
diff --git a/contrib/CHANGES.txt b/piggybank/CHANGES.txt
similarity index 100%
rename from contrib/CHANGES.txt
rename to piggybank/CHANGES.txt
diff --git a/contrib/piggybank/java/build.xml b/piggybank/build.xml
old mode 100755
new mode 100644
similarity index 100%
rename from contrib/piggybank/java/build.xml
rename to piggybank/build.xml
diff --git a/piggybank/pom.xml b/piggybank/pom.xml
new file mode 100644
index 0000000..53ecc61
--- /dev/null
+++ b/piggybank/pom.xml
@@ -0,0 +1,181 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<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.apache.pig</groupId>
+ <artifactId>pig-main</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>piggybank</artifactId>
+ <packaging>jar</packaging>
+ <version>0.14.0-SNAPSHOT</version>
+
+ <properties>
+ <name>piggybank</name>
+
+ <!--Test Configurations-->
+ <skipTests>true</skipTests>
+ <test.extra.path></test.extra.path>
+ <test.exec.type>mr</test.exec.type>
+ <ssh.gateway></ssh.gateway>
+ <hod.server></hod.server>
+ <debugArgs></debugArgs>
+ <test.junit.output.format>plain</test.junit.output.format>
+
+ <test.log.dir>${basedir}/target</test.log.dir>
+ <test.timeout>7200000</test.timeout>
+
+ </properties>
+
+ <profiles>
+
+ <profile>
+ <id>hadoop1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <hadoopversion>20</hadoopversion>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>hadoop2</id>
+ <properties>
+ <hadoopversion>23</hadoopversion>
+ </properties>
+ </profile>
+
+ </profiles>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <outputDirectory>${basedir}</outputDirectory>
+ <finalName>${name}</finalName>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.17</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+
+ <reuseForks>false</reuseForks>
+
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.basedir}/piggybank.jar</additionalClasspathElement>
+ <additionalClasspathElement>${project.basedir}/</additionalClasspathElement>
+ <additionalClasspathElement>${project.basedir}/build/classes</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}</additionalClasspathElement>
+ </additionalClasspathElements>
+
+ <printSummary>true</printSummary>
+
+ <environmentVariables>
+ <PATH>${env.PATH}${test.extra.path}</PATH>
+ <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+ </environmentVariables>
+
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/build/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>${project.basedir}/</directory>
+ <includes>
+ <include>${name}.jar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/ExtremalTupleByNthField.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/ExtremalTupleByNthField.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/ExtremalTupleByNthField.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/ExtremalTupleByNthField.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsDouble.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsDouble.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsDouble.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsDouble.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsFloat.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsFloat.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsFloat.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsFloat.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsInt.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsInt.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsInt.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsInt.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsLong.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsLong.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsLong.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsLong.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsNumeric.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsNumeric.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/IsNumeric.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/IsNumeric.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/MaxTupleBy1stField.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/MaxTupleBy1stField.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/MaxTupleBy1stField.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/MaxTupleBy1stField.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/Over.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/Over.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/Over.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/Over.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/Stitch.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/Stitch.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/Stitch.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/Stitch.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/DiffDate.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/DiffDate.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/DiffDate.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/DiffDate.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/CustomFormatToISO.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/CustomFormatToISO.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/CustomFormatToISO.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/CustomFormatToISO.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/ISOToUnix.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/ISOToUnix.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/ISOToUnix.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/ISOToUnix.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/UnixToISO.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/UnixToISO.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/UnixToISO.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/convert/UnixToISO.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISODaysBetween.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISODaysBetween.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISODaysBetween.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISODaysBetween.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOHoursBetween.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOHoursBetween.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOHoursBetween.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOHoursBetween.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMinutesBetween.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMinutesBetween.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMinutesBetween.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMinutesBetween.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMonthsBetween.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMonthsBetween.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMonthsBetween.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOMonthsBetween.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOSecondsBetween.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOSecondsBetween.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOSecondsBetween.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOSecondsBetween.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOYearsBetween.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOYearsBetween.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOYearsBetween.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/diff/ISOYearsBetween.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOHelper.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOHelper.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOHelper.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOHelper.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToDay.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToDay.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToDay.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToDay.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToHour.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToHour.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToHour.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToHour.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMinute.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMinute.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMinute.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMinute.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMonth.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMonth.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMonth.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToMonth.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToSecond.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToSecond.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToSecond.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToSecond.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToWeek.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToWeek.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToWeek.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToWeek.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToYear.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToYear.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToYear.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/datetime/truncate/ISOToYear.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/decode/Bin.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/decode/Bin.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/decode/Bin.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/decode/Bin.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/decode/BinCond.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/decode/BinCond.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/decode/BinCond.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/decode/BinCond.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/decode/Decode.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/decode/Decode.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/decode/Decode.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/decode/Decode.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ABS.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ACOS.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ACOS.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ACOS.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ACOS.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ASIN.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ASIN.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ASIN.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ASIN.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN2.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN2.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN2.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ATAN2.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Base.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/Base.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Base.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/Base.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/CBRT.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/CBRT.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/CBRT.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/CBRT.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/CEIL.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/CEIL.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/CEIL.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/CEIL.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/COS.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/COS.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/COS.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/COS.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/COSH.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/COSH.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/COSH.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/COSH.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleAbs.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleBase.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleCopySign.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleDoubleBase.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleGetExponent.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMax.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleMin.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextAfter.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleNextup.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleRound.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleSignum.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/DoubleUlp.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/EXP.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/EXP.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/EXP.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/EXP.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/EXPM1.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/EXPM1.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/EXPM1.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/EXPM1.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FLOOR.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FLOOR.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FLOOR.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FLOOR.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatAbs.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatCopySign.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatGetExponent.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMax.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatMin.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextAfter.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatNextup.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatRound.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatSignum.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/FloatUlp.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/HYPOT.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/HYPOT.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/HYPOT.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/HYPOT.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IEEEremainder.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IEEEremainder.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IEEEremainder.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IEEEremainder.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IntAbs.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMax.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/IntMin.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG10.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG10.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG10.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG10.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG1P.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG1P.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG1P.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LOG1P.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LongAbs.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMax.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/LongMin.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/MAX.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/MIN.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/NEXTUP.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/POW.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/POW.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/POW.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/POW.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/RANDOM.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/RANDOM.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/RANDOM.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/RANDOM.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/RINT.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/RINT.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/RINT.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/RINT.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ROUND.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SCALB.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SIGNUM.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIN.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SIN.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SIN.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SIN.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SINH.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SINH.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SINH.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SINH.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SQRT.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SQRT.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/SQRT.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/SQRT.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/TAN.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/TAN.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/TAN.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/TAN.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/TANH.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/TANH.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/TANH.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/TANH.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/ULP.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/Util.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/copySign.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/getExponent.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/nextAfter.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/toDegrees.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/toDegrees.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/toDegrees.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/toDegrees.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/toRadians.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/toRadians.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/math/toRadians.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/math/toRadians.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/stats/COR.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/stats/COV.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV1.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV1.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV1.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV1.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV2.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV2.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV2.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/HashFNV2.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/INDEXOF.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/INDEXOF.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/INDEXOF.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/INDEXOF.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LASTINDEXOF.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LASTINDEXOF.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LASTINDEXOF.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LASTINDEXOF.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LENGTH.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LENGTH.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LENGTH.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LENGTH.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LOWER.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LOWER.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LOWER.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LOWER.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LcFirst.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LcFirst.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LcFirst.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LcFirst.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LookupInFiles.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LookupInFiles.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/LookupInFiles.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/LookupInFiles.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/REPLACE.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/REPLACE.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/REPLACE.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/REPLACE.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtract.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtract.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtract.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtract.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtractAll.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtractAll.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtractAll.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexExtractAll.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexMatch.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexMatch.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexMatch.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/RegexMatch.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Reverse.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Reverse.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Reverse.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Reverse.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/SUBSTRING.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/SUBSTRING.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/SUBSTRING.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/SUBSTRING.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Split.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Split.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Split.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Split.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Stuff.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Stuff.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Stuff.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Stuff.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Trim.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Trim.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/Trim.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/Trim.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/UPPER.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/UPPER.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/UPPER.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/UPPER.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/UcFirst.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/UcFirst.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/string/UcFirst.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/string/UcFirst.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/SearchQuery.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/SearchQuery.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/SearchQuery.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/SearchQuery.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/ToBag.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/ToBag.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/ToBag.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/ToBag.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/ToTuple.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/ToTuple.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/ToTuple.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/ToTuple.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/Top.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/Top.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/Top.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/Top.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/HostExtractor.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchEngineExtractor.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/SearchTermExtractor.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/xml/XPath.java b/piggybank/src/main/java/org/apache/pig/piggybank/evaluation/xml/XPath.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/xml/XPath.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/evaluation/xml/XPath.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/AllLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/AllLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/AllLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/AllLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/CSVExcelStorage.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/CSVLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/CSVLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/CSVLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/DBStorage.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/DBStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/DBStorage.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/DBStorage.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/FixedWidthLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/FixedWidthLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/FixedWidthLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/FixedWidthLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/FixedWidthStorer.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/FixedWidthStorer.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/FixedWidthStorer.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/FixedWidthStorer.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarStorage.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarStorage.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/HiveColumnarStorage.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/IndexedStorage.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/IndexedStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/IndexedStorage.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/IndexedStorage.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/JsonMetadata.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/JsonMetadata.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/JsonMetadata.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/JsonMetadata.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/MultiStorage.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MyRegExLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/MyRegExLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/MyRegExLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/MyRegExLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/PigStorageSchema.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/RegExLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/RegExLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/RegExLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/RegExLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/SequenceFileLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/SequenceFileLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/SequenceFileLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/SequenceFileLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/XMLLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/XMLLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/XMLLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/XMLLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/allloader/LoadFuncHelper.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/allloader/LoadFuncHelper.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/allloader/LoadFuncHelper.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/allloader/LoadFuncHelper.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/apachelog/CombinedLogLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/apachelog/CombinedLogLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/apachelog/CombinedLogLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/apachelog/CombinedLogLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/apachelog/CommonLogLoader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/apachelog/CommonLogLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/apachelog/CommonLogLoader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/apachelog/CommonLogLoader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchema2Pig.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchema2Pig.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchema2Pig.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchema2Pig.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchemaManager.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchemaManager.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchemaManager.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroSchemaManager.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageInputStream.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageInputStream.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageInputStream.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageInputStream.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageLog.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageLog.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageLog.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageLog.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageUtils.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageUtils.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageUtils.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorageUtils.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumReader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumReader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumReader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumReader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumWriter.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumWriter.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumWriter.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroDatumWriter.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroInputFormat.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroInputFormat.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroInputFormat.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroInputFormat.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroOutputFormat.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroOutputFormat.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroOutputFormat.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroOutputFormat.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordReader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordReader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordReader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordReader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordWriter.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordWriter.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordWriter.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigAvroRecordWriter.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigSchema2Avro.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigSchema2Avro.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/PigSchema2Avro.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/avro/PigSchema2Avro.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCInputFormat.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCInputFormat.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCInputFormat.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCInputFormat.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCOutputFormat.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCOutputFormat.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCOutputFormat.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCOutputFormat.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCRecordReader.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCRecordReader.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCRecordReader.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCRecordReader.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCSchemaUtil.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCSchemaUtil.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCSchemaUtil.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/hiverc/HiveRCSchemaUtil.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitionHelper.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitionHelper.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitionHelper.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitionHelper.java
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitioner.java b/piggybank/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitioner.java
similarity index 100%
rename from contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitioner.java
rename to piggybank/src/main/java/org/apache/pig/piggybank/storage/partition/PathPartitioner.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/evaluation/TestOver.java b/piggybank/src/test/java/org/apache/pig/piggybank/evaluation/TestOver.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/evaluation/TestOver.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/evaluation/TestOver.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/evaluation/TestStitch.java b/piggybank/src/test/java/org/apache/pig/piggybank/evaluation/TestStitch.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/evaluation/TestStitch.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/evaluation/TestStitch.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_conf.xml b/piggybank/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_conf.xml
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_conf.xml
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_conf.xml
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_user_PigLatinTest.pig b/piggybank/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_user_PigLatinTest.pig
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_user_PigLatinTest.pig
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_201004271216_9998_user_PigLatinTest.pig
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_conf.xml b/piggybank/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_conf.xml
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_conf.xml
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/data/jh/localhost_1272395783545_job_conf.xml
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestEvalString.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestEvalString.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestEvalString.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestEvalString.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestExtremalTupleByNthField.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestExtremalTupleByNthField.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestExtremalTupleByNthField.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestExtremalTupleByNthField.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsDouble.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsDouble.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsDouble.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsDouble.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsFloat.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsFloat.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsFloat.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsFloat.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsInt.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsInt.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsInt.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsInt.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsLong.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsLong.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsLong.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsLong.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsNumeric.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsNumeric.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsNumeric.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestIsNumeric.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestMathUDF.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestMathUDF.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestMathUDF.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestMathUDF.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestStat.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestStat.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/TestStat.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/TestStat.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/TestDiffDate.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/TestDiffDate.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/TestDiffDate.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/TestDiffDate.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/convert/TestConvertDateTime.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/convert/TestConvertDateTime.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/convert/TestConvertDateTime.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/convert/TestConvertDateTime.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/diff/TestDiffDateTime.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/diff/TestDiffDateTime.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/diff/TestDiffDateTime.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/diff/TestDiffDateTime.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/truncate/TestTruncateDateTime.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/truncate/TestTruncateDateTime.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/truncate/TestTruncateDateTime.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/datetime/truncate/TestTruncateDateTime.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/decode/TestDecode.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/decode/TestDecode.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/decode/TestDecode.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/decode/TestDecode.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestHashFNV.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestHashFNV.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestHashFNV.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestHashFNV.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLength.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLength.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLength.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLength.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLookupInFiles.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLookupInFiles.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLookupInFiles.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestLookupInFiles.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestRegex.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestRegex.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestRegex.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestRegex.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReverse.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReverse.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReverse.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReverse.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestSplit.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestSplit.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestSplit.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestSplit.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestStuff.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestStuff.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestStuff.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestStuff.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestUcFirst.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestUcFirst.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestUcFirst.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestUcFirst.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestSearchQuery.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestSearchQuery.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestSearchQuery.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestSearchQuery.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestTop.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestTop.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestTop.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestTop.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestHostExtractor.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestHostExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestHostExtractor.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestHostExtractor.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchEngineExtractor.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchEngineExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchEngineExtractor.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchEngineExtractor.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchTermExtractor.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchTermExtractor.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchTermExtractor.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestSearchTermExtractor.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/xml/XPathTest.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/xml/XPathTest.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/xml/XPathTest.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/evaluation/xml/XPathTest.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestAllLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVExcelStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCSVStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCombinedLogLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCombinedLogLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCombinedLogLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCombinedLogLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCommonLogLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCommonLogLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestCommonLogLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestCommonLogLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestDBStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestDBStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestDBStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestDBStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHadoopJobHistoryLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHadoopJobHistoryLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHadoopJobHistoryLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHadoopJobHistoryLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHelper.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHelper.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHelper.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHelper.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestHiveColumnarStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestLoadFuncHelper.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestLoadFuncHelper.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestLoadFuncHelper.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestLoadFuncHelper.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorageCompression.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorageCompression.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorageCompression.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestMultiStorageCompression.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMyRegExLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestMyRegExLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestMyRegExLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestMyRegExLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitionHelper.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitionHelper.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitionHelper.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitionHelper.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitioner.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitioner.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitioner.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestPathPartitioner.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestRegExLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestRegExLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestRegExLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestRegExLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestSequenceFileLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestSequenceFileLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestSequenceFileLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestSequenceFileLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestXMLLoader.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestXMLLoader.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestXMLLoader.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/TestXMLLoader.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorage.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorage.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorage.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorage.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorageUtils.java b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorageUtils.java
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorageUtils.java
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/TestAvroStorageUtils.java
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_array.avsc b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_array.avsc
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_array.avsc
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_array.avsc
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.avsc b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.avsc
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.avsc
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.avsc
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.txt b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.txt
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.txt
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_record.txt
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_recursive_record_in_union.avsc b/piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_recursive_record_in_union.avsc
similarity index 100%
rename from contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_recursive_record_in_union.avsc
rename to piggybank/src/test/java/org/apache/pig/piggybank/test/storage/avro/avro_test_files/test_recursive_record_in_union.avsc
diff --git a/test/perf/pigmix/bin/generate_data.sh b/pigmix/bin/generate_data.sh
similarity index 100%
rename from test/perf/pigmix/bin/generate_data.sh
rename to pigmix/bin/generate_data.sh
diff --git a/test/perf/pigmix/bin/runpigmix.pl b/pigmix/bin/runpigmix.pl
similarity index 100%
rename from test/perf/pigmix/bin/runpigmix.pl
rename to pigmix/bin/runpigmix.pl
diff --git a/test/perf/pigmix/build.xml b/pigmix/build.xml
similarity index 100%
rename from test/perf/pigmix/build.xml
rename to pigmix/build.xml
diff --git a/test/perf/pigmix/conf/config.sh b/pigmix/conf/config.sh
similarity index 100%
rename from test/perf/pigmix/conf/config.sh
rename to pigmix/conf/config.sh
diff --git a/pigmix/pom.xml b/pigmix/pom.xml
new file mode 100644
index 0000000..7ac4566
--- /dev/null
+++ b/pigmix/pom.xml
@@ -0,0 +1,222 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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.apache.pig</groupId>
+ <artifactId>pig-main</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>pigmix</artifactId>
+ <packaging>jar</packaging>
+ <version>0.14.0-SNAPSHOT</version>
+
+ <properties>
+ <name>pigmix</name>
+
+ <java.dir>${basedir}/src/java</java.dir>
+ <pigmix.build.dir>${basedir}/build</pigmix.build.dir>
+ <pigmix.jar>${basedir}/pigmix.jar</pigmix.jar>
+
+ <harness.cluster.conf>${harness.hadoop.home}/conf</harness.cluster.conf>
+
+ <!--Test Configurations-->
+ <test.extra.path></test.extra.path>
+ <test.exec.type>mr</test.exec.type>
+ <ssh.gateway></ssh.gateway>
+ <hod.server></hod.server>
+ <debugArgs><!-- -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y --></debugArgs>
+ <test.junit.output.format>plain</test.junit.output.format>
+
+ <test.log.dir>${basedir}/target</test.log.dir>
+ <test.timeout>7200000</test.timeout>
+
+ </properties>
+
+ <profiles>
+
+ <profile>
+ <id>hadoop1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <hadoopversion>20</hadoopversion>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>hadoop2</id>
+ <properties>
+ <hadoopversion>23</hadoopversion>
+ </properties>
+ </profile>
+
+ </profiles>
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-dependencies</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <includeGroupIds>sdsu</includeGroupIds>
+ <includeArtifactIds>sdsu</includeArtifactIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <!-- Running the test script -->
+ <id>test</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>perl</executable>
+ <!-- optional -->
+ <workingDirectory>${basedir}</workingDirectory>
+ <arguments>
+ <argument>${basedir}/bin/runpigmix.pl</argument>
+ <argument>${basedir}/../pig</argument>
+ <argument>${basedir}/../pig/bin/pig</argument>
+ <argument>${basedir}/pigmix.jar</argument>
+ <argument>${harness.hadoop.home}</argument>
+ <argument>${harness.hadoop.home}/bin/hadoop</argument>
+ <argument>${basedir}/src/pig</argument>
+ <argument>/user/pig/tests/data/pigmix</argument>
+ <argument>output</argument>
+ <argument>40</argument>
+ <argument>1</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>pigmix.jar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <outputDirectory>${basedir}</outputDirectory>
+ <finalName>${name}</finalName>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+
+ <requireProperty>
+ <property>harness.hadoop.home</property>
+ <message>ERROR - Please set the property harness.hadoop.home to HADOOP_HOME, make sure ${harness.hadoop.home}/bin/hadoop exists.</message>
+ </requireProperty>
+
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <!-- Dummy values are used for groupId and artifactId -->
+ <dependency>
+ <groupId>sdsu</groupId>
+ <artifactId>sdsu</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/sdsuLibJKD12.jar</systemPath>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/datagen/DataGenerator.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/datagen/DataGenerator.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/datagen/DataGenerator.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/datagen/DataGenerator.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L1.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L1.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L1.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L1.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L10.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L10.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L10.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L10.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L11.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L11.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L11.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L11.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L12.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L12.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L12.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L12.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L13.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L13.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L13.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L13.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L14.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L14.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L14.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L14.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L15.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L15.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L15.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L15.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L16.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L16.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L16.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L16.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L17.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L17.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L17.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L17.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L2.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L2.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L2.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L2.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L3.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L3.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L3.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L3.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L4.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L4.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L4.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L4.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L5.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L5.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L5.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L5.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L6.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L6.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L6.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L6.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L7.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L7.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L7.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L7.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L8.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L8.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L8.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L8.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L9.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L9.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/L9.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/L9.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/Library.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/Library.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/mapreduce/Library.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/mapreduce/Library.java
diff --git a/test/perf/pigmix/src/java/org/apache/pig/test/pigmix/udf/PigPerformanceLoader.java b/pigmix/src/main/java/org/apache/pig/test/pigmix/udf/PigPerformanceLoader.java
similarity index 100%
rename from test/perf/pigmix/src/java/org/apache/pig/test/pigmix/udf/PigPerformanceLoader.java
rename to pigmix/src/main/java/org/apache/pig/test/pigmix/udf/PigPerformanceLoader.java
diff --git a/test/perf/pigmix/src/pig/L1.pig b/pigmix/src/pig/L1.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L1.pig
rename to pigmix/src/pig/L1.pig
diff --git a/test/perf/pigmix/src/pig/L10.pig b/pigmix/src/pig/L10.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L10.pig
rename to pigmix/src/pig/L10.pig
diff --git a/test/perf/pigmix/src/pig/L11.pig b/pigmix/src/pig/L11.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L11.pig
rename to pigmix/src/pig/L11.pig
diff --git a/test/perf/pigmix/src/pig/L12.pig b/pigmix/src/pig/L12.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L12.pig
rename to pigmix/src/pig/L12.pig
diff --git a/test/perf/pigmix/src/pig/L13.pig b/pigmix/src/pig/L13.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L13.pig
rename to pigmix/src/pig/L13.pig
diff --git a/test/perf/pigmix/src/pig/L14.pig b/pigmix/src/pig/L14.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L14.pig
rename to pigmix/src/pig/L14.pig
diff --git a/test/perf/pigmix/src/pig/L15.pig b/pigmix/src/pig/L15.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L15.pig
rename to pigmix/src/pig/L15.pig
diff --git a/test/perf/pigmix/src/pig/L16.pig b/pigmix/src/pig/L16.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L16.pig
rename to pigmix/src/pig/L16.pig
diff --git a/test/perf/pigmix/src/pig/L17.pig b/pigmix/src/pig/L17.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L17.pig
rename to pigmix/src/pig/L17.pig
diff --git a/test/perf/pigmix/src/pig/L2.pig b/pigmix/src/pig/L2.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L2.pig
rename to pigmix/src/pig/L2.pig
diff --git a/test/perf/pigmix/src/pig/L3.pig b/pigmix/src/pig/L3.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L3.pig
rename to pigmix/src/pig/L3.pig
diff --git a/test/perf/pigmix/src/pig/L4.pig b/pigmix/src/pig/L4.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L4.pig
rename to pigmix/src/pig/L4.pig
diff --git a/test/perf/pigmix/src/pig/L5.pig b/pigmix/src/pig/L5.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L5.pig
rename to pigmix/src/pig/L5.pig
diff --git a/test/perf/pigmix/src/pig/L6.pig b/pigmix/src/pig/L6.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L6.pig
rename to pigmix/src/pig/L6.pig
diff --git a/test/perf/pigmix/src/pig/L7.pig b/pigmix/src/pig/L7.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L7.pig
rename to pigmix/src/pig/L7.pig
diff --git a/test/perf/pigmix/src/pig/L8.pig b/pigmix/src/pig/L8.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L8.pig
rename to pigmix/src/pig/L8.pig
diff --git a/test/perf/pigmix/src/pig/L9.pig b/pigmix/src/pig/L9.pig
similarity index 100%
rename from test/perf/pigmix/src/pig/L9.pig
rename to pigmix/src/pig/L9.pig
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3d3728a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,1673 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<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.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ </parent>
+
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig-main</artifactId>
+ <packaging>pom</packaging>
+ <version>0.14.0-SNAPSHOT</version>
+
+
+ <modules>
+ <module>pig</module>
+ <module>piggybank</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>repo.apache.snapshots</id>
+ <url>http://repository.apache.org/content/groups/snapshots-group/</url>
+ </repository>
+ <repository>
+ <id>repo.jboss.org</id>
+ <url>http://repository.jboss.com/nexus/content/groups/public/</url>
+ </repository>
+ </repositories>
+
+ <properties>
+
+ <!--<distMgmtSnapshotsUrl>file:///Users/Vimuth/Desktop/temp</distMgmtSnapshotsUrl>-->
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>MMM dd yyyy, HH:mm:ss</maven.build.timestamp.format>
+
+ <!-- These two properties are used when deploying pigunit and smoke-tests -->
+ <distrepositoryUrl>${project.distributionManagement.snapshotRepository.url}</distrepositoryUrl>
+ <distrepositoryId>${project.distributionManagement.snapshotRepository.id}</distrepositoryId>
+
+ <lib.dir>${basedir}/lib</lib.dir>
+
+ <!-- Dependency versions(sorted in alphabetical order)-->
+ <accumulo15.version>1.5.0</accumulo15.version>
+ <apacherat.version>0.8</apacherat.version>
+ <automaton.version>1.11-8</automaton.version>
+ <avro.version>1.7.5</avro.version>
+ <commons-beanutils.version>1.7.0</commons-beanutils.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <commons-codec.version>1.4</commons-codec.version>
+ <commons-io.version>2.3</commons-io.version>
+ <commons-el.version>1.0</commons-el.version>
+ <commons-logging.version>1.1.1</commons-logging.version>
+ <commons-lang.version>2.4</commons-lang.version>
+ <commons-configuration.version>1.6</commons-configuration.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <commons-collections4.version>4.0</commons-collections4.version>
+ <commons-httpclient.version>3.1</commons-httpclient.version>
+ <commons-math3.version>3.1.1</commons-math3.version>
+ <xmlenc.version>0.52</xmlenc.version>
+ <jersey.version>1.8</jersey.version>
+ <checkstyle.version>4.2</checkstyle.version>
+ <jasper.version>6.1.14</jasper.version>
+ <groovy.version>1.8.6</groovy.version>
+ <guava.version>11.0</guava.version>
+ <jersey-core.version>1.8</jersey-core.version>
+ <hadoop-core.version>1.0.4</hadoop-core.version>
+ <hadoop-test.version>1.0.4</hadoop-test.version>
+ <hadoop-common.version>2.4.0</hadoop-common.version>
+ <hadoop-hdfs.version>2.4.0</hadoop-hdfs.version>
+ <hadoop-mapreduce.version>2.4.0</hadoop-mapreduce.version>
+ <hbase94.version>0.94.1</hbase94.version>
+ <hsqldb.version>1.8.0.10</hsqldb.version>
+ <hive.version>0.14.0-SNAPSHOT</hive.version>
+ <httpcomponents.version>4.1</httpcomponents.version>
+ <jackson.version>1.8.8</jackson.version>
+ <jackson-pig-3039-test.version>1.9.9</jackson-pig-3039-test.version>
+ <javacc.version>4.2</javacc.version>
+ <javax-inject.version>1</javax-inject.version>
+ <jaxb-api.version>2.2.2</jaxb-api.version>
+ <jaxb-impl.version>2.2.3-1</jaxb-impl.version>
+ <jdeb.version>0.8</jdeb.version>
+ <!-- <jdiff.version>1.0.9</jdiff.version> -->
+ <jettison.version>1.3.4</jettison.version>
+ <jetty.version>6.1.26</jetty.version>
+ <jetty-util.version>6.1.26</jetty-util.version>
+ <jline.version>1.0</jline.version>
+ <joda-time.version>2.1</joda-time.version>
+ <jopt.version>4.1</jopt.version>
+ <json-simple.version>1.1</json-simple.version>
+ <junit.version>4.11</junit.version>
+ <jruby.version>1.6.7</jruby.version>
+ <jython.version>2.5.3</jython.version>
+ <rhino.version>1.7R2</rhino.version>
+ <antlr.version>3.4</antlr.version>
+ <stringtemplate.version>4.0.4</stringtemplate.version>
+ <log4j.version>1.2.16</log4j.version>
+ <netty.version>3.2.2.Final</netty.version>
+ <rats-lib.version>0.5.1</rats-lib.version>
+ <slf4j-api.version>1.6.1</slf4j-api.version>
+ <slf4j-log4j12.version>1.6.1</slf4j-log4j12.version>
+ <xerces.version>2.10.0</xerces.version>
+ <xalan.version>2.7.1</xalan.version>
+ <wagon-http.version>1.0-beta-2</wagon-http.version>
+ <zookeeper.version>3.4.5</zookeeper.version>
+ <servlet.version>4.0.6</servlet.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <protobuf-java.version>2.5.0</protobuf-java.version>
+ <high-scale-lib.version>1.1.1</high-scale-lib.version>
+ <metrics-core.version>2.1.2</metrics-core.version>
+ <guice.version>3.0</guice.version>
+ <guice-servlet.version>3.0</guice-servlet.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <jsr311-api.version>1.1.1</jsr311-api.version>
+ <mockito.version>1.8.4</mockito.version>
+ <jansi.version>1.9</jansi.version>
+ <asm.version>3.3.1</asm.version>
+ <snappy.version>1.1.0.1</snappy.version>
+ <tez.version>0.5.0-SNAPSHOT</tez.version>
+ <parquet-pig-bundle.version>1.2.3</parquet-pig-bundle.version>
+ <snappy.version>0.2</snappy.version>
+
+ <!-- has to be set differently for each profile -->
+ <hbase95.version></hbase95.version>
+
+ </properties>
+
+ <build>
+ <plugins>
+ <!-- rat plugin is used to create the release audit reports -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <basedir>${project.basedir}</basedir>>
+ <excludes>
+ <exclude>.svn</exclude>
+ <exclude>.git</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!-- Overriding the source version from 1.4 in apache pom -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>checkstyle</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checkstyle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+
+ <!--Uncomment this and comment the other hbase dependancies to build with hdase 0.94 version -->
+ <!-- <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>0.94.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>0.94.1</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency> -->
+
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase95.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase95.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase95.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase95.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-protocol</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <version>${hbase95.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.cloudera.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ <version>2.00</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons-el.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcomponents.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${accumulo15.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-minicluster</artifactId>
+ <version>${accumulo15.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${jersey-core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty-util.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-log4j12.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>trevni-core</artifactId>
+ <version>${avro.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>trevni-core</artifactId>
+ <version>${avro.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>trevni-avro</artifactId>
+ <version>${avro.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>trevni-avro</artifactId>
+ <version>${avro.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-tools</artifactId>
+ <version>${avro.version}</version>
+ <classifier>nodeps</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>${jopt.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.javacc</groupId>
+ <artifactId>javacc</artifactId>
+ <version>${javacc.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.p.arat</groupId>
+ <artifactId>rat-lib</artifactId>
+ <version>${rats-lib.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>${jansi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda-time.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ <version>${jython.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>${rhino.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>${antlr.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>ST4</artifactId>
+ <version>${stringtemplate.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>dk.brics.automaton</groupId>
+ <artifactId>automaton</artifactId>
+ <version>1.11-8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.high-scale-lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>${high-scale-lib.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.yammer.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics-core.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- for piggybank (move to that pom?) -->
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <scope>compile</scope>
+ <classifier>core</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ <version>${hive.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ <version>${hive.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-common</artifactId>
+ <version>${hive.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-common-secure</artifactId>
+ <version>${hive.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.iq80.snappy</groupId>
+ <artifactId>snappy</artifactId>
+ <version>${snappy.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.vafer</groupId>
+ <artifactId>jdeb</artifactId>
+ <version>${jdeb.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>parquet-pig-bundle</artifactId>
+ <version>${parquet-pig-bundle.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>hadoop1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <properties>
+ <hadoopversion>20</hadoopversion>
+ <output.jarfile.core>${project.build.finalName}-core-h1</output.jarfile.core>
+
+ <!--hbase dependency version -->
+ <hbase95.version>0.96.0-hadoop1</hbase95.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <version>${avro.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop1-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop1-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop-test.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-0.20S</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>hadoop2</id>
+
+ <properties>
+ <hadoopversion>23</hadoopversion>
+ <output.jarfile.core>${project.build.finalName}-core-h2</output.jarfile.core>
+
+ <!--hbase dependency version -->
+ <hbase95.version>0.96.0-hadoop2</hbase95.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop2-compat</artifactId>
+ <version>${hbase95.version}</version>
+ <classifier>tests</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-common.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ <version>${xmlenc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-bundle</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax-inject.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>${guice-servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-guice</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop-hdfs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop-hdfs.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-app</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-shuffle</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-api</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-common</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-common</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-client</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <version>${hadoop-mapreduce.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <version>${avro.version}</version>
+ <classifier>hadoop2</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>${jasper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ <version>${jasper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive.shims</groupId>
+ <artifactId>hive-shims-0.23</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+
+ <!-- Tez dependancies-->
+
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-common</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-api</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-dag</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-runtime-internals</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-runtime-library</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-mapreduce</artifactId>
+ <version>${tez.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>${commons-math3.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ </profile>
+
+ <!-- This profile should be used when deploying files to the ASF Staging repo -->
+ <profile>
+ <id>staging</id>
+ <properties>
+ <distrepositoryUrl>${project.distributionManagement.repository.url}</distrepositoryUrl>
+ <distrepositoryId>${project.distributionManagement.repository.url}</distrepositoryId>
+ </properties>
+ </profile>
+
+ <!-- This profile will be activated when the Apache Release Plugin is being run -->
+ <profile>
+ <id>apache-release</id>
+ <properties>
+ <distrepositoryUrl>${project.distributionManagement.repository.url}</distrepositoryUrl>
+ <distrepositoryId>${project.distributionManagement.repository.url}</distrepositoryId>
+ </properties>
+ </profile>
+
+ </profiles>
+
+</project>
