diff --git a/CHANGES.txt b/CHANGES.txt
index 204c7e30d25..15ff50d4f46 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -184,6 +184,10 @@ Other Changes
 
  9. SOLR-819: Upgraded to Lucene 2.9-dev (r724059) to get access to Arabic public constructors (gsingers)
 
+10. SOLR-900: Moved solrj into /src/solrj.  The contents of solr-common.jar is now included
+    in the solr-solrj.jar. (ryan)
+
+
 Build
 ----------------------
  1. SOLR-776: Added in ability to sign artifacts via Ant for releases (gsingers)
diff --git a/build.xml b/build.xml
index 3f1b647ddc7..9879883ca98 100644
--- a/build.xml
+++ b/build.xml
@@ -97,18 +97,6 @@
   <!-- ===================== COMPILATION-RELATED TASKS ========================= -->
   <!-- ========================================================================= -->
 
-  <!-- Compile common classes. -->
-  <target name="compile-common"
-          description="Compile the source code."
-          depends="init-forrest-entities">
-
-    <solr-javac destdir="${dest}/common"
-                classpathref="compile.classpath">
-      <src path="${src}/java" />
-      <include name="org/apache/solr/common/**" />
-    </solr-javac>
-  </target>
-
   <!-- The compilation classpath -->
   <path id="compile.classpath">
     <fileset dir="${lib}">
@@ -117,64 +105,81 @@
     <pathelement location="${dest}/common"/>
   </path>
 
-  <!-- Compile the project. -->
-  <target name="compile"
-          description="Compile the source code."
-          depends="compile-common,init-forrest-entities">
+  <target name="compile-solrj"
+          description="Compile the java client."
+          depends="init-forrest-entities">
 
-    <solr-javac destdir="${dest}/core"
-                classpathref="compile.classpath.solrj-embedded">
-      <src path="${src}/java" />
-      <src path="${src}/webapp/src" />
-      <src path="client/java/solrj/src" />
-      <exclude name="org/apache/solr/common/**" />
+    <solr-javac destdir="${dest}/solrj"
+                classpathref="compile.classpath">
+      <src path="${src}/common" />
+      <src path="${src}/solrj" />
     </solr-javac>
   </target>
 
-  <target name="javadoc-core" depends="compile,compile-solrj"  description="Generates javadoc documentation for core.">
+
+  <!-- This depend on all of solr -->
+  <path id="compile.classpath.solrj">
+    <path refid="compile.classpath" />
+    <pathelement location="${dest}/solrj"/>
+    <!-- jetty -->
+    <fileset dir="example/lib">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+    
+  <!-- Compile the project. -->
+  <target name="compile"
+          description="Compile the source code."
+          depends="compile-solrj,init-forrest-entities">
+
+    <solr-javac destdir="${dest}/solr"
+                classpathref="compile.classpath.solrj">
+      <src path="${src}/java" />
+      <src path="${src}/webapp/src" />
+    </solr-javac>
+  </target>
+
+  <target name="javadoc-solrj" depends="compile-solrj" description="Generates solrj javadoc documentation.">
+    <sequential>
+      <mkdir dir="${build.javadoc}/solrj"/>
+
+      <path id="javadoc.classpath">
+        <path refid="compile.classpath"/>
+      </path>
+
+      <invoke-javadoc
+        destdir="${build.javadoc}/solrj"
+        title="${Name}-j ${version} API (${specversion})">
+        <sources>
+          <packageset dir="${src}/common"/>
+          <packageset dir="${src}/solrj"/>
+        </sources>
+      </invoke-javadoc>
+    </sequential>
+  </target>
+  
+  <target name="javadoc-core" depends="compile"  description="Generates javadoc documentation for core.">
 
     <sequential>
-      <mkdir dir="${build.javadoc}/core"/>
+      <mkdir dir="${build.javadoc}/solr"/>
 
       <path id="javadoc.classpath">
         <path refid="compile.classpath"/>
         <path refid="compile.classpath.solrj"/>
-        <pathelement location="${dest}/client/solrj"/>
+        <pathelement location="${dest}/solrj"/>
       </path>
 
       <invoke-javadoc
-        destdir="${build.javadoc}/core"
+        destdir="${build.javadoc}/solr"
       	title="${Name} ${version} core API (${specversion})">
         <sources>
-          <packageset dir="${src}/java">
-            <exclude name="org/apache/solr/common/**" />
-          </packageset>
+          <packageset dir="${src}/java" />
           <packageset dir="${src}/webapp/src"/>
         </sources>
       </invoke-javadoc>
     </sequential>
   </target>
 
-  <target name="javadoc-common" depends="compile,compile-solrj"  description="Generates javadoc documentation for core.">
-
-    <sequential>
-      <mkdir dir="${build.javadoc}/common"/>
-
-      <path id="javadoc.classpath">
-        <path refid="compile.classpath"/>
-        <path refid="compile.classpath.solrj"/>
-        <pathelement location="${dest}/client/solrj"/>
-      </path>
-
-      <invoke-javadoc
-        destdir="${build.javadoc}/common"
-      	title="${Name} ${version} core API (${specversion})">
-        <sources>
-          <fileset dir="${src}/java" includes="org/apache/solr/common/**" />
-        </sources>
-      </invoke-javadoc>
-    </sequential>
-  </target>
 
   <target name="javadoc-all" description="Generate javadoc for core, client and contrib">
     <sequential>
@@ -183,15 +188,15 @@
       <path id="javadoc.classpath">
          <path refid="compile.classpath"/>
          <path refid="compile.classpath.solrj"/>
-         <path refid="compile.classpath.solrj-embedded"/>
          <pathelement location="${dest}/client/solrj"/>
       </path>
 
       <invoke-javadoc destdir="${build.javadoc}">
         <sources>
+          <packageset dir="${src}/common" />
+          <packageset dir="${src}/solrj" />
           <packageset dir="${src}/java" />
           <packageset dir="${src}/webapp/src" />
-          <packageset dir="${solrj-dir}/src" />
           <packageset dir="contrib/dataimporthandler/src/main/java" />
 
           <group title="Core" packages="org.apache.*" />
@@ -208,7 +213,7 @@
                    failonerror="true"/>
   </target>
 
-  <target name="javadoc" depends="javadoc-core, javadoc-common, javadoc-contrib, javadoc-solrj, javadoc-all">
+  <target name="javadoc" depends="javadoc-core, javadoc-contrib, javadoc-solrj, javadoc-all">
   </target>
 
   <target name="stub-factories" depends="dist-jar"
@@ -298,73 +303,6 @@
   <!-- ===================== CLIENT: solrj         ============================= -->
   <!-- ========================================================================= -->
 
-  <property name="solrj-dir" value="client/java/solrj" />
-
-  <path id="compile.classpath.solrj">
-    <fileset dir="${solrj-dir}/lib">
-      <include name="*.jar" />
-    </fileset>
-    <fileset dir="${lib}">
-      <include name="commons-io-*.jar" />
-      <include name="*stax-*.jar" />
-      <include name="wstx-*.jar" />
-    </fileset>
-    <pathelement location="${dest}/common"/>
-  </path>
-
-  <!-- This depend on all of solr -->
-  <path id="compile.classpath.solrj-embedded">
-    <path refid="compile.classpath.solrj" />
-    <path refid="compile.classpath" />
-    <pathelement location="${dest}/core"/>
-    
-    <!-- jetty -->
-    <fileset dir="example/lib">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-    
-  <target name="compile-solrj-core"
-          description="Compile the java client."
-          depends="compile-common">
-
-    <solr-javac destdir="${dest}/client/solrj"
-                classpathref="compile.classpath.solrj">
-      <src path="${solrj-dir}/src" />
-      <exclude name="org/apache/solr/client/solrj/embedded/**" />
-    </solr-javac>
-  </target>
-
-  <!-- solrj includes the embedded app -->
-  <target name="compile-solrj"
-          description="Compile the java client."
-          depends="compile,compile-solrj-core">
-
-    <solr-javac destdir="${dest}/client/solrj"
-                classpathref="compile.classpath.solrj-embedded">
-      <src path="${solrj-dir}/src/org/apache/solr/client/solrj/embedded" />
-    </solr-javac>
-  </target>
-  
-  
-  <target name="javadoc-solrj" depends="compile-solrj" description="Generates solrj javadoc documentation.">
-    <sequential>
-      <mkdir dir="${build.javadoc}/solrj"/>
-
-      <path id="javadoc.classpath">
-        <path refid="compile.classpath.solrj"/>
-        <path refid="compile.classpath.solrj-embedded"/>
-      </path>
-
-      <invoke-javadoc
-        destdir="${build.javadoc}/solrj"
-      	title="${Name}-j ${version} API (${specversion})">
-        <sources>
-          <packageset dir="${solrj-dir}/src"/>
-        </sources>
-      </invoke-javadoc>
-    </sequential>
-  </target>
   
 
 
@@ -377,11 +315,10 @@
   <!-- For now, it's the same as main classpath.  Later it will have JUnit, Clover, etc. -->
   <path id="test.compile.classpath">
     <path refid="compile.classpath" />
-    <path refid="compile.classpath.solrj-embedded" />
+    <path refid="compile.classpath.solrj" />
       
-    <pathelement location="${dest}/common"/>
-    <pathelement location="${dest}/core"/>
-    <pathelement location="${dest}/client/solrj"/> <!-- include solrj -->
+    <pathelement location="${dest}/solr"/>
+    <pathelement location="${dest}/solrj"/> <!-- include solrj -->
   </path>
 
   <path id="test.run.classpath">
@@ -404,7 +341,6 @@
        destdir="${dest}/tests"
        classpathref="test.compile.classpath">
       <src path="${src}/test" />
-      <src path="${solrj-dir}/test" />
     </solr-javac>
   </target>
 
@@ -433,12 +369,9 @@
       <formatter type="xml"/>
       <batchtest fork="yes" todir="${junit.output.dir}" unless="testcase">
         <fileset dir="src/test" includes="${junit.includes}"/>
-        <!-- this will start jetty and run some tests through HTTP -->
-        <fileset dir="${solrj-dir}/test/" includes="${junit.includes}" />
       </batchtest>
       <batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
         <fileset dir="src/test" includes="**/${testcase}.java"/>
-        <fileset dir="${solrj-dir}/test/" includes="**/${testcase}.java" />
       </batchtest>
     </junit>
 
@@ -463,9 +396,10 @@
     <taskdef resource="clovertasks"/>
     <mkdir dir="${clover.db.dir}"/>
     <clover-setup initString="${clover.db.dir}/solr_coverage.db">
+      <fileset dir="src/common"/>
+      <fileset dir="src/solrj"/>
       <fileset dir="src/java"/>
       <fileset dir="src/webapp/src"/>
-      <fileset dir="${solrj-dir}/src" />
       <fileset dir="contrib/dataimporthandler/src/main/java" />
     </clover-setup>
   </target>
@@ -526,10 +460,9 @@
          <exclude name="easymock.jar" />
        </lib>
        <lib dir="${dist}">
-         <include name="${fullname}-core-${version}.jar" />
-         <include name="${fullname}-common-${version}.jar" />
+         <include name="${fullname}-solrj-${version}.jar" />
+         <include name="${fullname}-${version}.jar" />
        </lib>
-       <lib dir="client/java/solrj/lib"/>
        <fileset dir="${src}/webapp/web" />
        
        <!-- Include anything put in by contrib projects -->
@@ -542,15 +475,17 @@
   <target name="dist-src" description="Creates the Solr source distribution files"
           depends="make-manifest">
     <mkdir dir="${dist}" />
-    
+
+    <solr-jar destfile="${dist}/${fullname}-solrj-src-${version}.jar">
+      <fileset dir="${src}/common" />
+      <fileset dir="${src}/solrj"/>
+    </solr-jar>
+    	
     <solr-jar destfile="${dist}/${fullname}-core-src-${version}.jar">
-      <fileset dir="${src}/java" excludes="org/apache/solr/common/**" />
+      <fileset dir="${src}/java" />
       <fileset dir="${src}/webapp/src"/>
     </solr-jar>
-    <solr-jar destfile="${dist}/${fullname}-common-src-${version}.jar" basedir="${src}/java"
-              includes="org/apache/solr/common/**" />
-    <solr-jar destfile="${dist}/${fullname}-solrj-src-${version}.jar"
-              basedir="client/java/solrj/src" />
+  	
     <solr-jar destfile="${dist}/apache-solr-dataimporthandler-src-${version}.jar"
               basedir="contrib/dataimporthandler/src" />
   </target>
@@ -560,9 +495,7 @@
     <mkdir dir="${dist}" />
 
     <solr-jar destfile="${dist}/${fullname}-core-docs-${version}.jar"
-              basedir="${build.javadoc}/core" />
-    <solr-jar destfile="${dist}/${fullname}-common-docs-${version}.jar"
-              basedir="${build.javadoc}/common"/>
+              basedir="${build.javadoc}/solr" />
     <solr-jar destfile="${dist}/${fullname}-solrj-docs-${version}.jar"
               basedir="${build.javadoc}/solrj" />
     <solr-jar destfile="${dist}/apache-solr-dataimporthandler-docs-${version}.jar"
@@ -574,15 +507,10 @@
           description="Creates the Solr JAR Distribution file."
           depends="compile, make-manifest">
     <mkdir dir="${dist}" />
-    <solr-jar
-         destfile="${dist}/${fullname}-core-${version}.jar"
-         basedir="${dest}/core" />
+    <solr-jar destfile="${dist}/${fullname}-core-${version}.jar">
+      <fileset dir="${dest}/solr" />
+    </solr-jar>
 
-    <!-- package the common classes together -->
-    <solr-jar
-         destfile="${dist}/${fullname}-common-${version}.jar"
-         basedir="${dest}/common" />
-    
   </target>
 
   <!-- Creates the solr jar. -->
@@ -592,18 +520,18 @@
     <mkdir dir="${dist}" />
     <solr-jar
          destfile="${dist}/${fullname}-solrj-${version}.jar"
-         basedir="${dest}/client/solrj" />
+         basedir="${dest}/solrj" />
 
     <mkdir  dir="${dist}/solrj-lib" />
     <copy todir="${dist}/solrj-lib">
       <fileset dir="${lib}">
         <include name="commons-codec-*.jar"/>
         <include name="commons-io-*.jar"/>
+        <include name="commons-httpclient-*.jar"/>
         <include name="*stax-*.jar" />
         <include name="wstx-*.jar" />
-      </fileset>
-      <fileset dir="${solrj-dir}/lib">
-        <include name="*.jar" />
+        <include name="jcl-over-slf4j-*.jar" />
+        <include name="slf4j-api-*.jar" />
       </fileset>
     </copy>
       
@@ -615,7 +543,7 @@
     <copy file="${dist}/${fullnamever}.war"
           tofile="${example}/webapps/${ant.project.name}.war"/>
     <jar destfile="${example}/exampledocs/post.jar"
-         basedir="${dest}/core"
+         basedir="${dest}/solr"
          filesetmanifest="skip"
          includes="org/apache/solr/util/SimplePostTool*.class">
        <manifest>
@@ -818,16 +746,6 @@
 
       <!-- ========== SOLR ARTIFACTS ========== -->
 
-      <m2-deploy pom.xml="${src}/maven/solr-common-pom.xml.template"
-                 jar.file="${dist}/apache-solr-common-${version}.jar">
-
-        <artifact-attachments>
-          <attach file="${dist}/${fullname}-common-src-${version}.jar" classifier="sources"/>
-          <attach file="${dist}/${fullname}-common-docs-${version}.jar" classifier="javadoc"/>
-        </artifact-attachments>
-
-      </m2-deploy>
-
       <m2-deploy pom.xml="contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template"
                  jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
 
@@ -847,7 +765,7 @@
 
       </m2-deploy>
 
-      <m2-deploy pom.xml="client/java/solrj/solr-solrj-pom.xml.template"
+      <m2-deploy pom.xml="${src}/maven/solr-solrj-pom.xml.template"
                  jar.file="${dist}/apache-solr-solrj-${version}.jar">
 
         <artifact-attachments>
@@ -875,6 +793,8 @@
     description="runs the tasks over src/java excluding the license directory">
     <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
       <fileset dir="src/java"/>
+      <fileset dir="src/common"/>
+      <fileset dir="src/solrj"/>
       <fileset dir="client">
         <exclude name="**/CHANGES.*"/>
       </fileset>
diff --git a/client/java/solrj/CHANGES.txt b/client/java/solrj/CHANGES.txt
deleted file mode 100644
index 5c8213fb169..00000000000
--- a/client/java/solrj/CHANGES.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-                    Apache Solr - solrj Version 1.3-dev
-                            Release Notes
-
-Introduction
-------------
-solrj is a java client for the solr search engine.
-
-
-$Id$
-
-================== Release 1.4-dev ==================
-Upgrading from Solr 1.3
------------------------
-
-Detailed Change List
-----------------------
-
-New Features
-----------------------
-
-Optimizations
-----------------------
-
-
-Bug Fixes
-----------------------
-
- 1. SOLR-778: SolrQuery#getFacetMinCount() returns value of facet limit
-              (Kohei Taketa via shalin)
-
- 2. SOLR-779: SolrQuery#setHighlightRequireFieldMatch() should be renamed to
-    SolrQuery#getHighlightRequireFieldMatch()
-    (Kohei Taketa, Lars Kotthoff via koji)
-
- 3. SOLR-794: ClientUtils.escapeQueryChars escapes chars a bit aggressive
-    (ryan, koji)
-
-Documentation
-----------------------
-
-Build
-----------------------
-
- 1. SOLR-787: Changed SolrJ POM to refer to woodstox implementation instead of stax as a dependency
-              (shalin)
-
-
-================== Release 1.3.0 20080915 ==================
-
-Status
-------
-This is the first release since Solrj was added to the main solr distribution.
-The following changes list changes since the code was introduced, not since
-the first official release.
-
-
-Detailed Change List
---------------------
-
-New Features
-
-Changes in runtime behavior
- 1. SOLR-278:  Modify LukeRequest/Response to support SOLR-266 schema display.
-    (Will Johnson via ryan)
-
- 2. SOLR-280: Changed the SolrDocument / SolrInputDocument implementation.  
-    The API to build documents has changed -- you need to pass a boost 
-    (or null) with every field.  (ryan)
-
- 3. SOLR-462: Changes to CommonsHttpSolrServer.java to add soTimeout (read 
-    timeout), connection pool timeout, directive to not follow HTTP redirects, 
-    configurable retries on NoHttpResponseException, compression, and not 
-    creating a new HttpClient on each request.  If your existing code overrides 
-    getHttpConnection(), you will now need to override createHttpClient()
-    (Sean Timm via ryan)
-    
- 4. SOLR-436: To make future changes easier, SolrServer changed from an
-    interface to an abstract super class. (ryan)
-
- 5. SOLR-476: CommonsHttpSolrServer can set the ResponseParser on a per 
-    request basis.  (Grant Ingersoll, ryan)
-
- 6. SOLR-430: Added support for reading SpellCheckComponent's responses. (shalin)
-
- 7. SOLR-718: Support persisting solr.xml through SolrJ (Henri Biestro via shalin)
-
-Bug Fixes
-
-Other Changes
-
- 1. SOLR-653: Since the "overwrite" command will be removed in future versions
-    it has been removed from solrj now -- before anyone starts to rely on it.
-    (ryan)
- 
- 
diff --git a/client/java/solrj/LICENSE.txt b/client/java/solrj/LICENSE.txt
deleted file mode 100644
index 57bc88a15a0..00000000000
--- a/client/java/solrj/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/client/java/solrj/lib/slf4j-api-1.5.5.jar b/client/java/solrj/lib/slf4j-api-1.5.5.jar
deleted file mode 100644
index ffc1fa34ed4..00000000000
--- a/client/java/solrj/lib/slf4j-api-1.5.5.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[4bb4abbb0f75c1bdfb81a44c3a2dd078c1656832] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/client/java/solrj/lib/slf4j-jdk14-1.5.5.jar b/client/java/solrj/lib/slf4j-jdk14-1.5.5.jar
deleted file mode 100644
index 03386fff862..00000000000
--- a/client/java/solrj/lib/slf4j-jdk14-1.5.5.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[d58ef5a16b4ae2aa82cf725d510bd0c8c8d4097f] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/contrib/dataimporthandler/build.xml b/contrib/dataimporthandler/build.xml
index 7858df763fa..92071e8fe8a 100644
--- a/contrib/dataimporthandler/build.xml
+++ b/contrib/dataimporthandler/build.xml
@@ -28,8 +28,8 @@
   </description>
 
   <path id="common.classpath">
-  	<pathelement location="${solr-path}/build/common" />
-  	<pathelement location="${solr-path}/build/core" />
+  	<pathelement location="${solr-path}/build/solr" />
+  	<pathelement location="${solr-path}/build/solrj" />
   	<fileset dir="${solr-path}/lib" includes="*.jar"></fileset>
   </path>
 	
diff --git a/contrib/extraction/build.xml b/contrib/extraction/build.xml
index 32bf658b780..590940899a9 100644
--- a/contrib/extraction/build.xml
+++ b/contrib/extraction/build.xml
@@ -30,8 +30,8 @@
   </description>
 
   <path id="common.classpath">
-    <pathelement location="${solr-path}/build/common" />
-    <pathelement location="${solr-path}/build/core" />
+    <pathelement location="${solr-path}/build/solr" />
+    <pathelement location="${solr-path}/build/solrj" />
     <fileset dir="lib" includes="*.jar"/>
     <fileset dir="${solr-path}/lib" includes="*.jar"></fileset>
   </path>
diff --git a/contrib/velocity/build.xml b/contrib/velocity/build.xml
index a6f9ad38c49..9a3cb49651b 100644
--- a/contrib/velocity/build.xml
+++ b/contrib/velocity/build.xml
@@ -28,8 +28,8 @@
   </description>
 
   <path id="common.classpath">
-  	<pathelement location="${solr-path}/build/common" />
-  	<pathelement location="${solr-path}/build/core" />
+  	<pathelement location="${solr-path}/build/solrj" />
+  	<pathelement location="${solr-path}/build/solr" />
     <fileset dir="src/main/solr/lib" includes="*.jar"/>
     <fileset dir="${solr-path}/lib" includes="*.jar"></fileset>
   </path>
diff --git a/client/java/solrj/lib/commons-httpclient-3.1.jar b/lib/commons-httpclient-3.1.jar
similarity index 100%
rename from client/java/solrj/lib/commons-httpclient-3.1.jar
rename to lib/commons-httpclient-3.1.jar
diff --git a/client/java/solrj/lib/jcl-over-slf4j-1.5.5.jar b/lib/jcl-over-slf4j-1.5.5.jar
similarity index 100%
rename from client/java/solrj/lib/jcl-over-slf4j-1.5.5.jar
rename to lib/jcl-over-slf4j-1.5.5.jar
diff --git a/src/java/org/apache/solr/common/ResourceLoader.java b/src/common/org/apache/solr/common/ResourceLoader.java
similarity index 100%
rename from src/java/org/apache/solr/common/ResourceLoader.java
rename to src/common/org/apache/solr/common/ResourceLoader.java
diff --git a/src/java/org/apache/solr/common/SolrDocument.java b/src/common/org/apache/solr/common/SolrDocument.java
similarity index 100%
rename from src/java/org/apache/solr/common/SolrDocument.java
rename to src/common/org/apache/solr/common/SolrDocument.java
diff --git a/src/java/org/apache/solr/common/SolrDocumentList.java b/src/common/org/apache/solr/common/SolrDocumentList.java
similarity index 100%
rename from src/java/org/apache/solr/common/SolrDocumentList.java
rename to src/common/org/apache/solr/common/SolrDocumentList.java
diff --git a/src/java/org/apache/solr/common/SolrException.java b/src/common/org/apache/solr/common/SolrException.java
similarity index 100%
rename from src/java/org/apache/solr/common/SolrException.java
rename to src/common/org/apache/solr/common/SolrException.java
diff --git a/src/java/org/apache/solr/common/SolrInputDocument.java b/src/common/org/apache/solr/common/SolrInputDocument.java
similarity index 100%
rename from src/java/org/apache/solr/common/SolrInputDocument.java
rename to src/common/org/apache/solr/common/SolrInputDocument.java
diff --git a/src/java/org/apache/solr/common/SolrInputField.java b/src/common/org/apache/solr/common/SolrInputField.java
similarity index 100%
rename from src/java/org/apache/solr/common/SolrInputField.java
rename to src/common/org/apache/solr/common/SolrInputField.java
diff --git a/src/java/org/apache/solr/common/luke/FieldFlag.java b/src/common/org/apache/solr/common/luke/FieldFlag.java
similarity index 100%
rename from src/java/org/apache/solr/common/luke/FieldFlag.java
rename to src/common/org/apache/solr/common/luke/FieldFlag.java
diff --git a/src/java/org/apache/solr/common/params/AppendedSolrParams.java b/src/common/org/apache/solr/common/params/AppendedSolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/AppendedSolrParams.java
rename to src/common/org/apache/solr/common/params/AppendedSolrParams.java
diff --git a/src/java/org/apache/solr/common/params/CommonParams.java b/src/common/org/apache/solr/common/params/CommonParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/CommonParams.java
rename to src/common/org/apache/solr/common/params/CommonParams.java
diff --git a/src/java/org/apache/solr/common/params/CoreAdminParams.java b/src/common/org/apache/solr/common/params/CoreAdminParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/CoreAdminParams.java
rename to src/common/org/apache/solr/common/params/CoreAdminParams.java
diff --git a/src/java/org/apache/solr/common/params/DefaultSolrParams.java b/src/common/org/apache/solr/common/params/DefaultSolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/DefaultSolrParams.java
rename to src/common/org/apache/solr/common/params/DefaultSolrParams.java
diff --git a/src/java/org/apache/solr/common/params/DisMaxParams.java b/src/common/org/apache/solr/common/params/DisMaxParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/DisMaxParams.java
rename to src/common/org/apache/solr/common/params/DisMaxParams.java
diff --git a/src/java/org/apache/solr/common/params/FacetParams.java b/src/common/org/apache/solr/common/params/FacetParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/FacetParams.java
rename to src/common/org/apache/solr/common/params/FacetParams.java
diff --git a/src/java/org/apache/solr/common/params/HighlightParams.java b/src/common/org/apache/solr/common/params/HighlightParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/HighlightParams.java
rename to src/common/org/apache/solr/common/params/HighlightParams.java
diff --git a/src/java/org/apache/solr/common/params/MapSolrParams.java b/src/common/org/apache/solr/common/params/MapSolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/MapSolrParams.java
rename to src/common/org/apache/solr/common/params/MapSolrParams.java
diff --git a/src/java/org/apache/solr/common/params/ModifiableSolrParams.java b/src/common/org/apache/solr/common/params/ModifiableSolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/ModifiableSolrParams.java
rename to src/common/org/apache/solr/common/params/ModifiableSolrParams.java
diff --git a/src/java/org/apache/solr/common/params/MoreLikeThisParams.java b/src/common/org/apache/solr/common/params/MoreLikeThisParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/MoreLikeThisParams.java
rename to src/common/org/apache/solr/common/params/MoreLikeThisParams.java
diff --git a/src/java/org/apache/solr/common/params/MultiMapSolrParams.java b/src/common/org/apache/solr/common/params/MultiMapSolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/MultiMapSolrParams.java
rename to src/common/org/apache/solr/common/params/MultiMapSolrParams.java
diff --git a/src/java/org/apache/solr/common/params/RequiredSolrParams.java b/src/common/org/apache/solr/common/params/RequiredSolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/RequiredSolrParams.java
rename to src/common/org/apache/solr/common/params/RequiredSolrParams.java
diff --git a/src/java/org/apache/solr/common/params/ShardParams.java b/src/common/org/apache/solr/common/params/ShardParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/ShardParams.java
rename to src/common/org/apache/solr/common/params/ShardParams.java
diff --git a/src/java/org/apache/solr/common/params/SolrParams.java b/src/common/org/apache/solr/common/params/SolrParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/SolrParams.java
rename to src/common/org/apache/solr/common/params/SolrParams.java
diff --git a/src/java/org/apache/solr/common/params/SpellingParams.java b/src/common/org/apache/solr/common/params/SpellingParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/SpellingParams.java
rename to src/common/org/apache/solr/common/params/SpellingParams.java
diff --git a/src/java/org/apache/solr/common/params/StatsParams.java b/src/common/org/apache/solr/common/params/StatsParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/StatsParams.java
rename to src/common/org/apache/solr/common/params/StatsParams.java
diff --git a/src/java/org/apache/solr/common/params/TermVectorParams.java b/src/common/org/apache/solr/common/params/TermVectorParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/TermVectorParams.java
rename to src/common/org/apache/solr/common/params/TermVectorParams.java
diff --git a/src/java/org/apache/solr/common/params/TermsParams.java b/src/common/org/apache/solr/common/params/TermsParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/TermsParams.java
rename to src/common/org/apache/solr/common/params/TermsParams.java
diff --git a/src/java/org/apache/solr/common/params/UpdateParams.java b/src/common/org/apache/solr/common/params/UpdateParams.java
similarity index 100%
rename from src/java/org/apache/solr/common/params/UpdateParams.java
rename to src/common/org/apache/solr/common/params/UpdateParams.java
diff --git a/src/java/org/apache/solr/common/util/ConcurrentLRUCache.java b/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/ConcurrentLRUCache.java
rename to src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
diff --git a/src/java/org/apache/solr/common/util/ContentStream.java b/src/common/org/apache/solr/common/util/ContentStream.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/ContentStream.java
rename to src/common/org/apache/solr/common/util/ContentStream.java
diff --git a/src/java/org/apache/solr/common/util/ContentStreamBase.java b/src/common/org/apache/solr/common/util/ContentStreamBase.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/ContentStreamBase.java
rename to src/common/org/apache/solr/common/util/ContentStreamBase.java
diff --git a/src/java/org/apache/solr/common/util/DOMUtil.java b/src/common/org/apache/solr/common/util/DOMUtil.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/DOMUtil.java
rename to src/common/org/apache/solr/common/util/DOMUtil.java
diff --git a/src/java/org/apache/solr/common/util/DateUtil.java b/src/common/org/apache/solr/common/util/DateUtil.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/DateUtil.java
rename to src/common/org/apache/solr/common/util/DateUtil.java
diff --git a/src/java/org/apache/solr/common/util/FastInputStream.java b/src/common/org/apache/solr/common/util/FastInputStream.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/FastInputStream.java
rename to src/common/org/apache/solr/common/util/FastInputStream.java
diff --git a/src/java/org/apache/solr/common/util/FastOutputStream.java b/src/common/org/apache/solr/common/util/FastOutputStream.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/FastOutputStream.java
rename to src/common/org/apache/solr/common/util/FastOutputStream.java
diff --git a/src/java/org/apache/solr/common/util/FastWriter.java b/src/common/org/apache/solr/common/util/FastWriter.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/FastWriter.java
rename to src/common/org/apache/solr/common/util/FastWriter.java
diff --git a/src/java/org/apache/solr/common/util/IteratorChain.java b/src/common/org/apache/solr/common/util/IteratorChain.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/IteratorChain.java
rename to src/common/org/apache/solr/common/util/IteratorChain.java
diff --git a/src/java/org/apache/solr/common/util/NamedList.java b/src/common/org/apache/solr/common/util/NamedList.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/NamedList.java
rename to src/common/org/apache/solr/common/util/NamedList.java
diff --git a/src/java/org/apache/solr/common/util/NamedListCodec.java b/src/common/org/apache/solr/common/util/NamedListCodec.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/NamedListCodec.java
rename to src/common/org/apache/solr/common/util/NamedListCodec.java
diff --git a/src/java/org/apache/solr/common/util/RTimer.java b/src/common/org/apache/solr/common/util/RTimer.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/RTimer.java
rename to src/common/org/apache/solr/common/util/RTimer.java
diff --git a/src/java/org/apache/solr/common/util/SimpleOrderedMap.java b/src/common/org/apache/solr/common/util/SimpleOrderedMap.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/SimpleOrderedMap.java
rename to src/common/org/apache/solr/common/util/SimpleOrderedMap.java
diff --git a/src/java/org/apache/solr/common/util/StrUtils.java b/src/common/org/apache/solr/common/util/StrUtils.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/StrUtils.java
rename to src/common/org/apache/solr/common/util/StrUtils.java
diff --git a/src/java/org/apache/solr/common/util/XML.java b/src/common/org/apache/solr/common/util/XML.java
similarity index 100%
rename from src/java/org/apache/solr/common/util/XML.java
rename to src/common/org/apache/solr/common/util/XML.java
diff --git a/src/maven/solr-common-pom.xml.template b/src/maven/solr-common-pom.xml.template
deleted file mode 100644
index 4239b1c196c..00000000000
--- a/src/maven/solr-common-pom.xml.template
+++ /dev/null
@@ -1,59 +0,0 @@
-<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">
-
-  <!--
-    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.
-  -->
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-parent</artifactId>
-    <version>@maven_version@</version>
-  </parent>
-
-  <groupId>org.apache.solr</groupId>
-  <artifactId>solr-common</artifactId>
-  <name>Apache Solr Common</name>
-  <version>@maven_version@</version>
-  <description>Apache Solr Common</description>
-  <packaging>jar</packaging>
-
-  <dependencies>
-
-    <dependency>
-	    <groupId>org.slf4j</groupId>
-	    <artifactId>slf4j-api</artifactId>
-	    <version>1.5.5</version>
-	  </dependency> 
-	
-	<!--
-	Your app will need an slf4j implementation, it does not matter which one...
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    -->
-
-  </dependencies>
-  
-</project>
diff --git a/client/java/solrj/solr-solrj-pom.xml.template b/src/maven/solr-solrj-pom.xml.template
similarity index 94%
rename from client/java/solrj/solr-solrj-pom.xml.template
rename to src/maven/solr-solrj-pom.xml.template
index 42303fe1bbb..057507d6b1b 100644
--- a/client/java/solrj/solr-solrj-pom.xml.template
+++ b/src/maven/solr-solrj-pom.xml.template
@@ -40,10 +40,10 @@
 
     <!-- Solr -->
     <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-common</artifactId>
-      <version>@maven_version@</version>
-    </dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.5.5</version>
+    </dependency> 
 
     <!-- Apache Commons -->
     <dependency>
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/ResponseParser.java b/src/solrj/org/apache/solr/client/solrj/ResponseParser.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/ResponseParser.java
rename to src/solrj/org/apache/solr/client/solrj/ResponseParser.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java b/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java
rename to src/solrj/org/apache/solr/client/solrj/SolrQuery.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/SolrRequest.java b/src/solrj/org/apache/solr/client/solrj/SolrRequest.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/SolrRequest.java
rename to src/solrj/org/apache/solr/client/solrj/SolrRequest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/SolrResponse.java b/src/solrj/org/apache/solr/client/solrj/SolrResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/SolrResponse.java
rename to src/solrj/org/apache/solr/client/solrj/SolrResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/SolrServer.java b/src/solrj/org/apache/solr/client/solrj/SolrServer.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/SolrServer.java
rename to src/solrj/org/apache/solr/client/solrj/SolrServer.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/SolrServerException.java b/src/solrj/org/apache/solr/client/solrj/SolrServerException.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/SolrServerException.java
rename to src/solrj/org/apache/solr/client/solrj/SolrServerException.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java b/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
rename to src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/beans/Field.java b/src/solrj/org/apache/solr/client/solrj/beans/Field.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/beans/Field.java
rename to src/solrj/org/apache/solr/client/solrj/beans/Field.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/impl/BinaryResponseParser.java b/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
rename to src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java b/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
rename to src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java
rename to src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java
rename to src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java b/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java
rename to src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/request/LukeRequest.java b/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/request/LukeRequest.java
rename to src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/request/QueryRequest.java b/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/request/QueryRequest.java
rename to src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/request/SolrPing.java b/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/request/SolrPing.java
rename to src/solrj/org/apache/solr/client/solrj/request/SolrPing.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java b/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/request/UpdateRequest.java
rename to src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/CoreAdminResponse.java b/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/CoreAdminResponse.java
rename to src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/FacetField.java b/src/solrj/org/apache/solr/client/solrj/response/FacetField.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/FacetField.java
rename to src/solrj/org/apache/solr/client/solrj/response/FacetField.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/FieldStatsInfo.java b/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/FieldStatsInfo.java
rename to src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/LukeResponse.java b/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/LukeResponse.java
rename to src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/QueryResponse.java b/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/QueryResponse.java
rename to src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/SolrPingResponse.java b/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/SolrPingResponse.java
rename to src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/SolrResponseBase.java b/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/SolrResponseBase.java
rename to src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/SpellCheckResponse.java
rename to src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/response/UpdateResponse.java b/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/response/UpdateResponse.java
rename to src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java b/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/util/ClientUtils.java
rename to src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java b/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
rename to src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java b/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
rename to src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java b/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
rename to src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java b/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java
rename to src/test/org/apache/solr/client/solrj/SolrExampleTests.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java
rename to src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java b/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java
rename to src/test/org/apache/solr/client/solrj/SolrQueryTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java b/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java
rename to src/test/org/apache/solr/client/solrj/StartSolrJetty.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java b/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java
rename to src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java b/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java b/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java b/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java b/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java b/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java b/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
rename to src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java b/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
rename to src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/response/QueryResponseTest.java b/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
rename to src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java b/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
rename to src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
diff --git a/client/java/solrj/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java b/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
similarity index 100%
rename from client/java/solrj/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
rename to src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java b/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
rename to src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
diff --git a/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
similarity index 100%
rename from client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
rename to src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java