diff --git a/core/LICENSE.txt b/core/LICENSE.txt
new file mode 100644
index 00000000000..d6456956733
--- /dev/null
+++ b/core/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ 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/core/NOTICE.txt b/core/NOTICE.txt
new file mode 100644
index 00000000000..23cae9e2063
--- /dev/null
+++ b/core/NOTICE.txt
@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2009-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
diff --git a/core/README.textile b/core/README.textile
new file mode 100644
index 00000000000..720f357406b
--- /dev/null
+++ b/core/README.textile
@@ -0,0 +1,235 @@
+h1. Elasticsearch
+
+h2. A Distributed RESTful Search Engine
+
+h3. "https://www.elastic.co/products/elasticsearch":https://www.elastic.co/products/elasticsearch
+
+Elasticsearch is a distributed RESTful search engine built for the cloud. Features include:
+
+* Distributed and Highly Available Search Engine.
+** Each index is fully sharded with a configurable number of shards.
+** Each shard can have one or more replicas.
+** Read / Search operations performed on either one of the replica shard.
+* Multi Tenant with Multi Types.
+** Support for more than one index.
+** Support for more than one type per index.
+** Index level configuration (number of shards, index storage, ...).
+* Various set of APIs
+** HTTP RESTful API
+** Native Java API.
+** All APIs perform automatic node operation rerouting.
+* Document oriented
+** No need for upfront schema definition.
+** Schema can be defined per type for customization of the indexing process.
+* Reliable, Asynchronous Write Behind for long term persistency.
+* (Near) Real Time Search.
+* Built on top of Lucene
+** Each shard is a fully functional Lucene index
+** All the power of Lucene easily exposed through simple configuration / plugins.
+* Per operation consistency
+** Single document level operations are atomic, consistent, isolated and durable.
+* Open Source under the Apache License, version 2 ("ALv2")
+
+h2. Getting Started
+
+First of all, DON'T PANIC. It will take 5 minutes to get the gist of what Elasticsearch is all about.
+
+h3. Requirements
+
+You need to have a recent version of Java installed. See the "Setup":http://www.elastic.co/guide/en/elasticsearch/reference/current/setup.html#jvm-version page for more information.
+
+h3. Installation
+
+* "Download":https://www.elastic.co/downloads/elasticsearch and unzip the Elasticsearch official distribution.
+* Run @bin/elasticsearch@ on unix, or @bin\elasticsearch.bat@ on windows.
+* Run @curl -X GET http://localhost:9200/@.
+* Start more servers ...
+
+h3. Indexing
+
+Let's try and index some twitter like information. First, let's create a twitter user, and add some tweets (the @twitter@ index will be created automatically):
+
+<pre>
+curl -XPUT 'http://localhost:9200/twitter/user/kimchy' -d '{ "name" : "Shay Banon" }'
+
+curl -XPUT 'http://localhost:9200/twitter/tweet/1' -d '
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T13:12:00",
+ "message": "Trying out Elasticsearch, so far so good?"
+}'
+
+curl -XPUT 'http://localhost:9200/twitter/tweet/2' -d '
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T14:12:12",
+ "message": "Another tweet, will it be indexed?"
+}'
+</pre>
+
+Now, let's see if the information was added by GETting it:
+
+<pre>
+curl -XGET 'http://localhost:9200/twitter/user/kimchy?pretty=true'
+curl -XGET 'http://localhost:9200/twitter/tweet/1?pretty=true'
+curl -XGET 'http://localhost:9200/twitter/tweet/2?pretty=true'
+</pre>
+
+h3. Searching
+
+Mmm search..., shouldn't it be elastic?
+Let's find all the tweets that @kimchy@ posted:
+
+<pre>
+curl -XGET 'http://localhost:9200/twitter/tweet/_search?q=user:kimchy&pretty=true'
+</pre>
+
+We can also use the JSON query language Elasticsearch provides instead of a query string:
+
+<pre>
+curl -XGET 'http://localhost:9200/twitter/tweet/_search?pretty=true' -d '
+{
+ "query" : {
+ "match" : { "user": "kimchy" }
+ }
+}'
+</pre>
+
+Just for kicks, let's get all the documents stored (we should see the user as well):
+
+<pre>
+curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -d '
+{
+ "query" : {
+ "matchAll" : {}
+ }
+}'
+</pre>
+
+We can also do range search (the @postDate@ was automatically identified as date)
+
+<pre>
+curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -d '
+{
+ "query" : {
+ "range" : {
+ "postDate" : { "from" : "2009-11-15T13:00:00", "to" : "2009-11-15T14:00:00" }
+ }
+ }
+}'
+</pre>
+
+There are many more options to perform search, after all, it's a search product no? All the familiar Lucene queries are available through the JSON query language, or through the query parser.
+
+h3. Multi Tenant - Indices and Types
+
+Maan, that twitter index might get big (in this case, index size == valuation). Let's see if we can structure our twitter system a bit differently in order to support such large amounts of data.
+
+Elasticsearch supports multiple indices, as well as multiple types per index. In the previous example we used an index called @twitter@, with two types, @user@ and @tweet@.
+
+Another way to define our simple twitter system is to have a different index per user (note, though that each index has an overhead). Here is the indexing curl's in this case:
+
+<pre>
+curl -XPUT 'http://localhost:9200/kimchy/info/1' -d '{ "name" : "Shay Banon" }'
+
+curl -XPUT 'http://localhost:9200/kimchy/tweet/1' -d '
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T13:12:00",
+ "message": "Trying out Elasticsearch, so far so good?"
+}'
+
+curl -XPUT 'http://localhost:9200/kimchy/tweet/2' -d '
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T14:12:12",
+ "message": "Another tweet, will it be indexed?"
+}'
+</pre>
+
+The above will index information into the @kimchy@ index, with two types, @info@ and @tweet@. Each user will get his own special index.
+
+Complete control on the index level is allowed. As an example, in the above case, we would want to change from the default 5 shards with 1 replica per index, to only 1 shard with 1 replica per index (== per twitter user). Here is how this can be done (the configuration can be in yaml as well):
+
+<pre>
+curl -XPUT http://localhost:9200/another_user/ -d '
+{
+ "index" : {
+ "numberOfShards" : 1,
+ "numberOfReplicas" : 1
+ }
+}'
+</pre>
+
+Search (and similar operations) are multi index aware. This means that we can easily search on more than one
+index (twitter user), for example:
+
+<pre>
+curl -XGET 'http://localhost:9200/kimchy,another_user/_search?pretty=true' -d '
+{
+ "query" : {
+ "matchAll" : {}
+ }
+}'
+</pre>
+
+Or on all the indices:
+
+<pre>
+curl -XGET 'http://localhost:9200/_search?pretty=true' -d '
+{
+ "query" : {
+ "matchAll" : {}
+ }
+}'
+</pre>
+
+{One liner teaser}: And the cool part about that? You can easily search on multiple twitter users (indices), with different boost levels per user (index), making social search so much simpler (results from my friends rank higher than results from friends of my friends).
+
+h3. Distributed, Highly Available
+
+Let's face it, things will fail....
+
+Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replica. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
+
+In order to play with the distributed nature of Elasticsearch, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
+
+h3. Where to go from here?
+
+We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the "elastic.co":http://www.elastic.co/products/elasticsearch website.
+
+h3. Building from Source
+
+Elasticsearch uses "Maven":http://maven.apache.org for its build system.
+
+In order to create a distribution, simply run the @mvn clean package
+-DskipTests@ command in the cloned directory.
+
+The distribution will be created under @target/releases@.
+
+See the "TESTING":TESTING.asciidoc file for more information about
+running the Elasticsearch test suite.
+
+h3. Upgrading to Elasticsearch 1.x?
+
+In order to ensure a smooth upgrade process from earlier versions of Elasticsearch (< 1.0.0), it is recommended to perform a full cluster restart. Please see the "setup reference":https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html for more details on the upgrade process.
+
+h1. License
+
+<pre>
+This software is licensed under the Apache License, version 2 ("ALv2"), quoted below.
+
+Copyright 2009-2015 Elasticsearch <https://www.elastic.co>
+
+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.
+</pre>
diff --git a/bin/elasticsearch b/core/bin/elasticsearch
similarity index 100%
rename from bin/elasticsearch
rename to core/bin/elasticsearch
diff --git a/bin/elasticsearch-service-mgr.exe b/core/bin/elasticsearch-service-mgr.exe
similarity index 100%
rename from bin/elasticsearch-service-mgr.exe
rename to core/bin/elasticsearch-service-mgr.exe
diff --git a/bin/elasticsearch-service-x64.exe b/core/bin/elasticsearch-service-x64.exe
similarity index 100%
rename from bin/elasticsearch-service-x64.exe
rename to core/bin/elasticsearch-service-x64.exe
diff --git a/bin/elasticsearch-service-x86.exe b/core/bin/elasticsearch-service-x86.exe
similarity index 100%
rename from bin/elasticsearch-service-x86.exe
rename to core/bin/elasticsearch-service-x86.exe
diff --git a/bin/elasticsearch.bat b/core/bin/elasticsearch.bat
similarity index 100%
rename from bin/elasticsearch.bat
rename to core/bin/elasticsearch.bat
diff --git a/bin/elasticsearch.in.bat b/core/bin/elasticsearch.in.bat
similarity index 100%
rename from bin/elasticsearch.in.bat
rename to core/bin/elasticsearch.in.bat
diff --git a/bin/elasticsearch.in.sh b/core/bin/elasticsearch.in.sh
similarity index 100%
rename from bin/elasticsearch.in.sh
rename to core/bin/elasticsearch.in.sh
diff --git a/bin/plugin b/core/bin/plugin
similarity index 100%
rename from bin/plugin
rename to core/bin/plugin
diff --git a/bin/plugin.bat b/core/bin/plugin.bat
similarity index 100%
rename from bin/plugin.bat
rename to core/bin/plugin.bat
diff --git a/bin/service.bat b/core/bin/service.bat
similarity index 100%
rename from bin/service.bat
rename to core/bin/service.bat
diff --git a/config/elasticsearch.yml b/core/config/elasticsearch.yml
similarity index 100%
rename from config/elasticsearch.yml
rename to core/config/elasticsearch.yml
diff --git a/config/logging.yml b/core/config/logging.yml
similarity index 100%
rename from config/logging.yml
rename to core/config/logging.yml
diff --git a/lib/sigar/libsigar-amd64-freebsd-6.so b/core/lib/sigar/libsigar-amd64-freebsd-6.so
similarity index 100%
rename from lib/sigar/libsigar-amd64-freebsd-6.so
rename to core/lib/sigar/libsigar-amd64-freebsd-6.so
diff --git a/lib/sigar/libsigar-amd64-linux.so b/core/lib/sigar/libsigar-amd64-linux.so
similarity index 100%
rename from lib/sigar/libsigar-amd64-linux.so
rename to core/lib/sigar/libsigar-amd64-linux.so
diff --git a/lib/sigar/libsigar-amd64-solaris.so b/core/lib/sigar/libsigar-amd64-solaris.so
similarity index 100%
rename from lib/sigar/libsigar-amd64-solaris.so
rename to core/lib/sigar/libsigar-amd64-solaris.so
diff --git a/lib/sigar/libsigar-ia64-linux.so b/core/lib/sigar/libsigar-ia64-linux.so
similarity index 100%
rename from lib/sigar/libsigar-ia64-linux.so
rename to core/lib/sigar/libsigar-ia64-linux.so
diff --git a/lib/sigar/libsigar-sparc-solaris.so b/core/lib/sigar/libsigar-sparc-solaris.so
similarity index 100%
rename from lib/sigar/libsigar-sparc-solaris.so
rename to core/lib/sigar/libsigar-sparc-solaris.so
diff --git a/lib/sigar/libsigar-sparc64-solaris.so b/core/lib/sigar/libsigar-sparc64-solaris.so
similarity index 100%
rename from lib/sigar/libsigar-sparc64-solaris.so
rename to core/lib/sigar/libsigar-sparc64-solaris.so
diff --git a/lib/sigar/libsigar-universal-macosx.dylib b/core/lib/sigar/libsigar-universal-macosx.dylib
similarity index 100%
rename from lib/sigar/libsigar-universal-macosx.dylib
rename to core/lib/sigar/libsigar-universal-macosx.dylib
diff --git a/lib/sigar/libsigar-universal64-macosx.dylib b/core/lib/sigar/libsigar-universal64-macosx.dylib
similarity index 100%
rename from lib/sigar/libsigar-universal64-macosx.dylib
rename to core/lib/sigar/libsigar-universal64-macosx.dylib
diff --git a/lib/sigar/libsigar-x86-freebsd-5.so b/core/lib/sigar/libsigar-x86-freebsd-5.so
similarity index 100%
rename from lib/sigar/libsigar-x86-freebsd-5.so
rename to core/lib/sigar/libsigar-x86-freebsd-5.so
diff --git a/lib/sigar/libsigar-x86-freebsd-6.so b/core/lib/sigar/libsigar-x86-freebsd-6.so
similarity index 100%
rename from lib/sigar/libsigar-x86-freebsd-6.so
rename to core/lib/sigar/libsigar-x86-freebsd-6.so
diff --git a/lib/sigar/libsigar-x86-linux.so b/core/lib/sigar/libsigar-x86-linux.so
similarity index 100%
rename from lib/sigar/libsigar-x86-linux.so
rename to core/lib/sigar/libsigar-x86-linux.so
diff --git a/lib/sigar/libsigar-x86-solaris.so b/core/lib/sigar/libsigar-x86-solaris.so
similarity index 100%
rename from lib/sigar/libsigar-x86-solaris.so
rename to core/lib/sigar/libsigar-x86-solaris.so
diff --git a/lib/sigar/sigar-1.6.4.jar b/core/lib/sigar/sigar-1.6.4.jar
similarity index 100%
rename from lib/sigar/sigar-1.6.4.jar
rename to core/lib/sigar/sigar-1.6.4.jar
diff --git a/lib/sigar/sigar-amd64-winnt.dll b/core/lib/sigar/sigar-amd64-winnt.dll
similarity index 100%
rename from lib/sigar/sigar-amd64-winnt.dll
rename to core/lib/sigar/sigar-amd64-winnt.dll
diff --git a/lib/sigar/sigar-x86-winnt.dll b/core/lib/sigar/sigar-x86-winnt.dll
similarity index 100%
rename from lib/sigar/sigar-x86-winnt.dll
rename to core/lib/sigar/sigar-x86-winnt.dll
diff --git a/lib/sigar/sigar-x86-winnt.lib b/core/lib/sigar/sigar-x86-winnt.lib
similarity index 100%
rename from lib/sigar/sigar-x86-winnt.lib
rename to core/lib/sigar/sigar-x86-winnt.lib
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 00000000000..9e3fefb41b1
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,1145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+
+ <packaging>jar</packaging>
+ <name>Elasticsearch core</name>
+ <description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
+
+
+ <properties>
+ <!-- testing is currently done unshaded :( -->
+ <elasticsearch.thirdparty.config>unshaded</elasticsearch.thirdparty.config>
+ <!-- Properties used for building RPM & DEB packages (see common/packaging.properties) -->
+ <packaging.elasticsearch.home.dir>/usr/share/elasticsearch</packaging.elasticsearch.home.dir>
+ <packaging.elasticsearch.bin.dir>/usr/share/elasticsearch/bin</packaging.elasticsearch.bin.dir>
+ <packaging.elasticsearch.conf.dir>/etc/elasticsearch</packaging.elasticsearch.conf.dir>
+ <packaging.elasticsearch.data.dir>/var/lib/elasticsearch</packaging.elasticsearch.data.dir>
+ <packaging.elasticsearch.user>elasticsearch</packaging.elasticsearch.user>
+ <packaging.elasticsearch.group>elasticsearch</packaging.elasticsearch.group>
+ <packaging.elasticsearch.log.dir>/var/log/elasticsearch</packaging.elasticsearch.log.dir>
+ <packaging.elasticsearch.plugins.dir>${packaging.elasticsearch.home.dir}/plugins</packaging.elasticsearch.plugins.dir>
+ <packaging.elasticsearch.pid.dir>/var/run/elasticsearch</packaging.elasticsearch.pid.dir>
+ <packaging.elasticsearch.systemd.dir>/usr/lib/systemd/system</packaging.elasticsearch.systemd.dir>
+ <packaging.elasticsearch.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.elasticsearch.systemd.sysctl.dir>
+ <packaging.elasticsearch.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.elasticsearch.tmpfilesd.dir>
+ <deb.sign>false</deb.sign>
+ <deb.sign.method>dpkg-sig</deb.sign.method>
+ </properties>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.carrotsearch.randomizedtesting</groupId>
+ <artifactId>randomizedtesting-runner</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.jimfs</groupId>
+ <artifactId>jimfs</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-suggest</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-join</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-expressions</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.spatial4j</groupId>
+ <artifactId>spatial4j</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <!-- needed for templating -->
+ <dependency>
+ <groupId>com.github.spullara.mustache.java</groupId>
+ <artifactId>compiler</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Lucene spatial -->
+
+
+ <!-- START: dependencies that are shaded -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>hppc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.joda</groupId>
+ <artifactId>joda-convert</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-smile</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-cbor</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>compress-lzf</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.tdunning</groupId>
+ <artifactId>t-digest</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+
+ <!-- END: dependencies that are shaded -->
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <classifier>indy</classifier>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>apache-log4j-extras</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.fusesource</groupId>
+ <artifactId>sigar</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- We don't use this since the publish pom is then messed up -->
+ <!--
+ <dependency>
+ <groupId>sigar</groupId>
+ <artifactId>sigar</artifactId>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/sigar/sigar-1.6.4.jar</systemPath>
+ <optional>true</optional>
+ </dependency>
+ -->
+ </dependencies>
+
+ <build>
+
+ <!-- This file contains all the common properties used to build
+ the different packages (tar.gz, deb, rpm) using Maven resources plugin -->
+ <filters>
+ <filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
+ </filters>
+
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/java</directory>
+ <includes>
+ <include>**/*.json</include>
+ <include>**/*.yml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/java</directory>
+ <includes>
+ <include>**/*.json</include>
+ <include>**/*.yml</include>
+ <include>**/*.txt</include>
+ <include>**/*.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>${project.basedir}/src/test/java</directory>
+ <includes>
+ <include>**/*.gz</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>${project.basedir}/../rest-api-spec</directory>
+ <targetPath>rest-api-spec</targetPath>
+ <includes>
+ <include>api/*.json</include>
+ <include>test/**/*.yaml</include>
+ </includes>
+ </testResource>
+ <!-- shared test resources like log4j.properties -->
+ <testResource>
+ <directory>${elasticsearch.tools.directory}/shared-test-resources</directory>
+ <filtering>false</filtering>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.4.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>${jvm.executable}</executable>
+ <arguments>
+ <argument>-Des.security.manager.enabled=false</argument>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>org.elasticsearch.bootstrap.Bootstrap</argument>
+ <argument>-Xms256m</argument>
+ <argument>-Xmx1g</argument>
+ <argument>-Djava.awt.headless=true</argument>
+ <argument>-XX:+UseParNewGC</argument>
+ <argument>-XX:+UseConcMarkSweepGC</argument>
+ <argument>-XX:CMSInitiatingOccupancyFraction=75</argument>
+ <argument>-XX:+UseCMSInitiatingOccupancyOnly</argument>
+ <argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
+ <argument>-XX:+DisableExplicitGC</argument>
+ <argument>-Dfile.encoding=UTF-8</argument>
+ <argument>-Djna.nosys=true</argument>
+ <argument>-Delasticsearch</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-test-sources</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>org/elasticsearch/test/**/*</include>
+ <include>org/elasticsearch/bootstrap/BootstrapForTesting.class</include>
+ <include>org/elasticsearch/common/cli/CliToolTestCase.class</include>
+ <include>org/elasticsearch/common/cli/CliToolTestCase$*.class</include>
+ </includes>
+ <excludes>
+ <!-- unit tests for yaml suite parser & rest spec parser need to be excluded -->
+ <exclude>org/elasticsearch/test/rest/test/**/*</exclude>
+ <!-- unit tests for test framework classes-->
+ <exclude>org/elasticsearch/test/test/**/*</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <shadeTestJar>true</shadeTestJar>
+ <minimizeJar>true</minimizeJar>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:guava</include>
+ <include>com.carrotsearch:hppc</include>
+ <include>com.fasterxml.jackson.core:jackson-core</include>
+ <include>com.fasterxml.jackson.dataformat:jackson-dataformat-smile</include>
+ <include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
+ <include>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</include>
+ <include>joda-time:joda-time</include>
+ <include>org.joda:joda-convert</include>
+ <include>io.netty:netty</include>
+ <include>com.ning:compress-lzf</include>
+ <include>com.github.spullara.mustache.java:compiler</include>
+ <include>com.tdunning:t-digest</include>
+ <include>org.apache.commons:commons-lang3</include>
+ <include>commons-cli:commons-cli</include>
+ </includes>
+ </artifactSet>
+ <transformers>
+ <!-- copy over MANIFEST.MF from unshaded jar, but mark jar as shaded too -->
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <X-Build-Shaded>true</X-Build-Shaded>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ <relocations>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <shadedPattern>org.elasticsearch.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.carrotsearch.hppc</pattern>
+ <shadedPattern>org.elasticsearch.common.hppc</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>jsr166e</pattern>
+ <shadedPattern>org.elasticsearch.common.util.concurrent.jsr166e</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+ <shadedPattern>org.elasticsearch.common.jackson</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.joda.time</pattern>
+ <shadedPattern>org.elasticsearch.common.joda.time</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.jboss.netty</pattern>
+ <shadedPattern>org.elasticsearch.common.netty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.ning.compress</pattern>
+ <shadedPattern>org.elasticsearch.common.compress</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.github.mustachejava</pattern>
+ <shadedPattern>org.elasticsearch.common.mustache</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.tdunning.math.stats</pattern>
+ <shadedPattern>org.elasticsearch.common.stats</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.lang</pattern>
+ <shadedPattern>org.elasticsearch.common.lang</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.cli</pattern>
+ <shadedPattern>org.elasticsearch.common.cli.commons</shadedPattern>
+ </relocation>
+ </relocations>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/license/**</exclude>
+ <exclude>META-INF/*</exclude>
+ <exclude>META-INF/maven/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>/*.txt</exclude>
+ <exclude>build.properties</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>io.netty:netty</artifact>
+ <includes>
+ <include>org/jboss/netty/**</include>
+ </includes>
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/bin</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/bin</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>*.exe</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/bin</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>*.exe</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <!-- Filters some files and uses packaging.properties when building the .deb package -->
+ <execution>
+ <id>copy-resources-deb</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-packaging/deb/</outputDirectory>
+ <filters>
+ <filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
+ <filter>${project.basedir}/src/packaging/deb/packaging.properties</filter>
+ </filters>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/packaging/common/</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>packaging.properties</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/packaging/deb/</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>packaging.properties</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>bin/elasticsearch</include>
+ <include>bin/elasticsearch.in.sh</include>
+ <include>bin/plugin</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <!-- Filters some files and uses packaging.properties when building the .rpm package -->
+ <execution>
+ <id>copy-resources-rpm</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-packaging/rpm/</outputDirectory>
+ <filters>
+ <filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
+ <filter>${project.basedir}/src/packaging/rpm/packaging.properties</filter>
+ </filters>
+ <resources>
+ <resource>
+ <directory>src/packaging/common/</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>packaging.properties</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/packaging/rpm/</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>packaging.properties</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${project.basedir}</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>bin/elasticsearch</include>
+ <include>bin/elasticsearch.in.sh</include>
+ <include>bin/plugin</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>${project.build.directory}/releases/</outputDirectory>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/assemblies/targz-bin.xml</descriptor>
+ <descriptor>${project.basedir}/src/main/assemblies/zip-bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Deb Packaging -->
+ <plugin>
+ <!-- some infos https://github.com/tcurdt/jdeb/blob/master/docs/maven.md -->
+ <artifactId>jdeb</artifactId>
+ <groupId>org.vafer</groupId>
+ <version>1.4</version>
+ <configuration>
+ <deb>${project.build.directory}/releases/${project.artifactId}-${project.version}.deb</deb>
+ <controlDir>${project.build.directory}/generated-packaging/deb/scripts</controlDir>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jdeb</goal>
+ </goals>
+ <configuration>
+ <signPackage>${deb.sign}</signPackage>
+ <keyring>${gpg.keyring}</keyring>
+ <key>${gpg.key}</key>
+ <passphrase>${gpg.passphrase}</passphrase>
+ <signMethod>${deb.sign.method}</signMethod>
+ <dataSet>
+ <!-- Add bin directory -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/bin</src>
+ <type>directory</type>
+ <includes>elasticsearch,elasticsearch.in.sh,plugin</includes>
+ <mapper>
+ <type>perm</type>
+ <prefix>${packaging.elasticsearch.bin.dir}</prefix>
+ <filemode>755</filemode>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Add configuration files -->
+ <data>
+ <src>${project.basedir}/config</src>
+ <type>directory</type>
+ <excludes>.DS_Store</excludes>
+ <mapper>
+ <type>perm</type>
+ <prefix>${packaging.elasticsearch.conf.dir}</prefix>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Add environment vars file -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/env/elasticsearch</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/etc/default</prefix>
+ <filemode>644</filemode>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Add libs -->
+ <data>
+ <src>${project.build.directory}/</src>
+ <includes>${project.build.finalName}.jar</includes>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>${packaging.elasticsearch.home.dir}/lib</prefix>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.basedir}/lib/sigar/</src>
+ <includes>sigar-*.jar, libsigar-*-linux.*</includes>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>${packaging.elasticsearch.home.dir}/lib/sigar</prefix>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.build.directory}/lib</src>
+ <includes>lucene*, *log4j*, jna*, spatial4j*, jts*, groovy*, antlr-runtime*, asm*</includes>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>${packaging.elasticsearch.home.dir}/lib</prefix>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Add init.d files -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/init.d/</src>
+ <type>directory</type>
+ <excludes>.DS_Store</excludes>
+ <mapper>
+ <type>perm</type>
+ <prefix>/etc/init.d</prefix>
+ <filemode>755</filemode>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Adds systemd file -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.service</src>
+ <dst>${packaging.elasticsearch.systemd.dir}/elasticsearch.service</dst>
+ <type>file</type>
+ </data>
+ <!-- Adds systemd/sysctl.d configuration file -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/systemd/sysctl/elasticsearch.conf</src>
+ <dst>${packaging.elasticsearch.systemd.sysctl.dir}/elasticsearch.conf</dst>
+ <type>file</type>
+ </data>
+ <!-- Adds systemd/tmpfiles.d configuration file -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.conf</src>
+ <dst>${packaging.elasticsearch.tmpfilesd.dir}/elasticsearch.conf</dst>
+ <type>file</type>
+ </data>
+ <!-- Add lintian files -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/lintian</src>
+ <type>directory</type>
+ <excludes>.DS_Store</excludes>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/lintian/overrides</prefix>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Add readme files -->
+ <data>
+ <src>${project.basedir}/</src>
+ <includes>*.txt, *.textile</includes>
+ <excludes>LICENSE.txt, .DS_Store</excludes>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>${packaging.elasticsearch.home.dir}</prefix>
+ <user>root</user>
+ <group>root</group>
+ </mapper>
+ </data>
+ <!-- Add license files -->
+ <data>
+ <src>${project.build.directory}/generated-packaging/deb/copyright</src>
+ <dst>/usr/share/doc/elasticsearch/copyright</dst>
+ <type>file</type>
+ </data>
+ <!-- Adds and sets permission on default directories -->
+ <data>
+ <type>template</type>
+ <paths>
+ <path>${packaging.elasticsearch.data.dir}</path>
+ <path>${packaging.elasticsearch.log.dir}</path>
+ <path>${packaging.elasticsearch.plugins.dir}</path>
+ <path>${packaging.elasticsearch.pid.dir}</path>
+ </paths>
+ <mapper>
+ <type>perm</type>
+ <dirmode>755</dirmode>
+ <user>${packaging.elasticsearch.user}</user>
+ <group>${packaging.elasticsearch.group}</group>
+ </mapper>
+ </data>
+ </dataSet>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Rpm Packaging -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1.2</version>
+ <configuration>
+ <distribution>Elasticsearch</distribution>
+ <group>Application/Internet</group>
+ <packager>Elasticsearch</packager>
+ <prefix>/usr</prefix>
+ <changelogFile>src/changelog</changelogFile>
+ <defineStatements>
+ <defineStatement>_unpackaged_files_terminate_build 0</defineStatement>
+ <defineStatement>_binaries_in_noarch_packages_terminate_build 0</defineStatement>
+ </defineStatements>
+ <defaultFilemode>644</defaultFilemode>
+ <defaultDirmode>755</defaultDirmode>
+ <defaultUsername>root</defaultUsername>
+ <defaultGroupname>root</defaultGroupname>
+ <keyname>${gpg.key}</keyname>
+ <keypath>${gpg.keyring}</keypath>
+ <keyPassphrase>
+ <passphrase>${gpg.passphrase}</passphrase>
+ </keyPassphrase>
+ <mappings>
+ <!-- Add bin directory -->
+ <mapping>
+ <directory>${packaging.elasticsearch.bin.dir}/</directory>
+ <filemode>755</filemode>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-packaging/rpm/bin</location>
+ <includes>
+ <include>elasticsearch</include>
+ <include>elasticsearch.in.sh</include>
+ <include>plugin</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Add configuration files -->
+ <mapping>
+ <directory>${packaging.elasticsearch.conf.dir}/</directory>
+ <configuration>noreplace</configuration>
+ <sources>
+ <source>
+ <location>${project.basedir}/config/</location>
+ <includes>
+ <include>*.yml</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Add environment vars file -->
+ <mapping>
+ <directory>/etc/sysconfig/</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <configuration>noreplace</configuration>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-packaging/rpm/env/</location>
+ <includes>
+ <include>elasticsearch</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Add libs -->
+ <mapping>
+ <directory>${packaging.elasticsearch.home.dir}/lib</directory>
+ <sources>
+ <source>
+ <location>target/lib/</location>
+ <includes>
+ <include>lucene*</include>
+ <include>*log4j*</include>
+ <include>jna*</include>
+ <include>spatial4j*</include>
+ <include>jts*</include>
+ <include>groovy*</include>
+ <include>antlr-runtime*</include>
+ <include>asm*</include>
+ </includes>
+ </source>
+ <source>
+ <location>${project.build.directory}/</location>
+ <includes>
+ <include>${project.build.finalName}.jar</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>${packaging.elasticsearch.home.dir}/lib/sigar</directory>
+ <sources>
+ <source>
+ <location>lib/sigar</location>
+ <includes>
+ <include>sigar*.jar</include>
+ <include>libsigar-*-linux.*</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Add init.d files -->
+ <mapping>
+ <directory>/etc/init.d</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>755</filemode>
+ <configuration>true</configuration>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-packaging/rpm/init.d</location>
+ <includes>
+ <include>elasticsearch</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Adds systemd file -->
+ <mapping>
+ <directory>${packaging.elasticsearch.systemd.dir}</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <configuration>true</configuration>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-packaging/rpm/systemd</location>
+ <includes>
+ <include>elasticsearch.service</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Adds systemd/sysctl.d configuration file -->
+ <mapping>
+ <directory>${packaging.elasticsearch.systemd.sysctl.dir}</directory>
+ <configuration>true</configuration>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-packaging/rpm/systemd/sysctl</location>
+ <includes>
+ <include>elasticsearch.conf</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Adds systemd/tmpfiles.d configuration file -->
+ <mapping>
+ <directory>${packaging.elasticsearch.tmpfilesd.dir}</directory>
+ <configuration>true</configuration>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-packaging/rpm/systemd/</location>
+ <includes>
+ <include>elasticsearch.conf</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Add readme files -->
+ <mapping>
+ <directory>${packaging.elasticsearch.home.dir}</directory>
+ <sources>
+ <source>
+ <location>.</location>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.textile</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <!-- Add and sets permission on default directories -->
+ <mapping>
+ <directory>${packaging.elasticsearch.data.dir}</directory>
+ <filemode>755</filemode>
+ <username>${packaging.elasticsearch.user}</username>
+ <groupname>${packaging.elasticsearch.group}</groupname>
+ </mapping>
+ <mapping>
+ <directory>${packaging.elasticsearch.log.dir}</directory>
+ <filemode>755</filemode>
+ <username>${packaging.elasticsearch.user}</username>
+ <groupname>${packaging.elasticsearch.group}</groupname>
+ </mapping>
+ <mapping>
+ <directory>${packaging.elasticsearch.plugins.dir}</directory>
+ <filemode>755</filemode>
+ <username>${packaging.elasticsearch.user}</username>
+ <groupname>${packaging.elasticsearch.group}</groupname>
+ </mapping>
+ <mapping>
+ <directory>${packaging.elasticsearch.pid.dir}</directory>
+ <filemode>755</filemode>
+ <username>${packaging.elasticsearch.user}</username>
+ <groupname>${packaging.elasticsearch.group}</groupname>
+ </mapping>
+ </mappings>
+ <preinstallScriptlet>
+ <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/preinst</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </preinstallScriptlet>
+ <postinstallScriptlet>
+ <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/postinst</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postinstallScriptlet>
+ <preremoveScriptlet>
+ <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/prerm</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </preremoveScriptlet>
+ <postremoveScriptlet>
+ <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/postrm</scriptFile>
+ <fileEncoding>utf-8</fileEncoding>
+ </postremoveScriptlet>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>rest-api-spec/**/*</include>
+ <include>org/elasticsearch/test/**/*</include>
+ <include>org/elasticsearch/bootstrap/BootstrapForTesting.class</include>
+ <include>org/elasticsearch/common/cli/CliToolTestCase.class</include>
+ <include>org/elasticsearch/common/cli/CliToolTestCase$*.class</include>
+ </includes>
+ <excludes>
+ <!-- unit tests for yaml suite parser & rest spec parser need to be excluded -->
+ <exclude>org/elasticsearch/test/rest/test/**/*</exclude>
+ <!-- unit tests for test framework classes-->
+ <exclude>org/elasticsearch/test/test/**/*</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>jsr166e/**</exclude>
+ <exclude>org/apache/lucene/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Guice -->
+ <exclude>src/main/java/org/elasticsearch/common/inject/**</exclude>
+ <exclude>src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java</exclude>
+ <exclude>src/main/java/org/apache/lucene/**/X*.java</exclude>
+ <!-- t-digest -->
+ <exclude>src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java</exclude>
+ <!-- netty pipelining -->
+ <exclude>src/main/java/org/elasticsearch/http/netty/pipelining/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <!-- license profile, to generate third party license file -->
+ <profile>
+ <id>license</id>
+ <activation>
+ <property>
+ <name>license.generation</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <!-- not including license-maven-plugin is sufficent to expose default license -->
+ </profile>
+ </profiles>
+</project>
diff --git a/src/main/assemblies/common-bin.xml b/core/src/main/assemblies/common-bin.xml
similarity index 100%
rename from src/main/assemblies/common-bin.xml
rename to core/src/main/assemblies/common-bin.xml
diff --git a/src/main/assemblies/targz-bin.xml b/core/src/main/assemblies/targz-bin.xml
similarity index 100%
rename from src/main/assemblies/targz-bin.xml
rename to core/src/main/assemblies/targz-bin.xml
diff --git a/src/main/assemblies/zip-bin.xml b/core/src/main/assemblies/zip-bin.xml
similarity index 100%
rename from src/main/assemblies/zip-bin.xml
rename to core/src/main/assemblies/zip-bin.xml
diff --git a/src/main/java/jsr166e/DoubleAdder.java b/core/src/main/java/jsr166e/DoubleAdder.java
similarity index 100%
rename from src/main/java/jsr166e/DoubleAdder.java
rename to core/src/main/java/jsr166e/DoubleAdder.java
diff --git a/src/main/java/jsr166e/DoubleMaxUpdater.java b/core/src/main/java/jsr166e/DoubleMaxUpdater.java
similarity index 100%
rename from src/main/java/jsr166e/DoubleMaxUpdater.java
rename to core/src/main/java/jsr166e/DoubleMaxUpdater.java
diff --git a/src/main/java/jsr166e/LongAdder.java b/core/src/main/java/jsr166e/LongAdder.java
similarity index 100%
rename from src/main/java/jsr166e/LongAdder.java
rename to core/src/main/java/jsr166e/LongAdder.java
diff --git a/src/main/java/jsr166e/LongMaxUpdater.java b/core/src/main/java/jsr166e/LongMaxUpdater.java
similarity index 100%
rename from src/main/java/jsr166e/LongMaxUpdater.java
rename to core/src/main/java/jsr166e/LongMaxUpdater.java
diff --git a/src/main/java/jsr166e/Striped64.java b/core/src/main/java/jsr166e/Striped64.java
similarity index 100%
rename from src/main/java/jsr166e/Striped64.java
rename to core/src/main/java/jsr166e/Striped64.java
diff --git a/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java b/core/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java
similarity index 100%
rename from src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java
rename to core/src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java
diff --git a/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java b/core/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java
similarity index 100%
rename from src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java
rename to core/src/main/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilter.java
diff --git a/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java b/core/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java
similarity index 100%
rename from src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java
rename to core/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java
diff --git a/src/main/java/org/apache/lucene/index/memory/ExtendedMemoryIndex.java b/core/src/main/java/org/apache/lucene/index/memory/ExtendedMemoryIndex.java
similarity index 100%
rename from src/main/java/org/apache/lucene/index/memory/ExtendedMemoryIndex.java
rename to core/src/main/java/org/apache/lucene/index/memory/ExtendedMemoryIndex.java
diff --git a/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java b/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
rename to core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
diff --git a/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java b/core/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
rename to core/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
diff --git a/src/main/java/org/apache/lucene/queryparser/classic/ExistsFieldQueryExtension.java b/core/src/main/java/org/apache/lucene/queryparser/classic/ExistsFieldQueryExtension.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queryparser/classic/ExistsFieldQueryExtension.java
rename to core/src/main/java/org/apache/lucene/queryparser/classic/ExistsFieldQueryExtension.java
diff --git a/src/main/java/org/apache/lucene/queryparser/classic/FieldQueryExtension.java b/core/src/main/java/org/apache/lucene/queryparser/classic/FieldQueryExtension.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queryparser/classic/FieldQueryExtension.java
rename to core/src/main/java/org/apache/lucene/queryparser/classic/FieldQueryExtension.java
diff --git a/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java b/core/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
rename to core/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
diff --git a/src/main/java/org/apache/lucene/queryparser/classic/MissingFieldQueryExtension.java b/core/src/main/java/org/apache/lucene/queryparser/classic/MissingFieldQueryExtension.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queryparser/classic/MissingFieldQueryExtension.java
rename to core/src/main/java/org/apache/lucene/queryparser/classic/MissingFieldQueryExtension.java
diff --git a/src/main/java/org/apache/lucene/queryparser/classic/QueryParserSettings.java b/core/src/main/java/org/apache/lucene/queryparser/classic/QueryParserSettings.java
similarity index 100%
rename from src/main/java/org/apache/lucene/queryparser/classic/QueryParserSettings.java
rename to core/src/main/java/org/apache/lucene/queryparser/classic/QueryParserSettings.java
diff --git a/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java b/core/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java
rename to core/src/main/java/org/apache/lucene/search/XFilteredDocIdSetIterator.java
diff --git a/src/main/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatter.java b/core/src/main/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatter.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatter.java
rename to core/src/main/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatter.java
diff --git a/src/main/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighter.java b/core/src/main/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighter.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighter.java
rename to core/src/main/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighter.java
diff --git a/src/main/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java b/core/src/main/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java
rename to core/src/main/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java
diff --git a/src/main/java/org/apache/lucene/search/postingshighlight/Snippet.java b/core/src/main/java/org/apache/lucene/search/postingshighlight/Snippet.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/postingshighlight/Snippet.java
rename to core/src/main/java/org/apache/lucene/search/postingshighlight/Snippet.java
diff --git a/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
rename to core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
diff --git a/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java
rename to core/src/main/java/org/apache/lucene/search/suggest/analyzing/XFuzzySuggester.java
diff --git a/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java b/core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
similarity index 100%
rename from src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
rename to core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
diff --git a/src/main/java/org/apache/lucene/store/RateLimitedFSDirectory.java b/core/src/main/java/org/apache/lucene/store/RateLimitedFSDirectory.java
similarity index 100%
rename from src/main/java/org/apache/lucene/store/RateLimitedFSDirectory.java
rename to core/src/main/java/org/apache/lucene/store/RateLimitedFSDirectory.java
diff --git a/src/main/java/org/apache/lucene/store/StoreRateLimiting.java b/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java
similarity index 100%
rename from src/main/java/org/apache/lucene/store/StoreRateLimiting.java
rename to core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java
diff --git a/src/main/java/org/apache/lucene/store/StoreUtils.java b/core/src/main/java/org/apache/lucene/store/StoreUtils.java
similarity index 100%
rename from src/main/java/org/apache/lucene/store/StoreUtils.java
rename to core/src/main/java/org/apache/lucene/store/StoreUtils.java
diff --git a/src/main/java/org/elasticsearch/Build.java b/core/src/main/java/org/elasticsearch/Build.java
similarity index 100%
rename from src/main/java/org/elasticsearch/Build.java
rename to core/src/main/java/org/elasticsearch/Build.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java b/core/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchException.java b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchException.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java b/core/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchGenerationException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchNullPointerException.java b/core/src/main/java/org/elasticsearch/ElasticsearchNullPointerException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchNullPointerException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchNullPointerException.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchParseException.java b/core/src/main/java/org/elasticsearch/ElasticsearchParseException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchParseException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchParseException.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java b/core/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java
diff --git a/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java b/core/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ElasticsearchWrapperException.java
rename to core/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java
diff --git a/src/main/java/org/elasticsearch/ExceptionsHelper.java b/core/src/main/java/org/elasticsearch/ExceptionsHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/ExceptionsHelper.java
rename to core/src/main/java/org/elasticsearch/ExceptionsHelper.java
diff --git a/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java
similarity index 100%
rename from src/main/java/org/elasticsearch/Version.java
rename to core/src/main/java/org/elasticsearch/Version.java
diff --git a/src/main/java/org/elasticsearch/action/Action.java b/core/src/main/java/org/elasticsearch/action/Action.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/Action.java
rename to core/src/main/java/org/elasticsearch/action/Action.java
diff --git a/src/main/java/org/elasticsearch/action/ActionFuture.java b/core/src/main/java/org/elasticsearch/action/ActionFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionFuture.java
rename to core/src/main/java/org/elasticsearch/action/ActionFuture.java
diff --git a/src/main/java/org/elasticsearch/action/ActionListener.java b/core/src/main/java/org/elasticsearch/action/ActionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionListener.java
rename to core/src/main/java/org/elasticsearch/action/ActionListener.java
diff --git a/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java b/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java
rename to core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/action/ActionModule.java b/core/src/main/java/org/elasticsearch/action/ActionModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionModule.java
rename to core/src/main/java/org/elasticsearch/action/ActionModule.java
diff --git a/src/main/java/org/elasticsearch/action/ActionRequest.java b/core/src/main/java/org/elasticsearch/action/ActionRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionRequest.java
rename to core/src/main/java/org/elasticsearch/action/ActionRequest.java
diff --git a/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java b/core/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionRequestValidationException.java
rename to core/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java
diff --git a/src/main/java/org/elasticsearch/action/ActionResponse.java b/core/src/main/java/org/elasticsearch/action/ActionResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionResponse.java
rename to core/src/main/java/org/elasticsearch/action/ActionResponse.java
diff --git a/src/main/java/org/elasticsearch/action/ActionRunnable.java b/core/src/main/java/org/elasticsearch/action/ActionRunnable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionRunnable.java
rename to core/src/main/java/org/elasticsearch/action/ActionRunnable.java
diff --git a/src/main/java/org/elasticsearch/action/ActionWriteResponse.java b/core/src/main/java/org/elasticsearch/action/ActionWriteResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ActionWriteResponse.java
rename to core/src/main/java/org/elasticsearch/action/ActionWriteResponse.java
diff --git a/src/main/java/org/elasticsearch/action/AliasesRequest.java b/core/src/main/java/org/elasticsearch/action/AliasesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/AliasesRequest.java
rename to core/src/main/java/org/elasticsearch/action/AliasesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java b/core/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java
rename to core/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/DocumentRequest.java b/core/src/main/java/org/elasticsearch/action/DocumentRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/DocumentRequest.java
rename to core/src/main/java/org/elasticsearch/action/DocumentRequest.java
diff --git a/src/main/java/org/elasticsearch/action/FailedNodeException.java b/core/src/main/java/org/elasticsearch/action/FailedNodeException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/FailedNodeException.java
rename to core/src/main/java/org/elasticsearch/action/FailedNodeException.java
diff --git a/src/main/java/org/elasticsearch/action/GenericAction.java b/core/src/main/java/org/elasticsearch/action/GenericAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/GenericAction.java
rename to core/src/main/java/org/elasticsearch/action/GenericAction.java
diff --git a/src/main/java/org/elasticsearch/action/IndicesRequest.java b/core/src/main/java/org/elasticsearch/action/IndicesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/IndicesRequest.java
rename to core/src/main/java/org/elasticsearch/action/IndicesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/LatchedActionListener.java b/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/LatchedActionListener.java
rename to core/src/main/java/org/elasticsearch/action/LatchedActionListener.java
diff --git a/src/main/java/org/elasticsearch/action/ListenableActionFuture.java b/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ListenableActionFuture.java
rename to core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java
diff --git a/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java b/core/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java
rename to core/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java
diff --git a/src/main/java/org/elasticsearch/action/NoSuchNodeException.java b/core/src/main/java/org/elasticsearch/action/NoSuchNodeException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/NoSuchNodeException.java
rename to core/src/main/java/org/elasticsearch/action/NoSuchNodeException.java
diff --git a/src/main/java/org/elasticsearch/action/OriginalIndices.java b/core/src/main/java/org/elasticsearch/action/OriginalIndices.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/OriginalIndices.java
rename to core/src/main/java/org/elasticsearch/action/OriginalIndices.java
diff --git a/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java b/core/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java
rename to core/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java
diff --git a/src/main/java/org/elasticsearch/action/RoutingMissingException.java b/core/src/main/java/org/elasticsearch/action/RoutingMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/RoutingMissingException.java
rename to core/src/main/java/org/elasticsearch/action/RoutingMissingException.java
diff --git a/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java b/core/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ShardOperationFailedException.java
rename to core/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java
diff --git a/src/main/java/org/elasticsearch/action/ThreadingModel.java b/core/src/main/java/org/elasticsearch/action/ThreadingModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ThreadingModel.java
rename to core/src/main/java/org/elasticsearch/action/ThreadingModel.java
diff --git a/src/main/java/org/elasticsearch/action/TimestampParsingException.java b/core/src/main/java/org/elasticsearch/action/TimestampParsingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/TimestampParsingException.java
rename to core/src/main/java/org/elasticsearch/action/TimestampParsingException.java
diff --git a/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java b/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java
rename to core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java
diff --git a/src/main/java/org/elasticsearch/action/UnavailableShardsException.java b/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/UnavailableShardsException.java
rename to core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java
diff --git a/src/main/java/org/elasticsearch/action/ValidateActions.java b/core/src/main/java/org/elasticsearch/action/ValidateActions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/ValidateActions.java
rename to core/src/main/java/org/elasticsearch/action/ValidateActions.java
diff --git a/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java b/core/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java
rename to core/src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterIndexHealth.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterShardHealth.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginInfo.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginInfo.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginInfo.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsInfo.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsInfo.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsInfo.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/optimize/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/GetWarmersResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/get/TransportGetWarmersAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequest.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequest.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java
rename to core/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/action/admin/package-info.java b/core/src/main/java/org/elasticsearch/action/admin/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/admin/package-info.java
rename to core/src/main/java/org/elasticsearch/action/admin/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkAction.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkAction.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkAction.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkResponse.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java
rename to core/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
rename to core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
rename to core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
diff --git a/src/main/java/org/elasticsearch/action/count/CountAction.java b/core/src/main/java/org/elasticsearch/action/count/CountAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/count/CountAction.java
rename to core/src/main/java/org/elasticsearch/action/count/CountAction.java
diff --git a/src/main/java/org/elasticsearch/action/count/CountRequest.java b/core/src/main/java/org/elasticsearch/action/count/CountRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/count/CountRequest.java
rename to core/src/main/java/org/elasticsearch/action/count/CountRequest.java
diff --git a/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/count/CountResponse.java b/core/src/main/java/org/elasticsearch/action/count/CountResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/count/CountResponse.java
rename to core/src/main/java/org/elasticsearch/action/count/CountResponse.java
diff --git a/src/main/java/org/elasticsearch/action/count/package-info.java b/core/src/main/java/org/elasticsearch/action/count/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/count/package-info.java
rename to core/src/main/java/org/elasticsearch/action/count/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/delete/DeleteAction.java b/core/src/main/java/org/elasticsearch/action/delete/DeleteAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/delete/DeleteAction.java
rename to core/src/main/java/org/elasticsearch/action/delete/DeleteAction.java
diff --git a/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/core/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
rename to core/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
diff --git a/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java b/core/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/delete/DeleteResponse.java
rename to core/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java
diff --git a/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
rename to core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java
diff --git a/src/main/java/org/elasticsearch/action/delete/package-info.java b/core/src/main/java/org/elasticsearch/action/delete/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/delete/package-info.java
rename to core/src/main/java/org/elasticsearch/action/delete/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsAction.java b/core/src/main/java/org/elasticsearch/action/exists/ExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/ExistsAction.java
rename to core/src/main/java/org/elasticsearch/action/exists/ExistsAction.java
diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java b/core/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/ExistsRequest.java
rename to core/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/exists/ExistsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/ExistsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/exists/ExistsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java b/core/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/ExistsResponse.java
rename to core/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java b/core/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java
rename to core/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java b/core/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java
rename to core/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java b/core/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java
rename to core/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java
diff --git a/src/main/java/org/elasticsearch/action/exists/package-info.java b/core/src/main/java/org/elasticsearch/action/exists/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/exists/package-info.java
rename to core/src/main/java/org/elasticsearch/action/exists/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/explain/ExplainAction.java b/core/src/main/java/org/elasticsearch/action/explain/ExplainAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/explain/ExplainAction.java
rename to core/src/main/java/org/elasticsearch/action/explain/ExplainAction.java
diff --git a/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/explain/ExplainRequest.java
rename to core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java
diff --git a/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/core/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/explain/ExplainResponse.java
rename to core/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java
diff --git a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
rename to core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
diff --git a/src/main/java/org/elasticsearch/action/explain/package-info.java b/core/src/main/java/org/elasticsearch/action/explain/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/explain/package-info.java
rename to core/src/main/java/org/elasticsearch/action/explain/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsAction.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStatsAction.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsAction.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java b/core/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java
rename to core/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java
diff --git a/src/main/java/org/elasticsearch/action/get/GetAction.java b/core/src/main/java/org/elasticsearch/action/get/GetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/GetAction.java
rename to core/src/main/java/org/elasticsearch/action/get/GetAction.java
diff --git a/src/main/java/org/elasticsearch/action/get/GetRequest.java b/core/src/main/java/org/elasticsearch/action/get/GetRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/GetRequest.java
rename to core/src/main/java/org/elasticsearch/action/get/GetRequest.java
diff --git a/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/get/GetResponse.java b/core/src/main/java/org/elasticsearch/action/get/GetResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/GetResponse.java
rename to core/src/main/java/org/elasticsearch/action/get/GetResponse.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetAction.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetAction.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetAction.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetRequest.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetResponse.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java b/core/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java
rename to core/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java
diff --git a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/TransportGetAction.java
rename to core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
diff --git a/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java b/core/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java
rename to core/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java
diff --git a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
rename to core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
diff --git a/src/main/java/org/elasticsearch/action/get/package-info.java b/core/src/main/java/org/elasticsearch/action/get/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/get/package-info.java
rename to core/src/main/java/org/elasticsearch/action/get/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/index/IndexAction.java b/core/src/main/java/org/elasticsearch/action/index/IndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/index/IndexAction.java
rename to core/src/main/java/org/elasticsearch/action/index/IndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/index/IndexRequest.java
rename to core/src/main/java/org/elasticsearch/action/index/IndexRequest.java
diff --git a/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/core/src/main/java/org/elasticsearch/action/index/IndexResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/index/IndexResponse.java
rename to core/src/main/java/org/elasticsearch/action/index/IndexResponse.java
diff --git a/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
rename to core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java
diff --git a/src/main/java/org/elasticsearch/action/index/package-info.java b/core/src/main/java/org/elasticsearch/action/index/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/index/package-info.java
rename to core/src/main/java/org/elasticsearch/action/index/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequest.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequest.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequest.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptResponse.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptResponse.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/delete/DeleteIndexedScriptResponse.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/delete/TransportDeleteIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/delete/package-info.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/delete/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/delete/package-info.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/delete/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptResponse.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptResponse.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptResponse.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/get/TransportGetIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/package-info.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/get/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/get/package-info.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/get/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequest.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptResponse.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptResponse.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/put/PutIndexedScriptResponse.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/put/TransportPutIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/put/package-info.java b/core/src/main/java/org/elasticsearch/action/indexedscripts/put/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/indexedscripts/put/package-info.java
rename to core/src/main/java/org/elasticsearch/action/indexedscripts/put/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateAction.java b/core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/MultiPercolateAction.java
rename to core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateAction.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java b/core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java
rename to core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/MultiPercolateResponse.java b/core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/MultiPercolateResponse.java
rename to core/src/main/java/org/elasticsearch/action/percolate/MultiPercolateResponse.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateAction.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateAction.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateAction.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateSourceBuilder.java b/core/src/main/java/org/elasticsearch/action/percolate/PercolateSourceBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/PercolateSourceBuilder.java
rename to core/src/main/java/org/elasticsearch/action/percolate/PercolateSourceBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportMultiPercolateAction.java b/core/src/main/java/org/elasticsearch/action/percolate/TransportMultiPercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/TransportMultiPercolateAction.java
rename to core/src/main/java/org/elasticsearch/action/percolate/TransportMultiPercolateAction.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/core/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
rename to core/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java b/core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java
rename to core/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java b/core/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/ClearScrollAction.java
rename to core/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java b/core/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java
rename to core/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java
diff --git a/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java b/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java
rename to core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java
diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/MultiSearchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/core/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java
rename to core/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java
diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java b/core/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java
rename to core/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java
diff --git a/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java b/core/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java
rename to core/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchAction.java b/core/src/main/java/org/elasticsearch/action/search/SearchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java b/core/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchRequest.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchRequest.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchResponse.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchResponse.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java b/core/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchScrollAction.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java b/core/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/search/SearchType.java b/core/src/main/java/org/elasticsearch/action/search/SearchType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/SearchType.java
rename to core/src/main/java/org/elasticsearch/action/search/SearchType.java
diff --git a/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java b/core/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java
rename to core/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java
diff --git a/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java
rename to core/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java
rename to core/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/package-info.java b/core/src/main/java/org/elasticsearch/action/search/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/package-info.java
rename to core/src/main/java/org/elasticsearch/action/search/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/AbstractAsyncAction.java b/core/src/main/java/org/elasticsearch/action/search/type/AbstractAsyncAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/AbstractAsyncAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/AbstractAsyncAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java b/core/src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java
rename to core/src/main/java/org/elasticsearch/action/search/type/ParsedScrollId.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/core/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
rename to core/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java b/core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java
rename to core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java b/core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java
rename to core/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestAction.java b/core/src/main/java/org/elasticsearch/action/suggest/SuggestAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/SuggestAction.java
rename to core/src/main/java/org/elasticsearch/action/suggest/SuggestAction.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java b/core/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java
rename to core/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/suggest/SuggestRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/SuggestRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/suggest/SuggestRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java b/core/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java
rename to core/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
rename to core/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
diff --git a/src/main/java/org/elasticsearch/action/suggest/package-info.java b/core/src/main/java/org/elasticsearch/action/suggest/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/suggest/package-info.java
rename to core/src/main/java/org/elasticsearch/action/suggest/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java b/core/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java
rename to core/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java
diff --git a/src/main/java/org/elasticsearch/action/support/ActionFilter.java b/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/ActionFilter.java
rename to core/src/main/java/org/elasticsearch/action/support/ActionFilter.java
diff --git a/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java b/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/ActionFilterChain.java
rename to core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java
diff --git a/src/main/java/org/elasticsearch/action/support/ActionFilters.java b/core/src/main/java/org/elasticsearch/action/support/ActionFilters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/ActionFilters.java
rename to core/src/main/java/org/elasticsearch/action/support/ActionFilters.java
diff --git a/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java b/core/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java
rename to core/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java
diff --git a/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java b/core/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java
rename to core/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java
diff --git a/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java b/core/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java
rename to core/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java
diff --git a/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java b/core/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java
rename to core/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java
diff --git a/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java b/core/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/DestructiveOperations.java
rename to core/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java
diff --git a/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java b/core/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
rename to core/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/core/src/main/java/org/elasticsearch/action/support/IndicesOptions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/IndicesOptions.java
rename to core/src/main/java/org/elasticsearch/action/support/IndicesOptions.java
diff --git a/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java b/core/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/PlainActionFuture.java
rename to core/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java
diff --git a/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java b/core/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java
rename to core/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java
diff --git a/src/main/java/org/elasticsearch/action/support/QuerySourceBuilder.java b/core/src/main/java/org/elasticsearch/action/support/QuerySourceBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/QuerySourceBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/QuerySourceBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java b/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
rename to core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
diff --git a/src/main/java/org/elasticsearch/action/support/ToXContentToBytes.java b/core/src/main/java/org/elasticsearch/action/support/ToXContentToBytes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/ToXContentToBytes.java
rename to core/src/main/java/org/elasticsearch/action/support/ToXContentToBytes.java
diff --git a/src/main/java/org/elasticsearch/action/support/TransportAction.java b/core/src/main/java/org/elasticsearch/action/support/TransportAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/TransportAction.java
rename to core/src/main/java/org/elasticsearch/action/support/TransportAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/TransportActions.java b/core/src/main/java/org/elasticsearch/action/support/TransportActions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/TransportActions.java
rename to core/src/main/java/org/elasticsearch/action/support/TransportActions.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
rename to core/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java b/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
rename to core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java b/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java b/core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
rename to core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java b/core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
rename to core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
rename to core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java b/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java b/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java
rename to core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java b/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java b/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java
rename to core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java b/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
rename to core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java
rename to core/src/main/java/org/elasticsearch/action/support/replication/ReplicationShardOperationFailedException.java
diff --git a/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
rename to core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java b/core/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/single/custom/SingleCustomOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java b/core/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java
rename to core/src/main/java/org/elasticsearch/action/support/single/custom/TransportSingleCustomOperationAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java b/core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java
rename to core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java b/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
rename to core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java b/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java b/core/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/core/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java b/core/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/package-info.java b/core/src/main/java/org/elasticsearch/action/termvectors/dfs/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/dfs/package-info.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/dfs/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/termvectors/package-info.java b/core/src/main/java/org/elasticsearch/action/termvectors/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/termvectors/package-info.java
rename to core/src/main/java/org/elasticsearch/action/termvectors/package-info.java
diff --git a/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java b/core/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java
rename to core/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateAction.java b/core/src/main/java/org/elasticsearch/action/update/UpdateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/update/UpdateAction.java
rename to core/src/main/java/org/elasticsearch/action/update/UpdateAction.java
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/update/UpdateHelper.java
rename to core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/core/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/update/UpdateRequest.java
rename to core/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java
rename to core/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateResponse.java b/core/src/main/java/org/elasticsearch/action/update/UpdateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/action/update/UpdateResponse.java
rename to core/src/main/java/org/elasticsearch/action/update/UpdateResponse.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
rename to core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java b/core/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java
rename to core/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java b/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
rename to core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java b/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
rename to core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/ElasticsearchF.java b/core/src/main/java/org/elasticsearch/bootstrap/ElasticsearchF.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/ElasticsearchF.java
rename to core/src/main/java/org/elasticsearch/bootstrap/ElasticsearchF.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/core/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
rename to core/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java b/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java
rename to core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/JNANatives.java
rename to core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java b/core/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
rename to core/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/Natives.java b/core/src/main/java/org/elasticsearch/bootstrap/Natives.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/Natives.java
rename to core/src/main/java/org/elasticsearch/bootstrap/Natives.java
diff --git a/src/main/java/org/elasticsearch/bootstrap/Security.java b/core/src/main/java/org/elasticsearch/bootstrap/Security.java
similarity index 100%
rename from src/main/java/org/elasticsearch/bootstrap/Security.java
rename to core/src/main/java/org/elasticsearch/bootstrap/Security.java
diff --git a/src/main/java/org/elasticsearch/cache/recycler/DefaultPageCacheRecyclerModule.java b/core/src/main/java/org/elasticsearch/cache/recycler/DefaultPageCacheRecyclerModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cache/recycler/DefaultPageCacheRecyclerModule.java
rename to core/src/main/java/org/elasticsearch/cache/recycler/DefaultPageCacheRecyclerModule.java
diff --git a/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java b/core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java
rename to core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecycler.java
diff --git a/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecyclerModule.java b/core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecyclerModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cache/recycler/PageCacheRecyclerModule.java
rename to core/src/main/java/org/elasticsearch/cache/recycler/PageCacheRecyclerModule.java
diff --git a/src/main/java/org/elasticsearch/client/AdminClient.java b/core/src/main/java/org/elasticsearch/client/AdminClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/AdminClient.java
rename to core/src/main/java/org/elasticsearch/client/AdminClient.java
diff --git a/src/main/java/org/elasticsearch/client/Client.java b/core/src/main/java/org/elasticsearch/client/Client.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/Client.java
rename to core/src/main/java/org/elasticsearch/client/Client.java
diff --git a/src/main/java/org/elasticsearch/client/ClusterAdminClient.java b/core/src/main/java/org/elasticsearch/client/ClusterAdminClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/ClusterAdminClient.java
rename to core/src/main/java/org/elasticsearch/client/ClusterAdminClient.java
diff --git a/src/main/java/org/elasticsearch/client/ElasticsearchClient.java b/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/ElasticsearchClient.java
rename to core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java
diff --git a/src/main/java/org/elasticsearch/client/FilterClient.java b/core/src/main/java/org/elasticsearch/client/FilterClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/FilterClient.java
rename to core/src/main/java/org/elasticsearch/client/FilterClient.java
diff --git a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/core/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/IndicesAdminClient.java
rename to core/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
diff --git a/src/main/java/org/elasticsearch/client/Requests.java b/core/src/main/java/org/elasticsearch/client/Requests.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/Requests.java
rename to core/src/main/java/org/elasticsearch/client/Requests.java
diff --git a/src/main/java/org/elasticsearch/client/node/NodeClient.java b/core/src/main/java/org/elasticsearch/client/node/NodeClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/node/NodeClient.java
rename to core/src/main/java/org/elasticsearch/client/node/NodeClient.java
diff --git a/src/main/java/org/elasticsearch/client/node/NodeClientModule.java b/core/src/main/java/org/elasticsearch/client/node/NodeClientModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/node/NodeClientModule.java
rename to core/src/main/java/org/elasticsearch/client/node/NodeClientModule.java
diff --git a/src/main/java/org/elasticsearch/client/package-info.java b/core/src/main/java/org/elasticsearch/client/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/package-info.java
rename to core/src/main/java/org/elasticsearch/client/package-info.java
diff --git a/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/support/AbstractClient.java
rename to core/src/main/java/org/elasticsearch/client/support/AbstractClient.java
diff --git a/src/main/java/org/elasticsearch/client/support/Headers.java b/core/src/main/java/org/elasticsearch/client/support/Headers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/support/Headers.java
rename to core/src/main/java/org/elasticsearch/client/support/Headers.java
diff --git a/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java b/core/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java
rename to core/src/main/java/org/elasticsearch/client/transport/ClientTransportModule.java
diff --git a/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java b/core/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java
rename to core/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java
diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/transport/TransportClient.java
rename to core/src/main/java/org/elasticsearch/client/transport/TransportClient.java
diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
rename to core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
diff --git a/src/main/java/org/elasticsearch/client/transport/support/TransportProxyClient.java b/core/src/main/java/org/elasticsearch/client/transport/support/TransportProxyClient.java
similarity index 100%
rename from src/main/java/org/elasticsearch/client/transport/support/TransportProxyClient.java
rename to core/src/main/java/org/elasticsearch/client/transport/support/TransportProxyClient.java
diff --git a/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java b/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/AbstractDiffable.java
rename to core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java
diff --git a/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java
rename to core/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java b/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterInfo.java b/core/src/main/java/org/elasticsearch/cluster/ClusterInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterInfo.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterInfo.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterInfoService.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterModule.java b/core/src/main/java/org/elasticsearch/cluster/ClusterModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterModule.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterModule.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterName.java b/core/src/main/java/org/elasticsearch/cluster/ClusterName.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterName.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterName.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java b/core/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterNameModule.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterNameModule.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterService.java b/core/src/main/java/org/elasticsearch/cluster/ClusterService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterService.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterService.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterState.java b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterState.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterState.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterStateListener.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterStateNonMasterUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateNonMasterUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterStateNonMasterUpdateTask.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterStateNonMasterUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java
rename to core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/Diff.java b/core/src/main/java/org/elasticsearch/cluster/Diff.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/Diff.java
rename to core/src/main/java/org/elasticsearch/cluster/Diff.java
diff --git a/src/main/java/org/elasticsearch/cluster/Diffable.java b/core/src/main/java/org/elasticsearch/cluster/Diffable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/Diffable.java
rename to core/src/main/java/org/elasticsearch/cluster/Diffable.java
diff --git a/src/main/java/org/elasticsearch/cluster/DiffableUtils.java b/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/DiffableUtils.java
rename to core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java
diff --git a/src/main/java/org/elasticsearch/cluster/DiskUsage.java b/core/src/main/java/org/elasticsearch/cluster/DiskUsage.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/DiskUsage.java
rename to core/src/main/java/org/elasticsearch/cluster/DiskUsage.java
diff --git a/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java
rename to core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java
diff --git a/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java b/core/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java
rename to core/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java
diff --git a/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
rename to core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java
diff --git a/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java b/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java
rename to core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java
diff --git a/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateNonMasterUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateNonMasterUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ProcessedClusterStateNonMasterUpdateTask.java
rename to core/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateNonMasterUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java
rename to core/src/main/java/org/elasticsearch/cluster/ProcessedClusterStateUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java b/core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java
rename to core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java
diff --git a/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/TimeoutClusterStateUpdateTask.java
rename to core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java b/core/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java
rename to core/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java
diff --git a/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java b/core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java
rename to core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java
diff --git a/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java b/core/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java
rename to core/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java
diff --git a/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/core/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java
rename to core/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java
diff --git a/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java b/core/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java
rename to core/src/main/java/org/elasticsearch/cluster/action/index/NodeIndexDeletedAction.java
diff --git a/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java b/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java
rename to core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java
diff --git a/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java
rename to core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java
diff --git a/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java b/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java
rename to core/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java
diff --git a/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java b/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java
rename to core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java
diff --git a/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java b/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java
rename to core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java
diff --git a/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java b/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java
rename to core/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java b/core/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java b/core/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java b/core/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/RestoreMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/SnapshotId.java b/core/src/main/java/org/elasticsearch/cluster/metadata/SnapshotId.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/SnapshotId.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/SnapshotId.java
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java
rename to core/src/main/java/org/elasticsearch/cluster/metadata/SnapshotMetaData.java
diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
rename to core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java
rename to core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java
diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java
rename to core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeService.java
diff --git a/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
rename to core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/DjbHashFunction.java b/core/src/main/java/org/elasticsearch/cluster/routing/DjbHashFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/DjbHashFunction.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/DjbHashFunction.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java b/core/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/HashFunction.java b/core/src/main/java/org/elasticsearch/cluster/routing/HashFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/HashFunction.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/HashFunction.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java b/core/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java b/core/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java b/core/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java b/core/src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/MutableShardRouting.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java b/core/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java b/core/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/Preference.java b/core/src/main/java/org/elasticsearch/cluster/routing/Preference.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/Preference.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/Preference.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RestoreSource.java b/core/src/main/java/org/elasticsearch/cluster/routing/RestoreSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RestoreSource.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RestoreSource.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java b/core/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingException.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingTableValidation.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/RoutingValidationException.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java b/core/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java b/core/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java b/core/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java b/core/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/SimpleHashFunction.java b/core/src/main/java/org/elasticsearch/cluster/routing/SimpleHashFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/SimpleHashFunction.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/SimpleHashFunction.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationExplanation.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationModule.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedRerouteAllocation.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/StartedRerouteAllocation.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocatorModule.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocators.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateAllocationCommand.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersModule.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DisableAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java
rename to core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java
diff --git a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/core/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
rename to core/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
diff --git a/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java b/core/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java
rename to core/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java
diff --git a/src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettings.java b/core/src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettings.java
rename to core/src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettings.java
diff --git a/src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettingsModule.java b/core/src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettingsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettingsModule.java
rename to core/src/main/java/org/elasticsearch/cluster/settings/ClusterDynamicSettingsModule.java
diff --git a/src/main/java/org/elasticsearch/cluster/settings/DynamicSettings.java b/core/src/main/java/org/elasticsearch/cluster/settings/DynamicSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/settings/DynamicSettings.java
rename to core/src/main/java/org/elasticsearch/cluster/settings/DynamicSettings.java
diff --git a/src/main/java/org/elasticsearch/cluster/settings/Validator.java b/core/src/main/java/org/elasticsearch/cluster/settings/Validator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/cluster/settings/Validator.java
rename to core/src/main/java/org/elasticsearch/cluster/settings/Validator.java
diff --git a/src/main/java/org/elasticsearch/common/Base64.java b/core/src/main/java/org/elasticsearch/common/Base64.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Base64.java
rename to core/src/main/java/org/elasticsearch/common/Base64.java
diff --git a/src/main/java/org/elasticsearch/common/Booleans.java b/core/src/main/java/org/elasticsearch/common/Booleans.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Booleans.java
rename to core/src/main/java/org/elasticsearch/common/Booleans.java
diff --git a/src/main/java/org/elasticsearch/common/Classes.java b/core/src/main/java/org/elasticsearch/common/Classes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Classes.java
rename to core/src/main/java/org/elasticsearch/common/Classes.java
diff --git a/src/main/java/org/elasticsearch/common/ContextAndHeaderHolder.java b/core/src/main/java/org/elasticsearch/common/ContextAndHeaderHolder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/ContextAndHeaderHolder.java
rename to core/src/main/java/org/elasticsearch/common/ContextAndHeaderHolder.java
diff --git a/src/main/java/org/elasticsearch/common/Explicit.java b/core/src/main/java/org/elasticsearch/common/Explicit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Explicit.java
rename to core/src/main/java/org/elasticsearch/common/Explicit.java
diff --git a/src/main/java/org/elasticsearch/common/HasContext.java b/core/src/main/java/org/elasticsearch/common/HasContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/HasContext.java
rename to core/src/main/java/org/elasticsearch/common/HasContext.java
diff --git a/src/main/java/org/elasticsearch/common/HasContextAndHeaders.java b/core/src/main/java/org/elasticsearch/common/HasContextAndHeaders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/HasContextAndHeaders.java
rename to core/src/main/java/org/elasticsearch/common/HasContextAndHeaders.java
diff --git a/src/main/java/org/elasticsearch/common/HasHeaders.java b/core/src/main/java/org/elasticsearch/common/HasHeaders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/HasHeaders.java
rename to core/src/main/java/org/elasticsearch/common/HasHeaders.java
diff --git a/src/main/java/org/elasticsearch/common/MacAddressProvider.java b/core/src/main/java/org/elasticsearch/common/MacAddressProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/MacAddressProvider.java
rename to core/src/main/java/org/elasticsearch/common/MacAddressProvider.java
diff --git a/src/main/java/org/elasticsearch/common/Names.java b/core/src/main/java/org/elasticsearch/common/Names.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Names.java
rename to core/src/main/java/org/elasticsearch/common/Names.java
diff --git a/src/main/java/org/elasticsearch/common/Nullable.java b/core/src/main/java/org/elasticsearch/common/Nullable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Nullable.java
rename to core/src/main/java/org/elasticsearch/common/Nullable.java
diff --git a/src/main/java/org/elasticsearch/common/Numbers.java b/core/src/main/java/org/elasticsearch/common/Numbers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Numbers.java
rename to core/src/main/java/org/elasticsearch/common/Numbers.java
diff --git a/src/main/java/org/elasticsearch/common/ParseField.java b/core/src/main/java/org/elasticsearch/common/ParseField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/ParseField.java
rename to core/src/main/java/org/elasticsearch/common/ParseField.java
diff --git a/src/main/java/org/elasticsearch/common/PidFile.java b/core/src/main/java/org/elasticsearch/common/PidFile.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/PidFile.java
rename to core/src/main/java/org/elasticsearch/common/PidFile.java
diff --git a/src/main/java/org/elasticsearch/common/Priority.java b/core/src/main/java/org/elasticsearch/common/Priority.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Priority.java
rename to core/src/main/java/org/elasticsearch/common/Priority.java
diff --git a/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/core/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java
rename to core/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/SecureRandomHolder.java b/core/src/main/java/org/elasticsearch/common/SecureRandomHolder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/SecureRandomHolder.java
rename to core/src/main/java/org/elasticsearch/common/SecureRandomHolder.java
diff --git a/src/main/java/org/elasticsearch/common/StopWatch.java b/core/src/main/java/org/elasticsearch/common/StopWatch.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/StopWatch.java
rename to core/src/main/java/org/elasticsearch/common/StopWatch.java
diff --git a/src/main/java/org/elasticsearch/common/Strings.java b/core/src/main/java/org/elasticsearch/common/Strings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Strings.java
rename to core/src/main/java/org/elasticsearch/common/Strings.java
diff --git a/src/main/java/org/elasticsearch/common/SuppressForbidden.java b/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/SuppressForbidden.java
rename to core/src/main/java/org/elasticsearch/common/SuppressForbidden.java
diff --git a/src/main/java/org/elasticsearch/common/Table.java b/core/src/main/java/org/elasticsearch/common/Table.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/Table.java
rename to core/src/main/java/org/elasticsearch/common/Table.java
diff --git a/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java b/core/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java
rename to core/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/UUIDGenerator.java b/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/UUIDGenerator.java
rename to core/src/main/java/org/elasticsearch/common/UUIDGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java b/core/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java b/core/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java b/core/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/BlobPath.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java b/core/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/BlobStore.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java b/core/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java b/core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java b/core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java b/core/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java b/core/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobContainer.java b/core/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobContainer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/url/URLBlobContainer.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobContainer.java
diff --git a/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobStore.java b/core/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/blobstore/url/URLBlobStore.java
rename to core/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobStore.java
diff --git a/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java b/core/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java
rename to core/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java
diff --git a/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java b/core/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java
rename to core/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java
diff --git a/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java b/core/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java
rename to core/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java
diff --git a/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java b/core/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java
rename to core/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java
diff --git a/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java b/core/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java
rename to core/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java
diff --git a/src/main/java/org/elasticsearch/common/bytes/BytesArray.java b/core/src/main/java/org/elasticsearch/common/bytes/BytesArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/bytes/BytesArray.java
rename to core/src/main/java/org/elasticsearch/common/bytes/BytesArray.java
diff --git a/src/main/java/org/elasticsearch/common/bytes/BytesReference.java b/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/bytes/BytesReference.java
rename to core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java
diff --git a/src/main/java/org/elasticsearch/common/bytes/ChannelBufferBytesReference.java b/core/src/main/java/org/elasticsearch/common/bytes/ChannelBufferBytesReference.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/bytes/ChannelBufferBytesReference.java
rename to core/src/main/java/org/elasticsearch/common/bytes/ChannelBufferBytesReference.java
diff --git a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java b/core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java
rename to core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java
diff --git a/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java b/core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java
rename to core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java
diff --git a/src/main/java/org/elasticsearch/common/cli/CheckFileCommand.java b/core/src/main/java/org/elasticsearch/common/cli/CheckFileCommand.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/cli/CheckFileCommand.java
rename to core/src/main/java/org/elasticsearch/common/cli/CheckFileCommand.java
diff --git a/src/main/java/org/elasticsearch/common/cli/CliTool.java b/core/src/main/java/org/elasticsearch/common/cli/CliTool.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/cli/CliTool.java
rename to core/src/main/java/org/elasticsearch/common/cli/CliTool.java
diff --git a/src/main/java/org/elasticsearch/common/cli/CliToolConfig.java b/core/src/main/java/org/elasticsearch/common/cli/CliToolConfig.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/cli/CliToolConfig.java
rename to core/src/main/java/org/elasticsearch/common/cli/CliToolConfig.java
diff --git a/src/main/java/org/elasticsearch/common/cli/HelpPrinter.java b/core/src/main/java/org/elasticsearch/common/cli/HelpPrinter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/cli/HelpPrinter.java
rename to core/src/main/java/org/elasticsearch/common/cli/HelpPrinter.java
diff --git a/src/main/java/org/elasticsearch/common/cli/Terminal.java b/core/src/main/java/org/elasticsearch/common/cli/Terminal.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/cli/Terminal.java
rename to core/src/main/java/org/elasticsearch/common/cli/Terminal.java
diff --git a/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java b/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java
rename to core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java
diff --git a/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashSet.java b/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashSet.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashSet.java
rename to core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashSet.java
diff --git a/src/main/java/org/elasticsearch/common/collect/HppcMaps.java b/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/HppcMaps.java
rename to core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java
diff --git a/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java b/core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java
rename to core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java
diff --git a/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java b/core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java
rename to core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java
diff --git a/src/main/java/org/elasticsearch/common/collect/MapBuilder.java b/core/src/main/java/org/elasticsearch/common/collect/MapBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/MapBuilder.java
rename to core/src/main/java/org/elasticsearch/common/collect/MapBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/collect/Tuple.java b/core/src/main/java/org/elasticsearch/common/collect/Tuple.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/collect/Tuple.java
rename to core/src/main/java/org/elasticsearch/common/collect/Tuple.java
diff --git a/src/main/java/org/elasticsearch/common/component/AbstractComponent.java b/core/src/main/java/org/elasticsearch/common/component/AbstractComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/component/AbstractComponent.java
rename to core/src/main/java/org/elasticsearch/common/component/AbstractComponent.java
diff --git a/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/core/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java
rename to core/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java
diff --git a/src/main/java/org/elasticsearch/common/component/Lifecycle.java b/core/src/main/java/org/elasticsearch/common/component/Lifecycle.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/component/Lifecycle.java
rename to core/src/main/java/org/elasticsearch/common/component/Lifecycle.java
diff --git a/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java b/core/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/component/LifecycleComponent.java
rename to core/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java
diff --git a/src/main/java/org/elasticsearch/common/component/LifecycleListener.java b/core/src/main/java/org/elasticsearch/common/component/LifecycleListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/component/LifecycleListener.java
rename to core/src/main/java/org/elasticsearch/common/component/LifecycleListener.java
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java b/core/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java
rename to core/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java b/core/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java
rename to core/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java b/core/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/CompressedXContent.java
rename to core/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java
diff --git a/src/main/java/org/elasticsearch/common/compress/Compressor.java b/core/src/main/java/org/elasticsearch/common/compress/Compressor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/Compressor.java
rename to core/src/main/java/org/elasticsearch/common/compress/Compressor.java
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java b/core/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
rename to core/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
diff --git a/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java b/core/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/NotCompressedException.java
rename to core/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java
diff --git a/src/main/java/org/elasticsearch/common/compress/NotXContentException.java b/core/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/NotXContentException.java
rename to core/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
diff --git a/src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java b/core/src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java
rename to core/src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java b/core/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java
rename to core/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java b/core/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java
rename to core/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java b/core/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
rename to core/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
diff --git a/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/GeoDistance.java
rename to core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java
diff --git a/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java b/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java
rename to core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java
diff --git a/src/main/java/org/elasticsearch/common/geo/GeoPoint.java b/core/src/main/java/org/elasticsearch/common/geo/GeoPoint.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/GeoPoint.java
rename to core/src/main/java/org/elasticsearch/common/geo/GeoPoint.java
diff --git a/src/main/java/org/elasticsearch/common/geo/GeoUtils.java b/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/GeoUtils.java
rename to core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java
diff --git a/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java b/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/ShapeRelation.java
rename to core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java
diff --git a/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java b/core/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java
rename to core/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java
diff --git a/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java b/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java
rename to core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java
diff --git a/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java b/core/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/XShapeCollection.java
rename to core/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/BaseLineStringBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/BaseLineStringBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/BaseLineStringBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/BaseLineStringBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/BasePolygonBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/BasePolygonBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/BasePolygonBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/BasePolygonBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/PointCollection.java b/core/src/main/java/org/elasticsearch/common/geo/builders/PointCollection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/PointCollection.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/PointCollection.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
rename to core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java b/core/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/hash/MurmurHash3.java
rename to core/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java
diff --git a/src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java b/core/src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java
rename to core/src/main/java/org/elasticsearch/common/http/client/HttpDownloadHelper.java
diff --git a/src/main/java/org/elasticsearch/common/inject/AbstractModule.java b/core/src/main/java/org/elasticsearch/common/inject/AbstractModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/AbstractModule.java
rename to core/src/main/java/org/elasticsearch/common/inject/AbstractModule.java
diff --git a/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Binder.java b/core/src/main/java/org/elasticsearch/common/inject/Binder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Binder.java
rename to core/src/main/java/org/elasticsearch/common/inject/Binder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Binding.java b/core/src/main/java/org/elasticsearch/common/inject/Binding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Binding.java
rename to core/src/main/java/org/elasticsearch/common/inject/Binding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java b/core/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java
rename to core/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java
diff --git a/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/BindingProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java b/core/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java
rename to core/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java b/core/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConfigurationException.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java b/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConstantFactory.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java b/core/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java b/core/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java b/core/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java b/core/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java
rename to core/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java b/core/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ContextualCallable.java
rename to core/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java
diff --git a/src/main/java/org/elasticsearch/common/inject/CreationException.java b/core/src/main/java/org/elasticsearch/common/inject/CreationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/CreationException.java
rename to core/src/main/java/org/elasticsearch/common/inject/CreationException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java b/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java
rename to core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java
diff --git a/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java b/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/DeferredLookups.java
rename to core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java
diff --git a/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java b/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/EncounterImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Exposed.java b/core/src/main/java/org/elasticsearch/common/inject/Exposed.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Exposed.java
rename to core/src/main/java/org/elasticsearch/common/inject/Exposed.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java b/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java
rename to core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java
diff --git a/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java b/core/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/FactoryProxy.java
rename to core/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Guice.java b/core/src/main/java/org/elasticsearch/common/inject/Guice.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Guice.java
rename to core/src/main/java/org/elasticsearch/common/inject/Guice.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java b/core/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ImplementedBy.java
rename to core/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java
diff --git a/src/main/java/org/elasticsearch/common/inject/InheritingState.java b/core/src/main/java/org/elasticsearch/common/inject/InheritingState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/InheritingState.java
rename to core/src/main/java/org/elasticsearch/common/inject/InheritingState.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Initializable.java b/core/src/main/java/org/elasticsearch/common/inject/Initializable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Initializable.java
rename to core/src/main/java/org/elasticsearch/common/inject/Initializable.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Initializables.java b/core/src/main/java/org/elasticsearch/common/inject/Initializables.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Initializables.java
rename to core/src/main/java/org/elasticsearch/common/inject/Initializables.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Initializer.java b/core/src/main/java/org/elasticsearch/common/inject/Initializer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Initializer.java
rename to core/src/main/java/org/elasticsearch/common/inject/Initializer.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Inject.java b/core/src/main/java/org/elasticsearch/common/inject/Inject.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Inject.java
rename to core/src/main/java/org/elasticsearch/common/inject/Inject.java
diff --git a/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Injector.java b/core/src/main/java/org/elasticsearch/common/inject/Injector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Injector.java
rename to core/src/main/java/org/elasticsearch/common/inject/Injector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java b/core/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/InjectorImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/InjectorShell.java b/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/InjectorShell.java
rename to core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Injectors.java b/core/src/main/java/org/elasticsearch/common/inject/Injectors.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Injectors.java
rename to core/src/main/java/org/elasticsearch/common/inject/Injectors.java
diff --git a/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java b/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java
rename to core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Key.java b/core/src/main/java/org/elasticsearch/common/inject/Key.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Key.java
rename to core/src/main/java/org/elasticsearch/common/inject/Key.java
diff --git a/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/LookupProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Lookups.java b/core/src/main/java/org/elasticsearch/common/inject/Lookups.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Lookups.java
rename to core/src/main/java/org/elasticsearch/common/inject/Lookups.java
diff --git a/src/main/java/org/elasticsearch/common/inject/MembersInjector.java b/core/src/main/java/org/elasticsearch/common/inject/MembersInjector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/MembersInjector.java
rename to core/src/main/java/org/elasticsearch/common/inject/MembersInjector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java b/core/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java b/core/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java
rename to core/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java
diff --git a/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/MessageProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Module.java b/core/src/main/java/org/elasticsearch/common/inject/Module.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Module.java
rename to core/src/main/java/org/elasticsearch/common/inject/Module.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Modules.java b/core/src/main/java/org/elasticsearch/common/inject/Modules.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Modules.java
rename to core/src/main/java/org/elasticsearch/common/inject/Modules.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java b/core/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java
rename to core/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java b/core/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/PreProcessModule.java
rename to core/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java
diff --git a/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java b/core/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/PrivateBinder.java
rename to core/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/PrivateModule.java b/core/src/main/java/org/elasticsearch/common/inject/PrivateModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/PrivateModule.java
rename to core/src/main/java/org/elasticsearch/common/inject/PrivateModule.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java b/core/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ProvidedBy.java
rename to core/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Provider.java b/core/src/main/java/org/elasticsearch/common/inject/Provider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Provider.java
rename to core/src/main/java/org/elasticsearch/common/inject/Provider.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java b/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java
rename to core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Provides.java b/core/src/main/java/org/elasticsearch/common/inject/Provides.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Provides.java
rename to core/src/main/java/org/elasticsearch/common/inject/Provides.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ProvisionException.java b/core/src/main/java/org/elasticsearch/common/inject/ProvisionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ProvisionException.java
rename to core/src/main/java/org/elasticsearch/common/inject/ProvisionException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Reflection.java b/core/src/main/java/org/elasticsearch/common/inject/Reflection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Reflection.java
rename to core/src/main/java/org/elasticsearch/common/inject/Reflection.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Scope.java b/core/src/main/java/org/elasticsearch/common/inject/Scope.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Scope.java
rename to core/src/main/java/org/elasticsearch/common/inject/Scope.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java b/core/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java
rename to core/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java
diff --git a/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Scopes.java b/core/src/main/java/org/elasticsearch/common/inject/Scopes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Scopes.java
rename to core/src/main/java/org/elasticsearch/common/inject/Scopes.java
diff --git a/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java
rename to core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java
rename to core/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java
rename to core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java
rename to core/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Singleton.java b/core/src/main/java/org/elasticsearch/common/inject/Singleton.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Singleton.java
rename to core/src/main/java/org/elasticsearch/common/inject/Singleton.java
diff --git a/src/main/java/org/elasticsearch/common/inject/SpawnModules.java b/core/src/main/java/org/elasticsearch/common/inject/SpawnModules.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/SpawnModules.java
rename to core/src/main/java/org/elasticsearch/common/inject/SpawnModules.java
diff --git a/src/main/java/org/elasticsearch/common/inject/Stage.java b/core/src/main/java/org/elasticsearch/common/inject/Stage.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/Stage.java
rename to core/src/main/java/org/elasticsearch/common/inject/Stage.java
diff --git a/src/main/java/org/elasticsearch/common/inject/State.java b/core/src/main/java/org/elasticsearch/common/inject/State.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/State.java
rename to core/src/main/java/org/elasticsearch/common/inject/State.java
diff --git a/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java
rename to core/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java b/core/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/TypeLiteral.java
rename to core/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java
diff --git a/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java b/core/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/WeakKeySet.java
rename to core/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider2.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java
diff --git a/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/binder/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/binder/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/binder/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/binder/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Annotations.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java b/core/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/AsynchronousComputationException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ComputationException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Errors.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Errors.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java b/core/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java b/core/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java b/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Join.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Join.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Join.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Join.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java b/core/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java b/core/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java b/core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Nullability.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Nullable.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Scoping.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java b/core/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java b/core/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/Strings.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Strings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/Strings.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/Strings.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java b/core/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java b/core/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java b/core/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/internal/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/internal/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/internal/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/internal/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java b/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java
rename to core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java
diff --git a/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java b/core/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java
rename to core/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java
diff --git a/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java b/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java
rename to core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java
diff --git a/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/matcher/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/multibindings/Element.java
rename to core/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java
diff --git a/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java
rename to core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java
rename to core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java
diff --git a/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java
rename to core/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java
diff --git a/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/name/Named.java b/core/src/main/java/org/elasticsearch/common/inject/name/Named.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/name/Named.java
rename to core/src/main/java/org/elasticsearch/common/inject/name/Named.java
diff --git a/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java b/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java
rename to core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java
diff --git a/src/main/java/org/elasticsearch/common/inject/name/Names.java b/core/src/main/java/org/elasticsearch/common/inject/name/Names.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/name/Names.java
rename to core/src/main/java/org/elasticsearch/common/inject/name/Names.java
diff --git a/src/main/java/org/elasticsearch/common/inject/name/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/name/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/name/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/name/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java b/core/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java b/core/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java b/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java b/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java b/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java b/core/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/Dependency.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/Element.java b/core/src/main/java/org/elasticsearch/common/inject/spi/Element.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/Element.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/Element.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/Elements.java b/core/src/main/java/org/elasticsearch/common/inject/spi/Elements.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/Elements.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/Elements.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java b/core/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java b/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java b/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java b/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java b/core/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/Message.java b/core/src/main/java/org/elasticsearch/common/inject/spi/Message.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/Message.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/Message.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java b/core/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java b/core/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java b/core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java b/core/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java b/core/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java b/core/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java
diff --git a/src/main/java/org/elasticsearch/common/inject/spi/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/spi/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/spi/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/spi/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/inject/util/Modules.java b/core/src/main/java/org/elasticsearch/common/inject/util/Modules.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/util/Modules.java
rename to core/src/main/java/org/elasticsearch/common/inject/util/Modules.java
diff --git a/src/main/java/org/elasticsearch/common/inject/util/Providers.java b/core/src/main/java/org/elasticsearch/common/inject/util/Providers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/util/Providers.java
rename to core/src/main/java/org/elasticsearch/common/inject/util/Providers.java
diff --git a/src/main/java/org/elasticsearch/common/inject/util/Types.java b/core/src/main/java/org/elasticsearch/common/inject/util/Types.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/util/Types.java
rename to core/src/main/java/org/elasticsearch/common/inject/util/Types.java
diff --git a/src/main/java/org/elasticsearch/common/inject/util/package-info.java b/core/src/main/java/org/elasticsearch/common/inject/util/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/inject/util/package-info.java
rename to core/src/main/java/org/elasticsearch/common/inject/util/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/io/BytesStream.java b/core/src/main/java/org/elasticsearch/common/io/BytesStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/BytesStream.java
rename to core/src/main/java/org/elasticsearch/common/io/BytesStream.java
diff --git a/src/main/java/org/elasticsearch/common/io/Channels.java b/core/src/main/java/org/elasticsearch/common/io/Channels.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/Channels.java
rename to core/src/main/java/org/elasticsearch/common/io/Channels.java
diff --git a/src/main/java/org/elasticsearch/common/io/CharSequenceReader.java b/core/src/main/java/org/elasticsearch/common/io/CharSequenceReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/CharSequenceReader.java
rename to core/src/main/java/org/elasticsearch/common/io/CharSequenceReader.java
diff --git a/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java b/core/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java
rename to core/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java
diff --git a/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java b/core/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java
rename to core/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java
diff --git a/src/main/java/org/elasticsearch/common/io/FastStringReader.java b/core/src/main/java/org/elasticsearch/common/io/FastStringReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/FastStringReader.java
rename to core/src/main/java/org/elasticsearch/common/io/FastStringReader.java
diff --git a/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java b/core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/FileSystemUtils.java
rename to core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java
diff --git a/src/main/java/org/elasticsearch/common/io/PathUtils.java b/core/src/main/java/org/elasticsearch/common/io/PathUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/PathUtils.java
rename to core/src/main/java/org/elasticsearch/common/io/PathUtils.java
diff --git a/src/main/java/org/elasticsearch/common/io/ReleasableBytesStream.java b/core/src/main/java/org/elasticsearch/common/io/ReleasableBytesStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/ReleasableBytesStream.java
rename to core/src/main/java/org/elasticsearch/common/io/ReleasableBytesStream.java
diff --git a/src/main/java/org/elasticsearch/common/io/Streams.java b/core/src/main/java/org/elasticsearch/common/io/Streams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/Streams.java
rename to core/src/main/java/org/elasticsearch/common/io/Streams.java
diff --git a/src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java b/core/src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java
rename to core/src/main/java/org/elasticsearch/common/io/ThrowableObjectInputStream.java
diff --git a/src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java b/core/src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java
rename to core/src/main/java/org/elasticsearch/common/io/ThrowableObjectOutputStream.java
diff --git a/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java b/core/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java
rename to core/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/Streamable.java b/core/src/main/java/org/elasticsearch/common/io/stream/Streamable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/Streamable.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/Streamable.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/StreamableReader.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamableReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/StreamableReader.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/StreamableReader.java
diff --git a/src/main/java/org/elasticsearch/common/io/stream/Writeable.java b/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/io/stream/Writeable.java
rename to core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java
diff --git a/src/main/java/org/elasticsearch/common/joda/DateMathParser.java b/core/src/main/java/org/elasticsearch/common/joda/DateMathParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/joda/DateMathParser.java
rename to core/src/main/java/org/elasticsearch/common/joda/DateMathParser.java
diff --git a/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java b/core/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java
rename to core/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java
diff --git a/src/main/java/org/elasticsearch/common/joda/Joda.java b/core/src/main/java/org/elasticsearch/common/joda/Joda.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/joda/Joda.java
rename to core/src/main/java/org/elasticsearch/common/joda/Joda.java
diff --git a/src/main/java/org/elasticsearch/common/lease/Releasable.java b/core/src/main/java/org/elasticsearch/common/lease/Releasable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lease/Releasable.java
rename to core/src/main/java/org/elasticsearch/common/lease/Releasable.java
diff --git a/src/main/java/org/elasticsearch/common/lease/Releasables.java b/core/src/main/java/org/elasticsearch/common/lease/Releasables.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lease/Releasables.java
rename to core/src/main/java/org/elasticsearch/common/lease/Releasables.java
diff --git a/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java b/core/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java
rename to core/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java
diff --git a/src/main/java/org/elasticsearch/common/logging/ESLogger.java b/core/src/main/java/org/elasticsearch/common/logging/ESLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/ESLogger.java
rename to core/src/main/java/org/elasticsearch/common/logging/ESLogger.java
diff --git a/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java b/core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
rename to core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
diff --git a/src/main/java/org/elasticsearch/common/logging/Loggers.java b/core/src/main/java/org/elasticsearch/common/logging/Loggers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/Loggers.java
rename to core/src/main/java/org/elasticsearch/common/logging/Loggers.java
diff --git a/src/main/java/org/elasticsearch/common/logging/jdk/ESLogRecord.java b/core/src/main/java/org/elasticsearch/common/logging/jdk/ESLogRecord.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/jdk/ESLogRecord.java
rename to core/src/main/java/org/elasticsearch/common/logging/jdk/ESLogRecord.java
diff --git a/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java b/core/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java
rename to core/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLogger.java
diff --git a/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java b/core/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java
rename to core/src/main/java/org/elasticsearch/common/logging/jdk/JdkESLoggerFactory.java
diff --git a/src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java b/core/src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java
rename to core/src/main/java/org/elasticsearch/common/logging/log4j/ConsoleAppender.java
diff --git a/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java b/core/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java
rename to core/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLogger.java
diff --git a/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java b/core/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java
rename to core/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java
diff --git a/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java b/core/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java
rename to core/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java
diff --git a/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java b/core/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java
rename to core/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLogger.java
diff --git a/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java b/core/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java
rename to core/src/main/java/org/elasticsearch/common/logging/slf4j/Slf4jESLoggerFactory.java
diff --git a/src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java b/core/src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java
rename to core/src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java
diff --git a/src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java b/core/src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java
rename to core/src/main/java/org/elasticsearch/common/logging/support/LoggerMessageFormat.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java b/core/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/BytesRefs.java
rename to core/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/IndexCacheableQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/IndexCacheableQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/IndexCacheableQuery.java
rename to core/src/main/java/org/elasticsearch/common/lucene/IndexCacheableQuery.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java b/core/src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java
rename to core/src/main/java/org/elasticsearch/common/lucene/IndexCommitDelegate.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java b/core/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java
rename to core/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/Lucene.java
rename to core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java b/core/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java
rename to core/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java b/core/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/ScorerAware.java
rename to core/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java b/core/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java
rename to core/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java b/core/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java
rename to core/src/main/java/org/elasticsearch/common/lucene/all/AllEntries.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/all/AllField.java b/core/src/main/java/org/elasticsearch/common/lucene/all/AllField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/all/AllField.java
rename to core/src/main/java/org/elasticsearch/common/lucene/all/AllField.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java
rename to core/src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java b/core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java
rename to core/src/main/java/org/elasticsearch/common/lucene/all/AllTokenStream.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java b/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java
rename to core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java b/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java
rename to core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
rename to core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java b/core/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
rename to core/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java b/core/src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java b/core/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java b/core/src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/NoopCollector.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/Queries.java b/core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/Queries.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java b/core/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/BoostScoreFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/CustomBoostFactorScorer.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/CustomBoostFactorScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/CustomBoostFactorScorer.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/CustomBoostFactorScorer.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java
rename to core/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java b/core/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java
rename to core/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java b/core/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java
rename to core/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/store/OutputStreamIndexOutput.java b/core/src/main/java/org/elasticsearch/common/lucene/store/OutputStreamIndexOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/store/OutputStreamIndexOutput.java
rename to core/src/main/java/org/elasticsearch/common/lucene/store/OutputStreamIndexOutput.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java b/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java
rename to core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java
diff --git a/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java b/core/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/lucene/uid/Versions.java
rename to core/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java
diff --git a/src/main/java/org/elasticsearch/common/math/MathUtils.java b/core/src/main/java/org/elasticsearch/common/math/MathUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/math/MathUtils.java
rename to core/src/main/java/org/elasticsearch/common/math/MathUtils.java
diff --git a/src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java b/core/src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java
rename to core/src/main/java/org/elasticsearch/common/math/UnboxedMathUtils.java
diff --git a/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java b/core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/metrics/CounterMetric.java
rename to core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java
diff --git a/src/main/java/org/elasticsearch/common/metrics/EWMA.java b/core/src/main/java/org/elasticsearch/common/metrics/EWMA.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/metrics/EWMA.java
rename to core/src/main/java/org/elasticsearch/common/metrics/EWMA.java
diff --git a/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java b/core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/metrics/MeanMetric.java
rename to core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java
diff --git a/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java b/core/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/metrics/MeterMetric.java
rename to core/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java
diff --git a/src/main/java/org/elasticsearch/common/metrics/Metric.java b/core/src/main/java/org/elasticsearch/common/metrics/Metric.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/metrics/Metric.java
rename to core/src/main/java/org/elasticsearch/common/metrics/Metric.java
diff --git a/src/main/java/org/elasticsearch/common/netty/KeepFrameDecoder.java b/core/src/main/java/org/elasticsearch/common/netty/KeepFrameDecoder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/netty/KeepFrameDecoder.java
rename to core/src/main/java/org/elasticsearch/common/netty/KeepFrameDecoder.java
diff --git a/src/main/java/org/elasticsearch/common/netty/NettyUtils.java b/core/src/main/java/org/elasticsearch/common/netty/NettyUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/netty/NettyUtils.java
rename to core/src/main/java/org/elasticsearch/common/netty/NettyUtils.java
diff --git a/src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java b/core/src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java
rename to core/src/main/java/org/elasticsearch/common/netty/OpenChannelsHandler.java
diff --git a/src/main/java/org/elasticsearch/common/netty/ReleaseChannelFutureListener.java b/core/src/main/java/org/elasticsearch/common/netty/ReleaseChannelFutureListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/netty/ReleaseChannelFutureListener.java
rename to core/src/main/java/org/elasticsearch/common/netty/ReleaseChannelFutureListener.java
diff --git a/src/main/java/org/elasticsearch/common/network/MulticastChannel.java b/core/src/main/java/org/elasticsearch/common/network/MulticastChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/network/MulticastChannel.java
rename to core/src/main/java/org/elasticsearch/common/network/MulticastChannel.java
diff --git a/src/main/java/org/elasticsearch/common/network/NetworkModule.java b/core/src/main/java/org/elasticsearch/common/network/NetworkModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/network/NetworkModule.java
rename to core/src/main/java/org/elasticsearch/common/network/NetworkModule.java
diff --git a/src/main/java/org/elasticsearch/common/network/NetworkService.java b/core/src/main/java/org/elasticsearch/common/network/NetworkService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/network/NetworkService.java
rename to core/src/main/java/org/elasticsearch/common/network/NetworkService.java
diff --git a/src/main/java/org/elasticsearch/common/network/NetworkUtils.java b/core/src/main/java/org/elasticsearch/common/network/NetworkUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/network/NetworkUtils.java
rename to core/src/main/java/org/elasticsearch/common/network/NetworkUtils.java
diff --git a/src/main/java/org/elasticsearch/common/path/PathTrie.java b/core/src/main/java/org/elasticsearch/common/path/PathTrie.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/path/PathTrie.java
rename to core/src/main/java/org/elasticsearch/common/path/PathTrie.java
diff --git a/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java b/core/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java
rename to core/src/main/java/org/elasticsearch/common/property/PropertyPlaceholder.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java b/core/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java
rename to core/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java b/core/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java
rename to core/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java b/core/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java
rename to core/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java b/core/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java
rename to core/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java b/core/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java
rename to core/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java b/core/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java
rename to core/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/Recycler.java b/core/src/main/java/org/elasticsearch/common/recycler/Recycler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/Recycler.java
rename to core/src/main/java/org/elasticsearch/common/recycler/Recycler.java
diff --git a/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/recycler/Recyclers.java
rename to core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java
diff --git a/src/main/java/org/elasticsearch/common/regex/Regex.java b/core/src/main/java/org/elasticsearch/common/regex/Regex.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/regex/Regex.java
rename to core/src/main/java/org/elasticsearch/common/regex/Regex.java
diff --git a/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java b/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java
rename to core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java
diff --git a/src/main/java/org/elasticsearch/common/rounding/Rounding.java b/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/rounding/Rounding.java
rename to core/src/main/java/org/elasticsearch/common/rounding/Rounding.java
diff --git a/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java b/core/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java
rename to core/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java
diff --git a/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java b/core/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java
rename to core/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java
diff --git a/src/main/java/org/elasticsearch/common/settings/Settings.java b/core/src/main/java/org/elasticsearch/common/settings/Settings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/Settings.java
rename to core/src/main/java/org/elasticsearch/common/settings/Settings.java
diff --git a/src/main/java/org/elasticsearch/common/settings/SettingsException.java b/core/src/main/java/org/elasticsearch/common/settings/SettingsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/SettingsException.java
rename to core/src/main/java/org/elasticsearch/common/settings/SettingsException.java
diff --git a/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java b/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
rename to core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
diff --git a/src/main/java/org/elasticsearch/common/settings/SettingsModule.java b/core/src/main/java/org/elasticsearch/common/settings/SettingsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/SettingsModule.java
rename to core/src/main/java/org/elasticsearch/common/settings/SettingsModule.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java b/core/src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/JsonSettingsLoader.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java b/core/src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/PropertiesSettingsLoader.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java b/core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoader.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java b/core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/XContentSettingsLoader.java b/core/src/main/java/org/elasticsearch/common/settings/loader/XContentSettingsLoader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/XContentSettingsLoader.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/XContentSettingsLoader.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java b/core/src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/YamlSettingsLoader.java
diff --git a/src/main/java/org/elasticsearch/common/settings/loader/package-info.java b/core/src/main/java/org/elasticsearch/common/settings/loader/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/loader/package-info.java
rename to core/src/main/java/org/elasticsearch/common/settings/loader/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/settings/package-info.java b/core/src/main/java/org/elasticsearch/common/settings/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/settings/package-info.java
rename to core/src/main/java/org/elasticsearch/common/settings/package-info.java
diff --git a/src/main/java/org/elasticsearch/common/text/BytesText.java b/core/src/main/java/org/elasticsearch/common/text/BytesText.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/text/BytesText.java
rename to core/src/main/java/org/elasticsearch/common/text/BytesText.java
diff --git a/src/main/java/org/elasticsearch/common/text/StringAndBytesText.java b/core/src/main/java/org/elasticsearch/common/text/StringAndBytesText.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/text/StringAndBytesText.java
rename to core/src/main/java/org/elasticsearch/common/text/StringAndBytesText.java
diff --git a/src/main/java/org/elasticsearch/common/text/StringText.java b/core/src/main/java/org/elasticsearch/common/text/StringText.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/text/StringText.java
rename to core/src/main/java/org/elasticsearch/common/text/StringText.java
diff --git a/src/main/java/org/elasticsearch/common/text/Text.java b/core/src/main/java/org/elasticsearch/common/text/Text.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/text/Text.java
rename to core/src/main/java/org/elasticsearch/common/text/Text.java
diff --git a/src/main/java/org/elasticsearch/common/text/UTF8SortedAsUnicodeComparator.java b/core/src/main/java/org/elasticsearch/common/text/UTF8SortedAsUnicodeComparator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/text/UTF8SortedAsUnicodeComparator.java
rename to core/src/main/java/org/elasticsearch/common/text/UTF8SortedAsUnicodeComparator.java
diff --git a/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java b/core/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java
rename to core/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java
diff --git a/src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java b/core/src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java
rename to core/src/main/java/org/elasticsearch/common/transport/DummyTransportAddress.java
diff --git a/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java b/core/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
rename to core/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
diff --git a/src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java b/core/src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java
rename to core/src/main/java/org/elasticsearch/common/transport/LocalTransportAddress.java
diff --git a/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java b/core/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java
rename to core/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java
diff --git a/src/main/java/org/elasticsearch/common/transport/PortsRange.java b/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/PortsRange.java
rename to core/src/main/java/org/elasticsearch/common/transport/PortsRange.java
diff --git a/src/main/java/org/elasticsearch/common/transport/TransportAddress.java b/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/TransportAddress.java
rename to core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java
diff --git a/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java b/core/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java
rename to core/src/main/java/org/elasticsearch/common/transport/TransportAddressSerializers.java
diff --git a/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java b/core/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java
rename to core/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java
diff --git a/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/core/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java
rename to core/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java
diff --git a/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/DistanceUnit.java
rename to core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java
diff --git a/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/Fuzziness.java
rename to core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java
diff --git a/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java b/core/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java
rename to core/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java
diff --git a/src/main/java/org/elasticsearch/common/unit/RatioValue.java b/core/src/main/java/org/elasticsearch/common/unit/RatioValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/RatioValue.java
rename to core/src/main/java/org/elasticsearch/common/unit/RatioValue.java
diff --git a/src/main/java/org/elasticsearch/common/unit/SizeUnit.java b/core/src/main/java/org/elasticsearch/common/unit/SizeUnit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/SizeUnit.java
rename to core/src/main/java/org/elasticsearch/common/unit/SizeUnit.java
diff --git a/src/main/java/org/elasticsearch/common/unit/SizeValue.java b/core/src/main/java/org/elasticsearch/common/unit/SizeValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/SizeValue.java
rename to core/src/main/java/org/elasticsearch/common/unit/SizeValue.java
diff --git a/src/main/java/org/elasticsearch/common/unit/TimeValue.java b/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/unit/TimeValue.java
rename to core/src/main/java/org/elasticsearch/common/unit/TimeValue.java
diff --git a/src/main/java/org/elasticsearch/common/util/AbstractArray.java b/core/src/main/java/org/elasticsearch/common/util/AbstractArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/AbstractArray.java
rename to core/src/main/java/org/elasticsearch/common/util/AbstractArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java b/core/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/AbstractBigArray.java
rename to core/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/AbstractHash.java b/core/src/main/java/org/elasticsearch/common/util/AbstractHash.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/AbstractHash.java
rename to core/src/main/java/org/elasticsearch/common/util/AbstractHash.java
diff --git a/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java b/core/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java
rename to core/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java
diff --git a/src/main/java/org/elasticsearch/common/util/ArrayUtils.java b/core/src/main/java/org/elasticsearch/common/util/ArrayUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/ArrayUtils.java
rename to core/src/main/java/org/elasticsearch/common/util/ArrayUtils.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigArray.java b/core/src/main/java/org/elasticsearch/common/util/BigArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigArrays.java b/core/src/main/java/org/elasticsearch/common/util/BigArrays.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigArrays.java
rename to core/src/main/java/org/elasticsearch/common/util/BigArrays.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigArraysModule.java b/core/src/main/java/org/elasticsearch/common/util/BigArraysModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigArraysModule.java
rename to core/src/main/java/org/elasticsearch/common/util/BigArraysModule.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigByteArray.java b/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigByteArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigByteArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java b/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigDoubleArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigFloatArray.java b/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigFloatArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigIntArray.java b/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigIntArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigIntArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigLongArray.java b/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigLongArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigLongArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BigObjectArray.java b/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BigObjectArray.java
rename to core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/BloomFilter.java b/core/src/main/java/org/elasticsearch/common/util/BloomFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BloomFilter.java
rename to core/src/main/java/org/elasticsearch/common/util/BloomFilter.java
diff --git a/src/main/java/org/elasticsearch/common/util/ByteArray.java b/core/src/main/java/org/elasticsearch/common/util/ByteArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/ByteArray.java
rename to core/src/main/java/org/elasticsearch/common/util/ByteArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/ByteUtils.java b/core/src/main/java/org/elasticsearch/common/util/ByteUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/ByteUtils.java
rename to core/src/main/java/org/elasticsearch/common/util/ByteUtils.java
diff --git a/src/main/java/org/elasticsearch/common/util/BytesRefHash.java b/core/src/main/java/org/elasticsearch/common/util/BytesRefHash.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/BytesRefHash.java
rename to core/src/main/java/org/elasticsearch/common/util/BytesRefHash.java
diff --git a/src/main/java/org/elasticsearch/common/util/Callback.java b/core/src/main/java/org/elasticsearch/common/util/Callback.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/Callback.java
rename to core/src/main/java/org/elasticsearch/common/util/Callback.java
diff --git a/src/main/java/org/elasticsearch/common/util/CancellableThreads.java b/core/src/main/java/org/elasticsearch/common/util/CancellableThreads.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/CancellableThreads.java
rename to core/src/main/java/org/elasticsearch/common/util/CancellableThreads.java
diff --git a/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/CollectionUtils.java
rename to core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
diff --git a/src/main/java/org/elasticsearch/common/util/Comparators.java b/core/src/main/java/org/elasticsearch/common/util/Comparators.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/Comparators.java
rename to core/src/main/java/org/elasticsearch/common/util/Comparators.java
diff --git a/src/main/java/org/elasticsearch/common/util/DefaultBigArraysModule.java b/core/src/main/java/org/elasticsearch/common/util/DefaultBigArraysModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/DefaultBigArraysModule.java
rename to core/src/main/java/org/elasticsearch/common/util/DefaultBigArraysModule.java
diff --git a/src/main/java/org/elasticsearch/common/util/DoubleArray.java b/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/DoubleArray.java
rename to core/src/main/java/org/elasticsearch/common/util/DoubleArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/FloatArray.java b/core/src/main/java/org/elasticsearch/common/util/FloatArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/FloatArray.java
rename to core/src/main/java/org/elasticsearch/common/util/FloatArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/IntArray.java b/core/src/main/java/org/elasticsearch/common/util/IntArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/IntArray.java
rename to core/src/main/java/org/elasticsearch/common/util/IntArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/LocaleUtils.java b/core/src/main/java/org/elasticsearch/common/util/LocaleUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/LocaleUtils.java
rename to core/src/main/java/org/elasticsearch/common/util/LocaleUtils.java
diff --git a/src/main/java/org/elasticsearch/common/util/LongArray.java b/core/src/main/java/org/elasticsearch/common/util/LongArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/LongArray.java
rename to core/src/main/java/org/elasticsearch/common/util/LongArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/LongHash.java b/core/src/main/java/org/elasticsearch/common/util/LongHash.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/LongHash.java
rename to core/src/main/java/org/elasticsearch/common/util/LongHash.java
diff --git a/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java b/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java
rename to core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java
diff --git a/src/main/java/org/elasticsearch/common/util/MinimalMap.java b/core/src/main/java/org/elasticsearch/common/util/MinimalMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/MinimalMap.java
rename to core/src/main/java/org/elasticsearch/common/util/MinimalMap.java
diff --git a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java b/core/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java
rename to core/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java
diff --git a/src/main/java/org/elasticsearch/common/util/ObjectArray.java b/core/src/main/java/org/elasticsearch/common/util/ObjectArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/ObjectArray.java
rename to core/src/main/java/org/elasticsearch/common/util/ObjectArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java b/core/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/SingleObjectCache.java
rename to core/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java
rename to core/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/StatusToXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/StatusToXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/StatusToXContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/StatusToXContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/ToXContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilderString.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentParser.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentString.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentString.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentString.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentString.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentType.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/XContentType.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/XContentType.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java b/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java
diff --git a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java
rename to core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java
diff --git a/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java b/core/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java
rename to core/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java b/core/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java
rename to core/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/discovery/Discovery.java b/core/src/main/java/org/elasticsearch/discovery/Discovery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/Discovery.java
rename to core/src/main/java/org/elasticsearch/discovery/Discovery.java
diff --git a/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java b/core/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/DiscoveryModule.java
rename to core/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java
diff --git a/src/main/java/org/elasticsearch/discovery/DiscoveryService.java b/core/src/main/java/org/elasticsearch/discovery/DiscoveryService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/DiscoveryService.java
rename to core/src/main/java/org/elasticsearch/discovery/DiscoveryService.java
diff --git a/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
rename to core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java
diff --git a/src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java b/core/src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java
rename to core/src/main/java/org/elasticsearch/discovery/InitialStateDiscoveryListener.java
diff --git a/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java b/core/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java
rename to core/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java
diff --git a/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
rename to core/src/main/java/org/elasticsearch/discovery/local/LocalDiscovery.java
diff --git a/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java b/core/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java
rename to core/src/main/java/org/elasticsearch/discovery/local/LocalDiscoveryModule.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java b/core/src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/DiscoveryNodesProvider.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java b/core/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/NotMasterException.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscoveryModule.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java b/core/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/elect/ElectMasterService.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/FaultDetection.java b/core/src/main/java/org/elasticsearch/discovery/zen/fd/FaultDetection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/fd/FaultDetection.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/fd/FaultDetection.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/core/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java b/core/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/PingContextProvider.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/PingContextProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ping/PingContextProvider.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ping/PingContextProvider.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPing.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ping/ZenPingService.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastHostsProvider.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
diff --git a/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java b/core/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java
rename to core/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java
diff --git a/src/main/java/org/elasticsearch/env/ESFileStore.java b/core/src/main/java/org/elasticsearch/env/ESFileStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/ESFileStore.java
rename to core/src/main/java/org/elasticsearch/env/ESFileStore.java
diff --git a/src/main/java/org/elasticsearch/env/Environment.java b/core/src/main/java/org/elasticsearch/env/Environment.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/Environment.java
rename to core/src/main/java/org/elasticsearch/env/Environment.java
diff --git a/src/main/java/org/elasticsearch/env/EnvironmentModule.java b/core/src/main/java/org/elasticsearch/env/EnvironmentModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/EnvironmentModule.java
rename to core/src/main/java/org/elasticsearch/env/EnvironmentModule.java
diff --git a/src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java b/core/src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java
rename to core/src/main/java/org/elasticsearch/env/FailedToResolveConfigException.java
diff --git a/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/NodeEnvironment.java
rename to core/src/main/java/org/elasticsearch/env/NodeEnvironment.java
diff --git a/src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java b/core/src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java
rename to core/src/main/java/org/elasticsearch/env/NodeEnvironmentModule.java
diff --git a/src/main/java/org/elasticsearch/env/ShardLock.java b/core/src/main/java/org/elasticsearch/env/ShardLock.java
similarity index 100%
rename from src/main/java/org/elasticsearch/env/ShardLock.java
rename to core/src/main/java/org/elasticsearch/env/ShardLock.java
diff --git a/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
rename to core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
diff --git a/src/main/java/org/elasticsearch/gateway/CorruptStateException.java b/core/src/main/java/org/elasticsearch/gateway/CorruptStateException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/CorruptStateException.java
rename to core/src/main/java/org/elasticsearch/gateway/CorruptStateException.java
diff --git a/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java b/core/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java
rename to core/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java
diff --git a/src/main/java/org/elasticsearch/gateway/Gateway.java b/core/src/main/java/org/elasticsearch/gateway/Gateway.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/Gateway.java
rename to core/src/main/java/org/elasticsearch/gateway/Gateway.java
diff --git a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
rename to core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
diff --git a/src/main/java/org/elasticsearch/gateway/GatewayException.java b/core/src/main/java/org/elasticsearch/gateway/GatewayException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/GatewayException.java
rename to core/src/main/java/org/elasticsearch/gateway/GatewayException.java
diff --git a/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java b/core/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/GatewayMetaState.java
rename to core/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java
diff --git a/src/main/java/org/elasticsearch/gateway/GatewayModule.java b/core/src/main/java/org/elasticsearch/gateway/GatewayModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/GatewayModule.java
rename to core/src/main/java/org/elasticsearch/gateway/GatewayModule.java
diff --git a/src/main/java/org/elasticsearch/gateway/GatewayService.java b/core/src/main/java/org/elasticsearch/gateway/GatewayService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/GatewayService.java
rename to core/src/main/java/org/elasticsearch/gateway/GatewayService.java
diff --git a/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java b/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java
rename to core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java
diff --git a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
rename to core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
diff --git a/src/main/java/org/elasticsearch/gateway/MetaStateService.java b/core/src/main/java/org/elasticsearch/gateway/MetaStateService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/MetaStateService.java
rename to core/src/main/java/org/elasticsearch/gateway/MetaStateService.java
diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java
rename to core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java
diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java
similarity index 100%
rename from src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java
rename to core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java
diff --git a/src/main/java/org/elasticsearch/http/BindHttpException.java b/core/src/main/java/org/elasticsearch/http/BindHttpException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/BindHttpException.java
rename to core/src/main/java/org/elasticsearch/http/BindHttpException.java
diff --git a/src/main/java/org/elasticsearch/http/HttpChannel.java b/core/src/main/java/org/elasticsearch/http/HttpChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpChannel.java
rename to core/src/main/java/org/elasticsearch/http/HttpChannel.java
diff --git a/src/main/java/org/elasticsearch/http/HttpException.java b/core/src/main/java/org/elasticsearch/http/HttpException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpException.java
rename to core/src/main/java/org/elasticsearch/http/HttpException.java
diff --git a/src/main/java/org/elasticsearch/http/HttpInfo.java b/core/src/main/java/org/elasticsearch/http/HttpInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpInfo.java
rename to core/src/main/java/org/elasticsearch/http/HttpInfo.java
diff --git a/src/main/java/org/elasticsearch/http/HttpRequest.java b/core/src/main/java/org/elasticsearch/http/HttpRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpRequest.java
rename to core/src/main/java/org/elasticsearch/http/HttpRequest.java
diff --git a/src/main/java/org/elasticsearch/http/HttpServer.java b/core/src/main/java/org/elasticsearch/http/HttpServer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpServer.java
rename to core/src/main/java/org/elasticsearch/http/HttpServer.java
diff --git a/src/main/java/org/elasticsearch/http/HttpServerAdapter.java b/core/src/main/java/org/elasticsearch/http/HttpServerAdapter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpServerAdapter.java
rename to core/src/main/java/org/elasticsearch/http/HttpServerAdapter.java
diff --git a/src/main/java/org/elasticsearch/http/HttpServerModule.java b/core/src/main/java/org/elasticsearch/http/HttpServerModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpServerModule.java
rename to core/src/main/java/org/elasticsearch/http/HttpServerModule.java
diff --git a/src/main/java/org/elasticsearch/http/HttpServerTransport.java b/core/src/main/java/org/elasticsearch/http/HttpServerTransport.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpServerTransport.java
rename to core/src/main/java/org/elasticsearch/http/HttpServerTransport.java
diff --git a/src/main/java/org/elasticsearch/http/HttpStats.java b/core/src/main/java/org/elasticsearch/http/HttpStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/HttpStats.java
rename to core/src/main/java/org/elasticsearch/http/HttpStats.java
diff --git a/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java b/core/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java
rename to core/src/main/java/org/elasticsearch/http/netty/ESHttpContentDecompressor.java
diff --git a/src/main/java/org/elasticsearch/http/netty/ESHttpResponseEncoder.java b/core/src/main/java/org/elasticsearch/http/netty/ESHttpResponseEncoder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/ESHttpResponseEncoder.java
rename to core/src/main/java/org/elasticsearch/http/netty/ESHttpResponseEncoder.java
diff --git a/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java b/core/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java
rename to core/src/main/java/org/elasticsearch/http/netty/HttpRequestHandler.java
diff --git a/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java b/core/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java
rename to core/src/main/java/org/elasticsearch/http/netty/NettyHttpChannel.java
diff --git a/src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java b/core/src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java
rename to core/src/main/java/org/elasticsearch/http/netty/NettyHttpRequest.java
diff --git a/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java b/core/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
rename to core/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
diff --git a/src/main/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandler.java b/core/src/main/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandler.java
rename to core/src/main/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandler.java
diff --git a/src/main/java/org/elasticsearch/http/netty/pipelining/OrderedDownstreamChannelEvent.java b/core/src/main/java/org/elasticsearch/http/netty/pipelining/OrderedDownstreamChannelEvent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/pipelining/OrderedDownstreamChannelEvent.java
rename to core/src/main/java/org/elasticsearch/http/netty/pipelining/OrderedDownstreamChannelEvent.java
diff --git a/src/main/java/org/elasticsearch/http/netty/pipelining/OrderedUpstreamMessageEvent.java b/core/src/main/java/org/elasticsearch/http/netty/pipelining/OrderedUpstreamMessageEvent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/http/netty/pipelining/OrderedUpstreamMessageEvent.java
rename to core/src/main/java/org/elasticsearch/http/netty/pipelining/OrderedUpstreamMessageEvent.java
diff --git a/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java b/core/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
rename to core/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
diff --git a/src/main/java/org/elasticsearch/index/AlreadyExpiredException.java b/core/src/main/java/org/elasticsearch/index/AlreadyExpiredException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/AlreadyExpiredException.java
rename to core/src/main/java/org/elasticsearch/index/AlreadyExpiredException.java
diff --git a/src/main/java/org/elasticsearch/index/Index.java b/core/src/main/java/org/elasticsearch/index/Index.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/Index.java
rename to core/src/main/java/org/elasticsearch/index/Index.java
diff --git a/src/main/java/org/elasticsearch/index/IndexComponent.java b/core/src/main/java/org/elasticsearch/index/IndexComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexComponent.java
rename to core/src/main/java/org/elasticsearch/index/IndexComponent.java
diff --git a/src/main/java/org/elasticsearch/index/IndexException.java b/core/src/main/java/org/elasticsearch/index/IndexException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexException.java
rename to core/src/main/java/org/elasticsearch/index/IndexException.java
diff --git a/src/main/java/org/elasticsearch/index/IndexModule.java b/core/src/main/java/org/elasticsearch/index/IndexModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexModule.java
rename to core/src/main/java/org/elasticsearch/index/IndexModule.java
diff --git a/src/main/java/org/elasticsearch/index/IndexNameModule.java b/core/src/main/java/org/elasticsearch/index/IndexNameModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexNameModule.java
rename to core/src/main/java/org/elasticsearch/index/IndexNameModule.java
diff --git a/src/main/java/org/elasticsearch/index/IndexService.java b/core/src/main/java/org/elasticsearch/index/IndexService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexService.java
rename to core/src/main/java/org/elasticsearch/index/IndexService.java
diff --git a/src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java b/core/src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java
rename to core/src/main/java/org/elasticsearch/index/IndexShardAlreadyExistsException.java
diff --git a/src/main/java/org/elasticsearch/index/IndexShardMissingException.java b/core/src/main/java/org/elasticsearch/index/IndexShardMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/IndexShardMissingException.java
rename to core/src/main/java/org/elasticsearch/index/IndexShardMissingException.java
diff --git a/src/main/java/org/elasticsearch/index/LocalNodeId.java b/core/src/main/java/org/elasticsearch/index/LocalNodeId.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/LocalNodeId.java
rename to core/src/main/java/org/elasticsearch/index/LocalNodeId.java
diff --git a/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java b/core/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/LocalNodeIdModule.java
rename to core/src/main/java/org/elasticsearch/index/LocalNodeIdModule.java
diff --git a/src/main/java/org/elasticsearch/index/VersionType.java b/core/src/main/java/org/elasticsearch/index/VersionType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/VersionType.java
rename to core/src/main/java/org/elasticsearch/index/VersionType.java
diff --git a/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java b/core/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/aliases/IndexAlias.java
rename to core/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java
diff --git a/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java b/core/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
rename to core/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
diff --git a/src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java b/core/src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java
rename to core/src/main/java/org/elasticsearch/index/aliases/IndexAliasesServiceModule.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/core/src/main/java/org/elasticsearch/index/analysis/Analysis.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/Analysis.java
rename to core/src/main/java/org/elasticsearch/index/analysis/Analysis.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AnalysisModule.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AnalysisSettingsRequired.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProviderFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java b/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java
rename to core/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ApostropheFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ApostropheFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ApostropheFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ApostropheFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ArabicNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ArabicNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ArabicNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ArabicNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ArabicStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/BrazilianStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CJKBigramFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/CJKBigramFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CJKBigramFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CJKBigramFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CJKWidthFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/CJKWidthFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CJKWidthFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CJKWidthFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java b/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CharMatcher.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ClassicFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ClassicFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ClassicFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ClassicFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CommonGramsTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/CzechStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/DelimitedPayloadTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/DelimitedPayloadTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/DelimitedPayloadTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/DelimitedPayloadTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/DutchStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ElisionTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/FrenchStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/GermanNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/GermanNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/GermanNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/GermanNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/GermanStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/HindiNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/HindiNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/HindiNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/HindiNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/HtmlStripCharFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/IndicNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/IndicNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/IndicNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/IndicNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/KStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/KeepTypesFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/KeywordMarkerTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/LengthTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/MappingCharFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NGramTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericDateAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericDateTokenizer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericDoubleAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericDoubleTokenizer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericFloatAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericFloatTokenizer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericIntegerAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericIntegerTokenizer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericLongAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericLongTokenizer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java b/core/src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/NumericTokenizer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PatternCaptureGroupTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PatternReplaceCharFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PersianNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PersianNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PersianNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PersianNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PorterStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ReverseTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/RussianStemTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ScandinavianFoldingFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ScandinavianNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SerbianNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/SerbianNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SerbianNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SerbianNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SnowballTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java b/core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StemmerOverrideTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactoryFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TrimTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TruncateTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/UniqueTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/UpperCaseTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/UpperCaseTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/UpperCaseTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/UpperCaseTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java b/core/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java
rename to core/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/compound/AbstractCompoundWordTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/core/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
rename to core/src/main/java/org/elasticsearch/index/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
diff --git a/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/core/src/main/java/org/elasticsearch/index/cache/IndexCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/IndexCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/IndexCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java b/core/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java
rename to core/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java
diff --git a/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java b/core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCacheModule.java b/core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCacheModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCacheModule.java
rename to core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCacheModule.java
diff --git a/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java b/core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java b/core/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/filter/FilterCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java b/core/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java
rename to core/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheModule.java
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheStats.java b/core/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/filter/FilterCacheStats.java
rename to core/src/main/java/org/elasticsearch/index/cache/filter/FilterCacheStats.java
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java b/core/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/index/IndexFilterCache.java b/core/src/main/java/org/elasticsearch/index/cache/filter/index/IndexFilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/filter/index/IndexFilterCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/filter/index/IndexFilterCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java b/core/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/filter/none/NoneFilterCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java b/core/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java
rename to core/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java
diff --git a/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCache.java b/core/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/cache/query/ShardQueryCache.java
rename to core/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCache.java
diff --git a/src/main/java/org/elasticsearch/index/codec/CodecService.java b/core/src/main/java/org/elasticsearch/index/codec/CodecService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/codec/CodecService.java
rename to core/src/main/java/org/elasticsearch/index/codec/CodecService.java
diff --git a/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java b/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
rename to core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
diff --git a/src/main/java/org/elasticsearch/index/codec/postingsformat/BloomFilterPostingsFormat.java b/core/src/main/java/org/elasticsearch/index/codec/postingsformat/BloomFilterPostingsFormat.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/codec/postingsformat/BloomFilterPostingsFormat.java
rename to core/src/main/java/org/elasticsearch/index/codec/postingsformat/BloomFilterPostingsFormat.java
diff --git a/src/main/java/org/elasticsearch/index/codec/postingsformat/Elasticsearch090PostingsFormat.java b/core/src/main/java/org/elasticsearch/index/codec/postingsformat/Elasticsearch090PostingsFormat.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/codec/postingsformat/Elasticsearch090PostingsFormat.java
rename to core/src/main/java/org/elasticsearch/index/codec/postingsformat/Elasticsearch090PostingsFormat.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/AbstractESDeletionPolicy.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/AbstractESDeletionPolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/AbstractESDeletionPolicy.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/AbstractESDeletionPolicy.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/DeletionPolicyModule.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/KeepLastNDeletionPolicy.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/KeepOnlyLastDeletionPolicy.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicy.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommit.java
diff --git a/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java b/core/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java
rename to core/src/main/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommits.java
diff --git a/src/main/java/org/elasticsearch/index/engine/CloseEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/CloseEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/CloseEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/CloseEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/CommitStats.java b/core/src/main/java/org/elasticsearch/index/engine/CommitStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/CommitStats.java
rename to core/src/main/java/org/elasticsearch/index/engine/CommitStats.java
diff --git a/src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/CreateFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/DeleteByQueryFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/DeleteFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java b/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java
rename to core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java
diff --git a/src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsException.java b/core/src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsException.java
rename to core/src/main/java/org/elasticsearch/index/engine/DocumentAlreadyExistsException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java b/core/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java
rename to core/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java b/core/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java
rename to core/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/Engine.java b/core/src/main/java/org/elasticsearch/index/engine/Engine.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/Engine.java
rename to core/src/main/java/org/elasticsearch/index/engine/Engine.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java b/core/src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineAlreadyStartedException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java b/core/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineClosedException.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineClosedException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineConfig.java b/core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineConfig.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java b/core/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineException.java b/core/src/main/java/org/elasticsearch/index/engine/EngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineFactory.java b/core/src/main/java/org/elasticsearch/index/engine/EngineFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineFactory.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineFactory.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java b/core/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineSearcher.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java
diff --git a/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java b/core/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java
rename to core/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java
diff --git a/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/FlushNotAllowedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java b/core/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java
rename to core/src/main/java/org/elasticsearch/index/engine/FlushingRecoveryCounter.java
diff --git a/src/main/java/org/elasticsearch/index/engine/ForceMergeFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/ForceMergeFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/ForceMergeFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/ForceMergeFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/IgnoreOnRecoveryEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/IndexFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/InternalEngine.java
rename to core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
diff --git a/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java
rename to core/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java
diff --git a/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java b/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java
rename to core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java
diff --git a/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java b/core/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java
rename to core/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java
diff --git a/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/RollbackFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/RollbackNotAllowedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/Segment.java b/core/src/main/java/org/elasticsearch/index/engine/Segment.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/Segment.java
rename to core/src/main/java/org/elasticsearch/index/engine/Segment.java
diff --git a/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java b/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/SegmentsStats.java
rename to core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java
diff --git a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java b/core/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
rename to core/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
diff --git a/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java b/core/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java
rename to core/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java
diff --git a/src/main/java/org/elasticsearch/index/engine/VersionValue.java b/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/engine/VersionValue.java
rename to core/src/main/java/org/elasticsearch/index/engine/VersionValue.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/AbstractRandomAccessOrds.java b/core/src/main/java/org/elasticsearch/index/fielddata/AbstractRandomAccessOrds.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/AbstractRandomAccessOrds.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/AbstractRandomAccessOrds.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/AtomicParentChildFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/AtomicParentChildFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/AtomicParentChildFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/AtomicParentChildFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/FieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/FieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/FieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/FieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java b/core/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java b/core/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataModule.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataModule.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataModule.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexParentChildFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexParentChildFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/IndexParentChildFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/IndexParentChildFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java b/core/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ShardFieldDataModule.java b/core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldDataModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ShardFieldDataModule.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldDataModule.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java b/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicParentChildFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicParentChildFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicParentChildFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicParentChildFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnum.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnum.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnum.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIntersectTermsEnum.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIntersectTermsEnum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIntersectTermsEnum.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIntersectTermsEnum.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java
rename to core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/AllFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/AllFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/AllFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/AllFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/JustSourceFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/JustSourceFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/JustSourceFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/JustSourceFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/JustUidFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/JustUidFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/JustUidFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/JustUidFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/UidAndRoutingFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/UidAndRoutingFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/UidAndRoutingFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/UidAndRoutingFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/UidAndSourceFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/UidAndSourceFieldsVisitor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/fieldvisitor/UidAndSourceFieldsVisitor.java
rename to core/src/main/java/org/elasticsearch/index/fieldvisitor/UidAndSourceFieldsVisitor.java
diff --git a/src/main/java/org/elasticsearch/index/flush/FlushStats.java b/core/src/main/java/org/elasticsearch/index/flush/FlushStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/flush/FlushStats.java
rename to core/src/main/java/org/elasticsearch/index/flush/FlushStats.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/CommitPoint.java b/core/src/main/java/org/elasticsearch/index/gateway/CommitPoint.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/CommitPoint.java
rename to core/src/main/java/org/elasticsearch/index/gateway/CommitPoint.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/CommitPoints.java b/core/src/main/java/org/elasticsearch/index/gateway/CommitPoints.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/CommitPoints.java
rename to core/src/main/java/org/elasticsearch/index/gateway/CommitPoints.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java b/core/src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IgnoreGatewayRecoveryException.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java b/core/src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IndexShardGateway.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java b/core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayException.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java b/core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayRecoveryException.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java b/core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayService.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java b/core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotFailedException.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java b/core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java
rename to core/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewaySnapshotNotAllowedException.java
diff --git a/src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java b/core/src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java
rename to core/src/main/java/org/elasticsearch/index/gateway/SnapshotStatus.java
diff --git a/src/main/java/org/elasticsearch/index/get/GetField.java b/core/src/main/java/org/elasticsearch/index/get/GetField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/get/GetField.java
rename to core/src/main/java/org/elasticsearch/index/get/GetField.java
diff --git a/src/main/java/org/elasticsearch/index/get/GetResult.java b/core/src/main/java/org/elasticsearch/index/get/GetResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/get/GetResult.java
rename to core/src/main/java/org/elasticsearch/index/get/GetResult.java
diff --git a/src/main/java/org/elasticsearch/index/get/GetStats.java b/core/src/main/java/org/elasticsearch/index/get/GetStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/get/GetStats.java
rename to core/src/main/java/org/elasticsearch/index/get/GetStats.java
diff --git a/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/get/ShardGetService.java
rename to core/src/main/java/org/elasticsearch/index/get/ShardGetService.java
diff --git a/src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java b/core/src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java
rename to core/src/main/java/org/elasticsearch/index/indexing/IndexingOperationListener.java
diff --git a/src/main/java/org/elasticsearch/index/indexing/IndexingStats.java b/core/src/main/java/org/elasticsearch/index/indexing/IndexingStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/indexing/IndexingStats.java
rename to core/src/main/java/org/elasticsearch/index/indexing/IndexingStats.java
diff --git a/src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java b/core/src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java
rename to core/src/main/java/org/elasticsearch/index/indexing/ShardIndexingService.java
diff --git a/src/main/java/org/elasticsearch/index/indexing/slowlog/ShardSlowLogIndexingService.java b/core/src/main/java/org/elasticsearch/index/indexing/slowlog/ShardSlowLogIndexingService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/indexing/slowlog/ShardSlowLogIndexingService.java
rename to core/src/main/java/org/elasticsearch/index/indexing/slowlog/ShardSlowLogIndexingService.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/ContentPath.java b/core/src/main/java/org/elasticsearch/index/mapper/ContentPath.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/ContentPath.java
rename to core/src/main/java/org/elasticsearch/index/mapper/ContentPath.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
rename to core/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
rename to core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
rename to core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentTypeListener.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentTypeListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/DocumentTypeListener.java
rename to core/src/main/java/org/elasticsearch/index/mapper/DocumentTypeListener.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/FieldMappers.java
rename to core/src/main/java/org/elasticsearch/index/mapper/FieldMappers.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
rename to core/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/Mapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/Mapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperAnalyzer.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperAnalyzer.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperCompressionException.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperException.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperException.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperException.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperService.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperService.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperServiceModule.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java b/core/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MapperUtils.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/Mapping.java b/core/src/main/java/org/elasticsearch/index/mapper/Mapping.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/Mapping.java
rename to core/src/main/java/org/elasticsearch/index/mapper/Mapping.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java b/core/src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MergeMappingException.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/MergeResult.java b/core/src/main/java/org/elasticsearch/index/mapper/MergeResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/MergeResult.java
rename to core/src/main/java/org/elasticsearch/index/mapper/MergeResult.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java b/core/src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java
rename to core/src/main/java/org/elasticsearch/index/mapper/ObjectMappers.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/ParseContext.java
rename to core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java b/core/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java
rename to core/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/RootMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/RootMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/RootMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/RootMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java b/core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/SourceToParse.java
rename to core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java b/core/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java
rename to core/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/Uid.java b/core/src/main/java/org/elasticsearch/index/mapper/Uid.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/Uid.java
rename to core/src/main/java/org/elasticsearch/index/mapper/Uid.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java b/core/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java
rename to core/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/default-mapping.json b/core/src/main/java/org/elasticsearch/index/mapper/default-mapping.json
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/default-mapping.json
rename to core/src/main/java/org/elasticsearch/index/mapper/default-mapping.json
diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/EnabledAttributeMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/EnabledAttributeMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/EnabledAttributeMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/EnabledAttributeMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java b/core/src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java
rename to core/src/main/java/org/elasticsearch/index/mapper/object/ArrayValueMapperParser.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java b/core/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java
rename to core/src/main/java/org/elasticsearch/index/mapper/object/DynamicTemplate.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java
rename to core/src/main/java/org/elasticsearch/index/mapper/object/RootObjectMapper.java
diff --git a/src/main/java/org/elasticsearch/index/mapper/script-mapping.json b/core/src/main/java/org/elasticsearch/index/mapper/script-mapping.json
similarity index 100%
rename from src/main/java/org/elasticsearch/index/mapper/script-mapping.json
rename to core/src/main/java/org/elasticsearch/index/mapper/script-mapping.json
diff --git a/src/main/java/org/elasticsearch/index/merge/MergeStats.java b/core/src/main/java/org/elasticsearch/index/merge/MergeStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/MergeStats.java
rename to core/src/main/java/org/elasticsearch/index/merge/MergeStats.java
diff --git a/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java b/core/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java
rename to core/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java b/core/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/AbstractMergePolicyProvider.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/ElasticsearchMergePolicy.java b/core/src/main/java/org/elasticsearch/index/merge/policy/ElasticsearchMergePolicy.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/ElasticsearchMergePolicy.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/ElasticsearchMergePolicy.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/FilterDocValuesProducer.java b/core/src/main/java/org/elasticsearch/index/merge/policy/FilterDocValuesProducer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/FilterDocValuesProducer.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/FilterDocValuesProducer.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java b/core/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/LogByteSizeMergePolicyProvider.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java b/core/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/LogDocMergePolicyProvider.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java b/core/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyModule.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java b/core/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/MergePolicyProvider.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java b/core/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/TieredMergePolicyProvider.java
diff --git a/src/main/java/org/elasticsearch/index/merge/policy/VersionFieldUpgrader.java b/core/src/main/java/org/elasticsearch/index/merge/policy/VersionFieldUpgrader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/policy/VersionFieldUpgrader.java
rename to core/src/main/java/org/elasticsearch/index/merge/policy/VersionFieldUpgrader.java
diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/core/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java b/core/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java
rename to core/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java
diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java b/core/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java
rename to core/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerProvider.java
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorException.java b/core/src/main/java/org/elasticsearch/index/percolator/PercolatorException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/percolator/PercolatorException.java
rename to core/src/main/java/org/elasticsearch/index/percolator/PercolatorException.java
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java b/core/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
rename to core/src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java
diff --git a/src/main/java/org/elasticsearch/index/percolator/QueriesLoaderCollector.java b/core/src/main/java/org/elasticsearch/index/percolator/QueriesLoaderCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/percolator/QueriesLoaderCollector.java
rename to core/src/main/java/org/elasticsearch/index/percolator/QueriesLoaderCollector.java
diff --git a/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java b/core/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java
rename to core/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java
diff --git a/src/main/java/org/elasticsearch/index/percolator/stats/ShardPercolateService.java b/core/src/main/java/org/elasticsearch/index/percolator/stats/ShardPercolateService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/percolator/stats/ShardPercolateService.java
rename to core/src/main/java/org/elasticsearch/index/percolator/stats/ShardPercolateService.java
diff --git a/src/main/java/org/elasticsearch/index/query/AndQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/AndQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/AndQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/AndQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/AndQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/AndQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/AndQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/AndQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BoolQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/BoostableQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/BoostableQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BoostableQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/BoostableQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java b/core/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java
rename to core/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/FuzzyQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java b/core/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
rename to core/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
diff --git a/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/HasParentQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/HasParentQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/HasParentQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/HasParentQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java b/core/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java
rename to core/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java
diff --git a/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java b/core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
rename to core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
diff --git a/src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/IndicesQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/LimitQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/LimitQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/LimitQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/LimitQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/LimitQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/LimitQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/LimitQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/LimitQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/MissingQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MissingQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MissingQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/MissingQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/NotQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/NotQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/NotQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/NotQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/NotQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/NotQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/NotQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/NotQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/OrQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/OrQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/OrQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/OrQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/OrQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/OrQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/OrQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/OrQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/ParsedQuery.java b/core/src/main/java/org/elasticsearch/index/query/ParsedQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ParsedQuery.java
rename to core/src/main/java/org/elasticsearch/index/query/ParsedQuery.java
diff --git a/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryBuilders.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java b/core/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java b/core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryParseContext.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParser.java b/core/src/main/java/org/elasticsearch/index/query/QueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParserFactory.java b/core/src/main/java/org/elasticsearch/index/query/QueryParserFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryParserFactory.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryParserFactory.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParsingException.java b/core/src/main/java/org/elasticsearch/index/query/QueryParsingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryParsingException.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryParsingException.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/RegexpFlag.java b/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/RegexpFlag.java
rename to core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java
diff --git a/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/RegexpQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java
rename to core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java
diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanNearQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanNotQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanOrQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/TermQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TermQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/TermsLookupQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TermsLookupQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TermsLookupQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/TermsLookupQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/TypeQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/TypeQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreModule.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreModule.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreModule.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/random/RandomScoreFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/weight/WeightBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/weight/WeightBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/functionscore/weight/WeightBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/functionscore/weight/WeightBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java b/core/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java b/core/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java
rename to core/src/main/java/org/elasticsearch/index/query/support/InnerHitsQueryParserHelper.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/NestedInnerQueryParseSupport.java b/core/src/main/java/org/elasticsearch/index/query/support/NestedInnerQueryParseSupport.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/NestedInnerQueryParseSupport.java
rename to core/src/main/java/org/elasticsearch/index/query/support/NestedInnerQueryParseSupport.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/NestedScope.java b/core/src/main/java/org/elasticsearch/index/query/support/NestedScope.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/NestedScope.java
rename to core/src/main/java/org/elasticsearch/index/query/support/NestedScope.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/QueryInnerHitBuilder.java b/core/src/main/java/org/elasticsearch/index/query/support/QueryInnerHitBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/QueryInnerHitBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/support/QueryInnerHitBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java b/core/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/QueryParsers.java
rename to core/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java
diff --git a/src/main/java/org/elasticsearch/index/query/support/XContentStructure.java b/core/src/main/java/org/elasticsearch/index/query/support/XContentStructure.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/support/XContentStructure.java
rename to core/src/main/java/org/elasticsearch/index/query/support/XContentStructure.java
diff --git a/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java b/core/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java
rename to core/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java
diff --git a/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java b/core/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/refresh/RefreshStats.java
rename to core/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java
diff --git a/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/MatchQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java b/core/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java b/core/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ConstantScorer.java b/core/src/main/java/org/elasticsearch/index/search/child/ConstantScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ConstantScorer.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ConstantScorer.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java b/core/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ParentIdsFilter.java b/core/src/main/java/org/elasticsearch/index/search/child/ParentIdsFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ParentIdsFilter.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ParentIdsFilter.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java b/core/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ParentQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/child/ScoreType.java b/core/src/main/java/org/elasticsearch/index/search/child/ScoreType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/child/ScoreType.java
rename to core/src/main/java/org/elasticsearch/index/search/child/ScoreType.java
diff --git a/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java b/core/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonQuery.java b/core/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/geo/GeoPolygonQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxQuery.java b/core/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java b/core/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/morelikethis/MoreLikeThisFetchService.java b/core/src/main/java/org/elasticsearch/index/search/morelikethis/MoreLikeThisFetchService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/morelikethis/MoreLikeThisFetchService.java
rename to core/src/main/java/org/elasticsearch/index/search/morelikethis/MoreLikeThisFetchService.java
diff --git a/src/main/java/org/elasticsearch/index/search/nested/IncludeNestedDocsQuery.java b/core/src/main/java/org/elasticsearch/index/search/nested/IncludeNestedDocsQuery.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/nested/IncludeNestedDocsQuery.java
rename to core/src/main/java/org/elasticsearch/index/search/nested/IncludeNestedDocsQuery.java
diff --git a/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java b/core/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java
rename to core/src/main/java/org/elasticsearch/index/search/shape/ShapeFetchService.java
diff --git a/src/main/java/org/elasticsearch/index/search/shape/ShapeModule.java b/core/src/main/java/org/elasticsearch/index/search/shape/ShapeModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/shape/ShapeModule.java
rename to core/src/main/java/org/elasticsearch/index/search/shape/ShapeModule.java
diff --git a/src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java b/core/src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java
rename to core/src/main/java/org/elasticsearch/index/search/slowlog/ShardSlowLogSearchService.java
diff --git a/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java b/core/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/stats/SearchStats.java
rename to core/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java
diff --git a/src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java b/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java
rename to core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchService.java
diff --git a/src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java b/core/src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java
rename to core/src/main/java/org/elasticsearch/index/search/stats/StatsGroupsParseElement.java
diff --git a/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java b/core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java
rename to core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java
diff --git a/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java b/core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java
rename to core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettingsModule.java
diff --git a/src/main/java/org/elasticsearch/index/settings/IndexSettings.java b/core/src/main/java/org/elasticsearch/index/settings/IndexSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/settings/IndexSettings.java
rename to core/src/main/java/org/elasticsearch/index/settings/IndexSettings.java
diff --git a/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java b/core/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java
rename to core/src/main/java/org/elasticsearch/index/settings/IndexSettingsModule.java
diff --git a/src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java b/core/src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java
rename to core/src/main/java/org/elasticsearch/index/settings/IndexSettingsProvider.java
diff --git a/src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java b/core/src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java
rename to core/src/main/java/org/elasticsearch/index/settings/IndexSettingsService.java
diff --git a/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java b/core/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java
rename to core/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java
diff --git a/src/main/java/org/elasticsearch/index/shard/DocsStats.java b/core/src/main/java/org/elasticsearch/index/shard/DocsStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/DocsStats.java
rename to core/src/main/java/org/elasticsearch/index/shard/DocsStats.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java b/core/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShard.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardCreationException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardState.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShardState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/IndexShardState.java
rename to core/src/main/java/org/elasticsearch/index/shard/IndexShardState.java
diff --git a/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java
rename to core/src/main/java/org/elasticsearch/index/shard/ShadowIndexShard.java
diff --git a/src/main/java/org/elasticsearch/index/shard/ShardId.java b/core/src/main/java/org/elasticsearch/index/shard/ShardId.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/ShardId.java
rename to core/src/main/java/org/elasticsearch/index/shard/ShardId.java
diff --git a/src/main/java/org/elasticsearch/index/shard/ShardPath.java b/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/ShardPath.java
rename to core/src/main/java/org/elasticsearch/index/shard/ShardPath.java
diff --git a/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java b/core/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java
rename to core/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java
diff --git a/src/main/java/org/elasticsearch/index/shard/ShardUtils.java b/core/src/main/java/org/elasticsearch/index/shard/ShardUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/ShardUtils.java
rename to core/src/main/java/org/elasticsearch/index/shard/ShardUtils.java
diff --git a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java b/core/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
rename to core/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/DefaultSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/PreBuiltSimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/PreBuiltSimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/PreBuiltSimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/PreBuiltSimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/Similarities.java b/core/src/main/java/org/elasticsearch/index/similarity/Similarities.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/Similarities.java
rename to core/src/main/java/org/elasticsearch/index/similarity/Similarities.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityLookupService.java b/core/src/main/java/org/elasticsearch/index/similarity/SimilarityLookupService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/SimilarityLookupService.java
rename to core/src/main/java/org/elasticsearch/index/similarity/SimilarityLookupService.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java b/core/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java
rename to core/src/main/java/org/elasticsearch/index/similarity/SimilarityModule.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java b/core/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java
rename to core/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java
diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
rename to core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRepository.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotAndRestoreService.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotAndRestoreService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotAndRestoreService.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotAndRestoreService.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java b/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java
rename to core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java
diff --git a/src/main/java/org/elasticsearch/index/store/DirectoryService.java b/core/src/main/java/org/elasticsearch/index/store/DirectoryService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/DirectoryService.java
rename to core/src/main/java/org/elasticsearch/index/store/DirectoryService.java
diff --git a/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java b/core/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/DirectoryUtils.java
rename to core/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java
diff --git a/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java b/core/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/FsDirectoryService.java
rename to core/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java
diff --git a/src/main/java/org/elasticsearch/index/store/IndexStore.java b/core/src/main/java/org/elasticsearch/index/store/IndexStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/IndexStore.java
rename to core/src/main/java/org/elasticsearch/index/store/IndexStore.java
diff --git a/src/main/java/org/elasticsearch/index/store/IndexStoreModule.java b/core/src/main/java/org/elasticsearch/index/store/IndexStoreModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/IndexStoreModule.java
rename to core/src/main/java/org/elasticsearch/index/store/IndexStoreModule.java
diff --git a/src/main/java/org/elasticsearch/index/store/LegacyVerification.java b/core/src/main/java/org/elasticsearch/index/store/LegacyVerification.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/LegacyVerification.java
rename to core/src/main/java/org/elasticsearch/index/store/LegacyVerification.java
diff --git a/src/main/java/org/elasticsearch/index/store/Store.java b/core/src/main/java/org/elasticsearch/index/store/Store.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/Store.java
rename to core/src/main/java/org/elasticsearch/index/store/Store.java
diff --git a/src/main/java/org/elasticsearch/index/store/StoreException.java b/core/src/main/java/org/elasticsearch/index/store/StoreException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/StoreException.java
rename to core/src/main/java/org/elasticsearch/index/store/StoreException.java
diff --git a/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java b/core/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java
rename to core/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java
diff --git a/src/main/java/org/elasticsearch/index/store/StoreModule.java b/core/src/main/java/org/elasticsearch/index/store/StoreModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/StoreModule.java
rename to core/src/main/java/org/elasticsearch/index/store/StoreModule.java
diff --git a/src/main/java/org/elasticsearch/index/store/StoreStats.java b/core/src/main/java/org/elasticsearch/index/store/StoreStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/StoreStats.java
rename to core/src/main/java/org/elasticsearch/index/store/StoreStats.java
diff --git a/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java b/core/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java
rename to core/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java
diff --git a/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java b/core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java
rename to core/src/main/java/org/elasticsearch/index/suggest/stats/ShardSuggestService.java
diff --git a/src/main/java/org/elasticsearch/index/suggest/stats/SuggestStats.java b/core/src/main/java/org/elasticsearch/index/suggest/stats/SuggestStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/suggest/stats/SuggestStats.java
rename to core/src/main/java/org/elasticsearch/index/suggest/stats/SuggestStats.java
diff --git a/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java b/core/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java
rename to core/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java
diff --git a/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java b/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
rename to core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java
diff --git a/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java b/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java
rename to core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java
diff --git a/src/main/java/org/elasticsearch/index/translog/BufferingTranslogWriter.java b/core/src/main/java/org/elasticsearch/index/translog/BufferingTranslogWriter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/BufferingTranslogWriter.java
rename to core/src/main/java/org/elasticsearch/index/translog/BufferingTranslogWriter.java
diff --git a/src/main/java/org/elasticsearch/index/translog/ChannelReference.java b/core/src/main/java/org/elasticsearch/index/translog/ChannelReference.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/ChannelReference.java
rename to core/src/main/java/org/elasticsearch/index/translog/ChannelReference.java
diff --git a/src/main/java/org/elasticsearch/index/translog/Checkpoint.java b/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/Checkpoint.java
rename to core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java
diff --git a/src/main/java/org/elasticsearch/index/translog/ImmutableTranslogReader.java b/core/src/main/java/org/elasticsearch/index/translog/ImmutableTranslogReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/ImmutableTranslogReader.java
rename to core/src/main/java/org/elasticsearch/index/translog/ImmutableTranslogReader.java
diff --git a/src/main/java/org/elasticsearch/index/translog/LegacyTranslogReader.java b/core/src/main/java/org/elasticsearch/index/translog/LegacyTranslogReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/LegacyTranslogReader.java
rename to core/src/main/java/org/elasticsearch/index/translog/LegacyTranslogReader.java
diff --git a/src/main/java/org/elasticsearch/index/translog/LegacyTranslogReaderBase.java b/core/src/main/java/org/elasticsearch/index/translog/LegacyTranslogReaderBase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/LegacyTranslogReaderBase.java
rename to core/src/main/java/org/elasticsearch/index/translog/LegacyTranslogReaderBase.java
diff --git a/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java b/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java
rename to core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java
diff --git a/src/main/java/org/elasticsearch/index/translog/Translog.java b/core/src/main/java/org/elasticsearch/index/translog/Translog.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/Translog.java
rename to core/src/main/java/org/elasticsearch/index/translog/Translog.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogConfig.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogException.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogException.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogException.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogReader.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogReader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogReader.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogReader.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogService.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogService.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogService.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogStats.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogStats.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TranslogWriter.java
rename to core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java
diff --git a/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java b/core/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java
rename to core/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java
diff --git a/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java b/core/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java
rename to core/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java
diff --git a/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java b/core/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/warmer/WarmerStats.java
rename to core/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java
diff --git a/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java b/core/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java
rename to core/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java b/core/src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexAlreadyExistsException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexClosedException.java b/core/src/main/java/org/elasticsearch/indices/IndexClosedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexClosedException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexClosedException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexCreationException.java b/core/src/main/java/org/elasticsearch/indices/IndexCreationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexCreationException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexCreationException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexMissingException.java b/core/src/main/java/org/elasticsearch/indices/IndexMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexMissingException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexMissingException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java b/core/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java b/core/src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexTemplateAlreadyExistsException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java b/core/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java
rename to core/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java
diff --git a/src/main/java/org/elasticsearch/indices/IndicesLifecycle.java b/core/src/main/java/org/elasticsearch/indices/IndicesLifecycle.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndicesLifecycle.java
rename to core/src/main/java/org/elasticsearch/indices/IndicesLifecycle.java
diff --git a/src/main/java/org/elasticsearch/indices/IndicesModule.java b/core/src/main/java/org/elasticsearch/indices/IndicesModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndicesModule.java
rename to core/src/main/java/org/elasticsearch/indices/IndicesModule.java
diff --git a/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndicesService.java
rename to core/src/main/java/org/elasticsearch/indices/IndicesService.java
diff --git a/src/main/java/org/elasticsearch/indices/IndicesWarmer.java b/core/src/main/java/org/elasticsearch/indices/IndicesWarmer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/IndicesWarmer.java
rename to core/src/main/java/org/elasticsearch/indices/IndicesWarmer.java
diff --git a/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java b/core/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java
rename to core/src/main/java/org/elasticsearch/indices/InternalIndicesLifecycle.java
diff --git a/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java b/core/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java
rename to core/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java
diff --git a/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java b/core/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java
rename to core/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java
diff --git a/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java b/core/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java
rename to core/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java
diff --git a/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java b/core/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java
rename to core/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java
diff --git a/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java b/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/NodeIndicesStats.java
rename to core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java
diff --git a/src/main/java/org/elasticsearch/indices/TypeMissingException.java b/core/src/main/java/org/elasticsearch/indices/TypeMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/TypeMissingException.java
rename to core/src/main/java/org/elasticsearch/indices/TypeMissingException.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java b/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/HunspellService.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java b/core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisModule.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java b/core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/IndicesAnalysisService.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java
diff --git a/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java
rename to core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java b/core/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java b/core/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerModule.java b/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerModule.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerModule.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java b/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java b/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/core/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java
diff --git a/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java b/core/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java
rename to core/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java
diff --git a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java b/core/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java
rename to core/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java
diff --git a/src/main/java/org/elasticsearch/indices/cache/filter/terms/TermsLookup.java b/core/src/main/java/org/elasticsearch/indices/cache/filter/terms/TermsLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/cache/filter/terms/TermsLookup.java
rename to core/src/main/java/org/elasticsearch/indices/cache/filter/terms/TermsLookup.java
diff --git a/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java b/core/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java
rename to core/src/main/java/org/elasticsearch/indices/cache/query/IndicesQueryCache.java
diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
rename to core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
diff --git a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java
rename to core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java
diff --git a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java b/core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java
rename to core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java
diff --git a/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java b/core/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
rename to core/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
diff --git a/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java b/core/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
rename to core/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
diff --git a/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
rename to core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
diff --git a/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java b/core/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java
rename to core/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java
diff --git a/src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java b/core/src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java
rename to core/src/main/java/org/elasticsearch/indices/query/IndicesQueriesModule.java
diff --git a/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java b/core/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java
rename to core/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java b/core/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java b/core/src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/IgnoreRecoveryException.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryStatus.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java b/core/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/SharedFSRecoverySourceHandler.java
diff --git a/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java
rename to core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java
diff --git a/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/store/IndicesStore.java
rename to core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
diff --git a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
rename to core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
diff --git a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java b/core/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java
rename to core/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java
diff --git a/src/main/java/org/elasticsearch/monitor/MonitorModule.java b/core/src/main/java/org/elasticsearch/monitor/MonitorModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/MonitorModule.java
rename to core/src/main/java/org/elasticsearch/monitor/MonitorModule.java
diff --git a/src/main/java/org/elasticsearch/monitor/MonitorService.java b/core/src/main/java/org/elasticsearch/monitor/MonitorService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/MonitorService.java
rename to core/src/main/java/org/elasticsearch/monitor/MonitorService.java
diff --git a/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java b/core/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/fs/FsProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/fs/FsService.java b/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/fs/FsService.java
rename to core/src/main/java/org/elasticsearch/monitor/fs/FsService.java
diff --git a/src/main/java/org/elasticsearch/monitor/fs/FsStats.java b/core/src/main/java/org/elasticsearch/monitor/fs/FsStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/fs/FsStats.java
rename to core/src/main/java/org/elasticsearch/monitor/fs/FsStats.java
diff --git a/src/main/java/org/elasticsearch/monitor/fs/JmxFsProbe.java b/core/src/main/java/org/elasticsearch/monitor/fs/JmxFsProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/fs/JmxFsProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/fs/JmxFsProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/fs/SigarFsProbe.java b/core/src/main/java/org/elasticsearch/monitor/fs/SigarFsProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/fs/SigarFsProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/fs/SigarFsProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java b/core/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java b/core/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/GcNames.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/JvmMonitorService.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/JvmService.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java
diff --git a/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java
rename to core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java
diff --git a/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java b/core/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/network/JmxNetworkProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java b/core/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java
rename to core/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java
diff --git a/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java b/core/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/network/NetworkProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/network/NetworkService.java b/core/src/main/java/org/elasticsearch/monitor/network/NetworkService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/network/NetworkService.java
rename to core/src/main/java/org/elasticsearch/monitor/network/NetworkService.java
diff --git a/src/main/java/org/elasticsearch/monitor/network/NetworkStats.java b/core/src/main/java/org/elasticsearch/monitor/network/NetworkStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/network/NetworkStats.java
rename to core/src/main/java/org/elasticsearch/monitor/network/NetworkStats.java
diff --git a/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java b/core/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/network/SigarNetworkProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java b/core/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/os/JmxOsProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/core/src/main/java/org/elasticsearch/monitor/os/OsInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/os/OsInfo.java
rename to core/src/main/java/org/elasticsearch/monitor/os/OsInfo.java
diff --git a/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/os/OsProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/os/OsService.java b/core/src/main/java/org/elasticsearch/monitor/os/OsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/os/OsService.java
rename to core/src/main/java/org/elasticsearch/monitor/os/OsService.java
diff --git a/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/core/src/main/java/org/elasticsearch/monitor/os/OsStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/os/OsStats.java
rename to core/src/main/java/org/elasticsearch/monitor/os/OsStats.java
diff --git a/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java b/core/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/os/SigarOsProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java b/core/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/process/JmxProcessProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
rename to core/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
diff --git a/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/process/ProcessService.java
rename to core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java
diff --git a/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/process/ProcessStats.java
rename to core/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java
diff --git a/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java b/core/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java
rename to core/src/main/java/org/elasticsearch/monitor/process/SigarProcessProbe.java
diff --git a/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java b/core/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/monitor/sigar/SigarService.java
rename to core/src/main/java/org/elasticsearch/monitor/sigar/SigarService.java
diff --git a/src/main/java/org/elasticsearch/node/Node.java b/core/src/main/java/org/elasticsearch/node/Node.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/Node.java
rename to core/src/main/java/org/elasticsearch/node/Node.java
diff --git a/src/main/java/org/elasticsearch/node/NodeBuilder.java b/core/src/main/java/org/elasticsearch/node/NodeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/NodeBuilder.java
rename to core/src/main/java/org/elasticsearch/node/NodeBuilder.java
diff --git a/src/main/java/org/elasticsearch/node/NodeClosedException.java b/core/src/main/java/org/elasticsearch/node/NodeClosedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/NodeClosedException.java
rename to core/src/main/java/org/elasticsearch/node/NodeClosedException.java
diff --git a/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java b/core/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
rename to core/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
diff --git a/src/main/java/org/elasticsearch/node/internal/NodeModule.java b/core/src/main/java/org/elasticsearch/node/internal/NodeModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/internal/NodeModule.java
rename to core/src/main/java/org/elasticsearch/node/internal/NodeModule.java
diff --git a/src/main/java/org/elasticsearch/node/package-info.java b/core/src/main/java/org/elasticsearch/node/package-info.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/package-info.java
rename to core/src/main/java/org/elasticsearch/node/package-info.java
diff --git a/src/main/java/org/elasticsearch/node/service/NodeService.java b/core/src/main/java/org/elasticsearch/node/service/NodeService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/service/NodeService.java
rename to core/src/main/java/org/elasticsearch/node/service/NodeService.java
diff --git a/src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java b/core/src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java
rename to core/src/main/java/org/elasticsearch/node/settings/NodeSettingsService.java
diff --git a/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java b/core/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java
rename to core/src/main/java/org/elasticsearch/percolator/MultiDocumentPercolatorIndex.java
diff --git a/src/main/java/org/elasticsearch/percolator/PercolateContext.java b/core/src/main/java/org/elasticsearch/percolator/PercolateContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/PercolateContext.java
rename to core/src/main/java/org/elasticsearch/percolator/PercolateContext.java
diff --git a/src/main/java/org/elasticsearch/percolator/PercolateException.java b/core/src/main/java/org/elasticsearch/percolator/PercolateException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/PercolateException.java
rename to core/src/main/java/org/elasticsearch/percolator/PercolateException.java
diff --git a/src/main/java/org/elasticsearch/percolator/PercolatorIndex.java b/core/src/main/java/org/elasticsearch/percolator/PercolatorIndex.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/PercolatorIndex.java
rename to core/src/main/java/org/elasticsearch/percolator/PercolatorIndex.java
diff --git a/src/main/java/org/elasticsearch/percolator/PercolatorModule.java b/core/src/main/java/org/elasticsearch/percolator/PercolatorModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/PercolatorModule.java
rename to core/src/main/java/org/elasticsearch/percolator/PercolatorModule.java
diff --git a/src/main/java/org/elasticsearch/percolator/PercolatorService.java b/core/src/main/java/org/elasticsearch/percolator/PercolatorService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/PercolatorService.java
rename to core/src/main/java/org/elasticsearch/percolator/PercolatorService.java
diff --git a/src/main/java/org/elasticsearch/percolator/QueryCollector.java b/core/src/main/java/org/elasticsearch/percolator/QueryCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/QueryCollector.java
rename to core/src/main/java/org/elasticsearch/percolator/QueryCollector.java
diff --git a/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java b/core/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java
similarity index 100%
rename from src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java
rename to core/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java
diff --git a/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java b/core/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/AbstractPlugin.java
rename to core/src/main/java/org/elasticsearch/plugins/AbstractPlugin.java
diff --git a/src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java b/core/src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java
rename to core/src/main/java/org/elasticsearch/plugins/IndexPluginsModule.java
diff --git a/src/main/java/org/elasticsearch/plugins/Plugin.java b/core/src/main/java/org/elasticsearch/plugins/Plugin.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/Plugin.java
rename to core/src/main/java/org/elasticsearch/plugins/Plugin.java
diff --git a/src/main/java/org/elasticsearch/plugins/PluginManager.java b/core/src/main/java/org/elasticsearch/plugins/PluginManager.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/PluginManager.java
rename to core/src/main/java/org/elasticsearch/plugins/PluginManager.java
diff --git a/src/main/java/org/elasticsearch/plugins/PluginsModule.java b/core/src/main/java/org/elasticsearch/plugins/PluginsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/PluginsModule.java
rename to core/src/main/java/org/elasticsearch/plugins/PluginsModule.java
diff --git a/src/main/java/org/elasticsearch/plugins/PluginsService.java b/core/src/main/java/org/elasticsearch/plugins/PluginsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/PluginsService.java
rename to core/src/main/java/org/elasticsearch/plugins/PluginsService.java
diff --git a/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java b/core/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java
rename to core/src/main/java/org/elasticsearch/plugins/ShardsPluginsModule.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java b/core/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoriesModule.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoriesService.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
diff --git a/src/main/java/org/elasticsearch/repositories/Repository.java b/core/src/main/java/org/elasticsearch/repositories/Repository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/Repository.java
rename to core/src/main/java/org/elasticsearch/repositories/Repository.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryException.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryException.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryException.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryModule.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryModule.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryModule.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryName.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryName.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryName.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryName.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryNameModule.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryNameModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryNameModule.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryNameModule.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositorySettings.java b/core/src/main/java/org/elasticsearch/repositories/RepositorySettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositorySettings.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositorySettings.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryTypesRegistry.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryTypesRegistry.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryTypesRegistry.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryTypesRegistry.java
diff --git a/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java b/core/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java
rename to core/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java
diff --git a/src/main/java/org/elasticsearch/repositories/VerificationFailure.java b/core/src/main/java/org/elasticsearch/repositories/VerificationFailure.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/VerificationFailure.java
rename to core/src/main/java/org/elasticsearch/repositories/VerificationFailure.java
diff --git a/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java b/core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
rename to core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
diff --git a/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java b/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/fs/FsRepository.java
rename to core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java
diff --git a/src/main/java/org/elasticsearch/repositories/fs/FsRepositoryModule.java b/core/src/main/java/org/elasticsearch/repositories/fs/FsRepositoryModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/fs/FsRepositoryModule.java
rename to core/src/main/java/org/elasticsearch/repositories/fs/FsRepositoryModule.java
diff --git a/src/main/java/org/elasticsearch/repositories/uri/URLIndexShardRepository.java b/core/src/main/java/org/elasticsearch/repositories/uri/URLIndexShardRepository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/uri/URLIndexShardRepository.java
rename to core/src/main/java/org/elasticsearch/repositories/uri/URLIndexShardRepository.java
diff --git a/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java b/core/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/uri/URLRepository.java
rename to core/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java
diff --git a/src/main/java/org/elasticsearch/repositories/uri/URLRepositoryModule.java b/core/src/main/java/org/elasticsearch/repositories/uri/URLRepositoryModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/repositories/uri/URLRepositoryModule.java
rename to core/src/main/java/org/elasticsearch/repositories/uri/URLRepositoryModule.java
diff --git a/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/core/src/main/java/org/elasticsearch/rest/BaseRestHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/BaseRestHandler.java
rename to core/src/main/java/org/elasticsearch/rest/BaseRestHandler.java
diff --git a/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/BytesRestResponse.java
rename to core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java
diff --git a/src/main/java/org/elasticsearch/rest/HasRestHeaders.java b/core/src/main/java/org/elasticsearch/rest/HasRestHeaders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/HasRestHeaders.java
rename to core/src/main/java/org/elasticsearch/rest/HasRestHeaders.java
diff --git a/src/main/java/org/elasticsearch/rest/RestChannel.java b/core/src/main/java/org/elasticsearch/rest/RestChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestChannel.java
rename to core/src/main/java/org/elasticsearch/rest/RestChannel.java
diff --git a/src/main/java/org/elasticsearch/rest/RestController.java b/core/src/main/java/org/elasticsearch/rest/RestController.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestController.java
rename to core/src/main/java/org/elasticsearch/rest/RestController.java
diff --git a/src/main/java/org/elasticsearch/rest/RestFilter.java b/core/src/main/java/org/elasticsearch/rest/RestFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestFilter.java
rename to core/src/main/java/org/elasticsearch/rest/RestFilter.java
diff --git a/src/main/java/org/elasticsearch/rest/RestFilterChain.java b/core/src/main/java/org/elasticsearch/rest/RestFilterChain.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestFilterChain.java
rename to core/src/main/java/org/elasticsearch/rest/RestFilterChain.java
diff --git a/src/main/java/org/elasticsearch/rest/RestHandler.java b/core/src/main/java/org/elasticsearch/rest/RestHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestHandler.java
rename to core/src/main/java/org/elasticsearch/rest/RestHandler.java
diff --git a/src/main/java/org/elasticsearch/rest/RestModule.java b/core/src/main/java/org/elasticsearch/rest/RestModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestModule.java
rename to core/src/main/java/org/elasticsearch/rest/RestModule.java
diff --git a/src/main/java/org/elasticsearch/rest/RestRequest.java b/core/src/main/java/org/elasticsearch/rest/RestRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestRequest.java
rename to core/src/main/java/org/elasticsearch/rest/RestRequest.java
diff --git a/src/main/java/org/elasticsearch/rest/RestResponse.java b/core/src/main/java/org/elasticsearch/rest/RestResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestResponse.java
rename to core/src/main/java/org/elasticsearch/rest/RestResponse.java
diff --git a/src/main/java/org/elasticsearch/rest/RestStatus.java b/core/src/main/java/org/elasticsearch/rest/RestStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/RestStatus.java
rename to core/src/main/java/org/elasticsearch/rest/RestStatus.java
diff --git a/src/main/java/org/elasticsearch/rest/action/RestActionModule.java b/core/src/main/java/org/elasticsearch/rest/action/RestActionModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/RestActionModule.java
rename to core/src/main/java/org/elasticsearch/rest/action/RestActionModule.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/hotthreads/RestNodesHotThreadsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/hotthreads/RestNodesHotThreadsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/node/hotthreads/RestNodesHotThreadsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/hotthreads/RestNodesHotThreadsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/delete/RestDeleteRepositoryAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/delete/RestDeleteRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/delete/RestDeleteRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/delete/RestDeleteRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/put/RestPutRepositoryAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/put/RestPutRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/put/RestPutRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/put/RestPutRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/verify/RestVerifyRepositoryAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/verify/RestVerifyRepositoryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/verify/RestVerifyRepositoryAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/verify/RestVerifyRepositoryAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/shards/RestClusterSearchShardsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/shards/RestClusterSearchShardsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/shards/RestClusterSearchShardsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/shards/RestClusterSearchShardsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/create/RestCreateSnapshotAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/create/RestCreateSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/create/RestCreateSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/create/RestCreateSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/delete/RestDeleteSnapshotAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/delete/RestDeleteSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/delete/RestDeleteSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/delete/RestDeleteSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/get/RestGetSnapshotsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/get/RestGetSnapshotsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/get/RestGetSnapshotsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/get/RestGetSnapshotsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/restore/RestRestoreSnapshotAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/restore/RestRestoreSnapshotAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/restore/RestRestoreSnapshotAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/restore/RestRestoreSnapshotAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/status/RestSnapshotsStatusAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/status/RestSnapshotsStatusAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/status/RestSnapshotsStatusAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/status/RestSnapshotsStatusAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/stats/RestClusterStatsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/stats/RestClusterStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/stats/RestClusterStatsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/stats/RestClusterStatsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/tasks/RestPendingClusterTasksAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/tasks/RestPendingClusterTasksAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/cluster/tasks/RestPendingClusterTasksAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/tasks/RestPendingClusterTasksAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/AliasesMissingException.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/AliasesMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/AliasesMissingException.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/AliasesMissingException.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/RestIndexDeleteAliasesAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/RestIndexDeleteAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/RestIndexDeleteAliasesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/RestIndexDeleteAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetAliasesAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetAliasesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetIndicesAliasesAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetIndicesAliasesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetIndicesAliasesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetIndicesAliasesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/head/RestAliasesExistAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/head/RestAliasesExistAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/head/RestAliasesExistAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/head/RestAliasesExistAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/indices/RestIndicesExistsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/indices/RestIndicesExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/exists/indices/RestIndicesExistsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/indices/RestIndicesExistsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/types/RestTypesExistsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/types/RestTypesExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/exists/types/RestTypesExistsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/exists/types/RestTypesExistsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/recovery/RestRecoveryAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/recovery/RestRecoveryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/recovery/RestRecoveryAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/recovery/RestRecoveryAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/template/head/RestHeadIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/head/RestHeadIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/template/head/RestHeadIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/head/RestHeadIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/validate/query/RestValidateQueryAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/validate/query/RestValidateQueryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/validate/query/RestValidateQueryAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/validate/query/RestValidateQueryAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/delete/RestDeleteWarmerAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/delete/RestDeleteWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/delete/RestDeleteWarmerAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/delete/RestDeleteWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/get/RestGetWarmerAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/get/RestGetWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/get/RestGetWarmerAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/get/RestGetWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/put/RestPutWarmerAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/put/RestPutWarmerAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/put/RestPutWarmerAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/put/RestPutWarmerAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java b/core/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java b/core/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java b/core/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/exists/RestExistsAction.java b/core/src/main/java/org/elasticsearch/rest/action/exists/RestExistsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/exists/RestExistsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/exists/RestExistsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java b/core/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/fieldstats/RestFieldStatsAction.java b/core/src/main/java/org/elasticsearch/rest/action/fieldstats/RestFieldStatsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/fieldstats/RestFieldStatsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/fieldstats/RestFieldStatsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java b/core/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java b/core/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/get/RestHeadAction.java b/core/src/main/java/org/elasticsearch/rest/action/get/RestHeadAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/get/RestHeadAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/get/RestHeadAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java b/core/src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/core/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java b/core/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/percolate/RestMultiPercolateAction.java b/core/src/main/java/org/elasticsearch/rest/action/percolate/RestMultiPercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/percolate/RestMultiPercolateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/percolate/RestMultiPercolateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java b/core/src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/script/RestDeleteIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/rest/action/script/RestDeleteIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/script/RestDeleteIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/script/RestDeleteIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/script/RestGetIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/rest/action/script/RestGetIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/script/RestGetIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/script/RestGetIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java b/core/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java b/core/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/AcknowledgedRestListener.java b/core/src/main/java/org/elasticsearch/rest/action/support/AcknowledgedRestListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/AcknowledgedRestListener.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/AcknowledgedRestListener.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestActionListener.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestActionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestActionListener.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestActionListener.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestActions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestActions.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestActions.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestBuilderListener.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestBuilderListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestBuilderListener.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestBuilderListener.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestResponseListener.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestResponseListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestResponseListener.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestResponseListener.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestStatusToXContentListener.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestStatusToXContentListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestStatusToXContentListener.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestStatusToXContentListener.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestTable.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestTable.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestToXContentListener.java b/core/src/main/java/org/elasticsearch/rest/action/support/RestToXContentListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/support/RestToXContentListener.java
rename to core/src/main/java/org/elasticsearch/rest/action/support/RestToXContentListener.java
diff --git a/src/main/java/org/elasticsearch/rest/action/template/RestDeleteSearchTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/template/RestDeleteSearchTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/template/RestDeleteSearchTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/template/RestDeleteSearchTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/template/RestGetSearchTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/template/RestGetSearchTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/template/RestGetSearchTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/template/RestGetSearchTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/template/RestPutSearchTemplateAction.java b/core/src/main/java/org/elasticsearch/rest/action/template/RestPutSearchTemplateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/template/RestPutSearchTemplateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/template/RestPutSearchTemplateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/termvectors/RestMultiTermVectorsAction.java b/core/src/main/java/org/elasticsearch/rest/action/termvectors/RestMultiTermVectorsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/termvectors/RestMultiTermVectorsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/termvectors/RestMultiTermVectorsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java b/core/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java
diff --git a/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java b/core/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java
rename to core/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java
diff --git a/src/main/java/org/elasticsearch/rest/support/RestUtils.java b/core/src/main/java/org/elasticsearch/rest/support/RestUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/rest/support/RestUtils.java
rename to core/src/main/java/org/elasticsearch/rest/support/RestUtils.java
diff --git a/src/main/java/org/elasticsearch/river/AbstractRiverComponent.java b/core/src/main/java/org/elasticsearch/river/AbstractRiverComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/AbstractRiverComponent.java
rename to core/src/main/java/org/elasticsearch/river/AbstractRiverComponent.java
diff --git a/src/main/java/org/elasticsearch/river/River.java b/core/src/main/java/org/elasticsearch/river/River.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/River.java
rename to core/src/main/java/org/elasticsearch/river/River.java
diff --git a/src/main/java/org/elasticsearch/river/RiverComponent.java b/core/src/main/java/org/elasticsearch/river/RiverComponent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverComponent.java
rename to core/src/main/java/org/elasticsearch/river/RiverComponent.java
diff --git a/src/main/java/org/elasticsearch/river/RiverException.java b/core/src/main/java/org/elasticsearch/river/RiverException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverException.java
rename to core/src/main/java/org/elasticsearch/river/RiverException.java
diff --git a/src/main/java/org/elasticsearch/river/RiverIndexName.java b/core/src/main/java/org/elasticsearch/river/RiverIndexName.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverIndexName.java
rename to core/src/main/java/org/elasticsearch/river/RiverIndexName.java
diff --git a/src/main/java/org/elasticsearch/river/RiverModule.java b/core/src/main/java/org/elasticsearch/river/RiverModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverModule.java
rename to core/src/main/java/org/elasticsearch/river/RiverModule.java
diff --git a/src/main/java/org/elasticsearch/river/RiverName.java b/core/src/main/java/org/elasticsearch/river/RiverName.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverName.java
rename to core/src/main/java/org/elasticsearch/river/RiverName.java
diff --git a/src/main/java/org/elasticsearch/river/RiverNameModule.java b/core/src/main/java/org/elasticsearch/river/RiverNameModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverNameModule.java
rename to core/src/main/java/org/elasticsearch/river/RiverNameModule.java
diff --git a/src/main/java/org/elasticsearch/river/RiverSettings.java b/core/src/main/java/org/elasticsearch/river/RiverSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiverSettings.java
rename to core/src/main/java/org/elasticsearch/river/RiverSettings.java
diff --git a/src/main/java/org/elasticsearch/river/RiversManager.java b/core/src/main/java/org/elasticsearch/river/RiversManager.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiversManager.java
rename to core/src/main/java/org/elasticsearch/river/RiversManager.java
diff --git a/src/main/java/org/elasticsearch/river/RiversModule.java b/core/src/main/java/org/elasticsearch/river/RiversModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiversModule.java
rename to core/src/main/java/org/elasticsearch/river/RiversModule.java
diff --git a/src/main/java/org/elasticsearch/river/RiversPluginsModule.java b/core/src/main/java/org/elasticsearch/river/RiversPluginsModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiversPluginsModule.java
rename to core/src/main/java/org/elasticsearch/river/RiversPluginsModule.java
diff --git a/src/main/java/org/elasticsearch/river/RiversService.java b/core/src/main/java/org/elasticsearch/river/RiversService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiversService.java
rename to core/src/main/java/org/elasticsearch/river/RiversService.java
diff --git a/src/main/java/org/elasticsearch/river/RiversTypesRegistry.java b/core/src/main/java/org/elasticsearch/river/RiversTypesRegistry.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/RiversTypesRegistry.java
rename to core/src/main/java/org/elasticsearch/river/RiversTypesRegistry.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java b/core/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java
rename to core/src/main/java/org/elasticsearch/river/cluster/PublishRiverClusterStateAction.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java b/core/src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java
rename to core/src/main/java/org/elasticsearch/river/cluster/RiverClusterChangedEvent.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java b/core/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java
rename to core/src/main/java/org/elasticsearch/river/cluster/RiverClusterService.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java b/core/src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java
rename to core/src/main/java/org/elasticsearch/river/cluster/RiverClusterState.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java b/core/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java
rename to core/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateListener.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java b/core/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java
rename to core/src/main/java/org/elasticsearch/river/cluster/RiverClusterStateUpdateTask.java
diff --git a/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java b/core/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java
rename to core/src/main/java/org/elasticsearch/river/cluster/RiverNodeHelper.java
diff --git a/src/main/java/org/elasticsearch/river/dummy/DummyRiver.java b/core/src/main/java/org/elasticsearch/river/dummy/DummyRiver.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/dummy/DummyRiver.java
rename to core/src/main/java/org/elasticsearch/river/dummy/DummyRiver.java
diff --git a/src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java b/core/src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java
rename to core/src/main/java/org/elasticsearch/river/dummy/DummyRiverModule.java
diff --git a/src/main/java/org/elasticsearch/river/routing/RiverRouting.java b/core/src/main/java/org/elasticsearch/river/routing/RiverRouting.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/routing/RiverRouting.java
rename to core/src/main/java/org/elasticsearch/river/routing/RiverRouting.java
diff --git a/src/main/java/org/elasticsearch/river/routing/RiversRouter.java b/core/src/main/java/org/elasticsearch/river/routing/RiversRouter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/routing/RiversRouter.java
rename to core/src/main/java/org/elasticsearch/river/routing/RiversRouter.java
diff --git a/src/main/java/org/elasticsearch/river/routing/RiversRouting.java b/core/src/main/java/org/elasticsearch/river/routing/RiversRouting.java
similarity index 100%
rename from src/main/java/org/elasticsearch/river/routing/RiversRouting.java
rename to core/src/main/java/org/elasticsearch/river/routing/RiversRouting.java
diff --git a/src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java b/core/src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java
rename to core/src/main/java/org/elasticsearch/script/AbstractDoubleSearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/AbstractExecutableScript.java b/core/src/main/java/org/elasticsearch/script/AbstractExecutableScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/AbstractExecutableScript.java
rename to core/src/main/java/org/elasticsearch/script/AbstractExecutableScript.java
diff --git a/src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java b/core/src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java
rename to core/src/main/java/org/elasticsearch/script/AbstractFloatSearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java b/core/src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java
rename to core/src/main/java/org/elasticsearch/script/AbstractLongSearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/AbstractScriptParser.java b/core/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/AbstractScriptParser.java
rename to core/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
diff --git a/src/main/java/org/elasticsearch/script/AbstractSearchScript.java b/core/src/main/java/org/elasticsearch/script/AbstractSearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/AbstractSearchScript.java
rename to core/src/main/java/org/elasticsearch/script/AbstractSearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/CompiledScript.java b/core/src/main/java/org/elasticsearch/script/CompiledScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/CompiledScript.java
rename to core/src/main/java/org/elasticsearch/script/CompiledScript.java
diff --git a/src/main/java/org/elasticsearch/script/ExecutableScript.java b/core/src/main/java/org/elasticsearch/script/ExecutableScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ExecutableScript.java
rename to core/src/main/java/org/elasticsearch/script/ExecutableScript.java
diff --git a/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java b/core/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ExplainableSearchScript.java
rename to core/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/LeafSearchScript.java b/core/src/main/java/org/elasticsearch/script/LeafSearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/LeafSearchScript.java
rename to core/src/main/java/org/elasticsearch/script/LeafSearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java b/core/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/NativeScriptEngineService.java
rename to core/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java
diff --git a/src/main/java/org/elasticsearch/script/NativeScriptFactory.java b/core/src/main/java/org/elasticsearch/script/NativeScriptFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/NativeScriptFactory.java
rename to core/src/main/java/org/elasticsearch/script/NativeScriptFactory.java
diff --git a/src/main/java/org/elasticsearch/script/ScoreAccessor.java b/core/src/main/java/org/elasticsearch/script/ScoreAccessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScoreAccessor.java
rename to core/src/main/java/org/elasticsearch/script/ScoreAccessor.java
diff --git a/src/main/java/org/elasticsearch/script/Script.java b/core/src/main/java/org/elasticsearch/script/Script.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/Script.java
rename to core/src/main/java/org/elasticsearch/script/Script.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptContext.java b/core/src/main/java/org/elasticsearch/script/ScriptContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptContext.java
rename to core/src/main/java/org/elasticsearch/script/ScriptContext.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java b/core/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptContextRegistry.java
rename to core/src/main/java/org/elasticsearch/script/ScriptContextRegistry.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptEngineService.java b/core/src/main/java/org/elasticsearch/script/ScriptEngineService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptEngineService.java
rename to core/src/main/java/org/elasticsearch/script/ScriptEngineService.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptException.java b/core/src/main/java/org/elasticsearch/script/ScriptException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptException.java
rename to core/src/main/java/org/elasticsearch/script/ScriptException.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptMode.java b/core/src/main/java/org/elasticsearch/script/ScriptMode.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptMode.java
rename to core/src/main/java/org/elasticsearch/script/ScriptMode.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptModes.java b/core/src/main/java/org/elasticsearch/script/ScriptModes.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptModes.java
rename to core/src/main/java/org/elasticsearch/script/ScriptModes.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptModule.java b/core/src/main/java/org/elasticsearch/script/ScriptModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptModule.java
rename to core/src/main/java/org/elasticsearch/script/ScriptModule.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptParameterParser.java b/core/src/main/java/org/elasticsearch/script/ScriptParameterParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptParameterParser.java
rename to core/src/main/java/org/elasticsearch/script/ScriptParameterParser.java
diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/core/src/main/java/org/elasticsearch/script/ScriptService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/ScriptService.java
rename to core/src/main/java/org/elasticsearch/script/ScriptService.java
diff --git a/src/main/java/org/elasticsearch/script/SearchScript.java b/core/src/main/java/org/elasticsearch/script/SearchScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/SearchScript.java
rename to core/src/main/java/org/elasticsearch/script/SearchScript.java
diff --git a/src/main/java/org/elasticsearch/script/Template.java b/core/src/main/java/org/elasticsearch/script/Template.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/Template.java
rename to core/src/main/java/org/elasticsearch/script/Template.java
diff --git a/src/main/java/org/elasticsearch/script/expression/CountMethodFunctionValues.java b/core/src/main/java/org/elasticsearch/script/expression/CountMethodFunctionValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/CountMethodFunctionValues.java
rename to core/src/main/java/org/elasticsearch/script/expression/CountMethodFunctionValues.java
diff --git a/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java b/core/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
rename to core/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java
diff --git a/src/main/java/org/elasticsearch/script/expression/DateMethodFunctionValues.java b/core/src/main/java/org/elasticsearch/script/expression/DateMethodFunctionValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/DateMethodFunctionValues.java
rename to core/src/main/java/org/elasticsearch/script/expression/DateMethodFunctionValues.java
diff --git a/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java b/core/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java
rename to core/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java
diff --git a/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java b/core/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/ExpressionScript.java
rename to core/src/main/java/org/elasticsearch/script/expression/ExpressionScript.java
diff --git a/src/main/java/org/elasticsearch/script/expression/ExpressionScriptCompilationException.java b/core/src/main/java/org/elasticsearch/script/expression/ExpressionScriptCompilationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/ExpressionScriptCompilationException.java
rename to core/src/main/java/org/elasticsearch/script/expression/ExpressionScriptCompilationException.java
diff --git a/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngineService.java b/core/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngineService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngineService.java
rename to core/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngineService.java
diff --git a/src/main/java/org/elasticsearch/script/expression/ExpressionScriptExecutionException.java b/core/src/main/java/org/elasticsearch/script/expression/ExpressionScriptExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/ExpressionScriptExecutionException.java
rename to core/src/main/java/org/elasticsearch/script/expression/ExpressionScriptExecutionException.java
diff --git a/src/main/java/org/elasticsearch/script/expression/FieldDataFunctionValues.java b/core/src/main/java/org/elasticsearch/script/expression/FieldDataFunctionValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/FieldDataFunctionValues.java
rename to core/src/main/java/org/elasticsearch/script/expression/FieldDataFunctionValues.java
diff --git a/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java b/core/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java
rename to core/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java
diff --git a/src/main/java/org/elasticsearch/script/expression/ReplaceableConstValueSource.java b/core/src/main/java/org/elasticsearch/script/expression/ReplaceableConstValueSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/expression/ReplaceableConstValueSource.java
rename to core/src/main/java/org/elasticsearch/script/expression/ReplaceableConstValueSource.java
diff --git a/src/main/java/org/elasticsearch/script/groovy/GroovyScriptCompilationException.java b/core/src/main/java/org/elasticsearch/script/groovy/GroovyScriptCompilationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/groovy/GroovyScriptCompilationException.java
rename to core/src/main/java/org/elasticsearch/script/groovy/GroovyScriptCompilationException.java
diff --git a/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java b/core/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
rename to core/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
diff --git a/src/main/java/org/elasticsearch/script/groovy/GroovyScriptExecutionException.java b/core/src/main/java/org/elasticsearch/script/groovy/GroovyScriptExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/groovy/GroovyScriptExecutionException.java
rename to core/src/main/java/org/elasticsearch/script/groovy/GroovyScriptExecutionException.java
diff --git a/src/main/java/org/elasticsearch/script/mustache/JsonEscapingMustacheFactory.java b/core/src/main/java/org/elasticsearch/script/mustache/JsonEscapingMustacheFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/mustache/JsonEscapingMustacheFactory.java
rename to core/src/main/java/org/elasticsearch/script/mustache/JsonEscapingMustacheFactory.java
diff --git a/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java b/core/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java
rename to core/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java
diff --git a/src/main/java/org/elasticsearch/search/DefaultSearchServiceModule.java b/core/src/main/java/org/elasticsearch/search/DefaultSearchServiceModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/DefaultSearchServiceModule.java
rename to core/src/main/java/org/elasticsearch/search/DefaultSearchServiceModule.java
diff --git a/src/main/java/org/elasticsearch/search/MultiValueMode.java b/core/src/main/java/org/elasticsearch/search/MultiValueMode.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/MultiValueMode.java
rename to core/src/main/java/org/elasticsearch/search/MultiValueMode.java
diff --git a/src/main/java/org/elasticsearch/search/Scroll.java b/core/src/main/java/org/elasticsearch/search/Scroll.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/Scroll.java
rename to core/src/main/java/org/elasticsearch/search/Scroll.java
diff --git a/src/main/java/org/elasticsearch/search/SearchContextException.java b/core/src/main/java/org/elasticsearch/search/SearchContextException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchContextException.java
rename to core/src/main/java/org/elasticsearch/search/SearchContextException.java
diff --git a/src/main/java/org/elasticsearch/search/SearchContextMissingException.java b/core/src/main/java/org/elasticsearch/search/SearchContextMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchContextMissingException.java
rename to core/src/main/java/org/elasticsearch/search/SearchContextMissingException.java
diff --git a/src/main/java/org/elasticsearch/search/SearchException.java b/core/src/main/java/org/elasticsearch/search/SearchException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchException.java
rename to core/src/main/java/org/elasticsearch/search/SearchException.java
diff --git a/src/main/java/org/elasticsearch/search/SearchHit.java b/core/src/main/java/org/elasticsearch/search/SearchHit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchHit.java
rename to core/src/main/java/org/elasticsearch/search/SearchHit.java
diff --git a/src/main/java/org/elasticsearch/search/SearchHitField.java b/core/src/main/java/org/elasticsearch/search/SearchHitField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchHitField.java
rename to core/src/main/java/org/elasticsearch/search/SearchHitField.java
diff --git a/src/main/java/org/elasticsearch/search/SearchHits.java b/core/src/main/java/org/elasticsearch/search/SearchHits.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchHits.java
rename to core/src/main/java/org/elasticsearch/search/SearchHits.java
diff --git a/src/main/java/org/elasticsearch/search/SearchModule.java b/core/src/main/java/org/elasticsearch/search/SearchModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchModule.java
rename to core/src/main/java/org/elasticsearch/search/SearchModule.java
diff --git a/src/main/java/org/elasticsearch/search/SearchParseElement.java b/core/src/main/java/org/elasticsearch/search/SearchParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchParseElement.java
rename to core/src/main/java/org/elasticsearch/search/SearchParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/SearchParseException.java b/core/src/main/java/org/elasticsearch/search/SearchParseException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchParseException.java
rename to core/src/main/java/org/elasticsearch/search/SearchParseException.java
diff --git a/src/main/java/org/elasticsearch/search/SearchPhase.java b/core/src/main/java/org/elasticsearch/search/SearchPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchPhase.java
rename to core/src/main/java/org/elasticsearch/search/SearchPhase.java
diff --git a/src/main/java/org/elasticsearch/search/SearchPhaseResult.java b/core/src/main/java/org/elasticsearch/search/SearchPhaseResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchPhaseResult.java
rename to core/src/main/java/org/elasticsearch/search/SearchPhaseResult.java
diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/core/src/main/java/org/elasticsearch/search/SearchService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchService.java
rename to core/src/main/java/org/elasticsearch/search/SearchService.java
diff --git a/src/main/java/org/elasticsearch/search/SearchServiceModule.java b/core/src/main/java/org/elasticsearch/search/SearchServiceModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchServiceModule.java
rename to core/src/main/java/org/elasticsearch/search/SearchServiceModule.java
diff --git a/src/main/java/org/elasticsearch/search/SearchShardTarget.java b/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/SearchShardTarget.java
rename to core/src/main/java/org/elasticsearch/search/SearchShardTarget.java
diff --git a/src/main/java/org/elasticsearch/search/TransportSearchModule.java b/core/src/main/java/org/elasticsearch/search/TransportSearchModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/TransportSearchModule.java
rename to core/src/main/java/org/elasticsearch/search/TransportSearchModule.java
diff --git a/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java b/core/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java
rename to core/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/Aggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationBinaryParseElement.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBinaryParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationBinaryParseElement.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationBinaryParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationModule.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationModule.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationModule.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationParseElement.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationParseElement.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationStreams.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregationStreams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregationStreams.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregationStreams.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/Aggregations.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/Aggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java b/core/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java b/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java b/core/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java b/core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java b/core/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/TransportAggregationModule.java b/core/src/main/java/org/elasticsearch/search/aggregations/TransportAggregationModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/TransportAggregationModule.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/TransportAggregationModule.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreamContext.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreamContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreamContext.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreamContext.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreams.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreams.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketStreams.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/Children.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/Children.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/children/Children.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/Children.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ParentToChildrenAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/Filters.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/Filters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filters/Filters.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/Filters.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalOrder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalOrder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalOrder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalOrder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IPv4RangeBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IPv4RangeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IPv4RangeBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IPv4RangeBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/InternalIPv4Range.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/InternalIPv4Range.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/InternalIPv4Range.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/InternalIPv4Range.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IpRangeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IpRangeParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IpRangeParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ipv4/IpRangeParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParametersParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParametersParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParametersParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParametersParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParserMapper.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParserMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParserMapper.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParserMapper.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicStreams.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicStreams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicStreams.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicStreams.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificantTermsHeuristicModule.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificantTermsHeuristicModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificantTermsHeuristicModule.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificantTermsHeuristicModule.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/TransportSignificantTermsHeuristicModule.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/TransportSignificantTermsHeuristicModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/TransportSignificantTermsHeuristicModule.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/TransportSignificantTermsHeuristicModule.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractTermsParametersParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractTermsParametersParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractTermsParametersParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractTermsParametersParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParametersParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParametersParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParametersParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParametersParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/BucketPriorityQueue.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/BucketPriorityQueue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/BucketPriorityQueue.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/BucketPriorityQueue.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalMetricsAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalMetricsAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/InternalMetricsAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalMetricsAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericValuesSourceMetricsAggregatorParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericValuesSourceMetricsAggregatorParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/NumericValuesSourceMetricsAggregatorParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericValuesSourceMetricsAggregatorParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/ValuesSourceMetricsAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/ValuesSourceMetricsAggregationBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/ValuesSourceMetricsAggregationBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/ValuesSourceMetricsAggregationBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentile.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentile.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentile.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentile.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentileRanks.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentileRanks.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentileRanks.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentileRanks.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentiles.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentiles.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentiles.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggegator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorFactory.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorFactory.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorStreams.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorStreams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorStreams.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorStreams.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativeParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelStreams.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelStreams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelStreams.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelStreams.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/GeoPointParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/GeoPointParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/GeoPointParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/GeoPointParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatterStreams.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java
rename to core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java
diff --git a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
rename to core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java
rename to core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java
diff --git a/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java b/core/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
rename to core/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
diff --git a/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java b/core/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java
rename to core/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java
diff --git a/src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java b/core/src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java
rename to core/src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java
diff --git a/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/core/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/dfs/DfsPhase.java
rename to core/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java
diff --git a/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java b/core/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java
rename to core/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java
diff --git a/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/core/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java
rename to core/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java
rename to core/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java
rename to core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java
rename to core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResultProvider.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java b/core/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java
rename to core/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java b/core/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java
rename to core/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java b/core/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java
rename to core/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java b/core/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java
rename to core/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/explain/ExplainFetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/explain/ExplainParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsContext.java b/core/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsContext.java
rename to core/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsContext.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsFetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/fielddata/FieldDataFieldsParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsBuilder.java b/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java b/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java
rename to core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsFetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/matchedqueries/MatchedQueriesFetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java b/core/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java
rename to core/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsContext.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsFetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceContext.java b/core/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/source/FetchSourceContext.java
rename to core/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceContext.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/source/FetchSourceParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/source/FetchSourceSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java b/core/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java
rename to core/src/main/java/org/elasticsearch/search/fetch/version/VersionFetchSubPhase.java
diff --git a/src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java
rename to core/src/main/java/org/elasticsearch/search/fetch/version/VersionParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/CustomQueryScorer.java b/core/src/main/java/org/elasticsearch/search/highlight/CustomQueryScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/CustomQueryScorer.java
rename to core/src/main/java/org/elasticsearch/search/highlight/CustomQueryScorer.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/core/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
rename to core/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightField.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlightField.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlightField.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightModule.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlightModule.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlightModule.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/Highlighter.java b/core/src/main/java/org/elasticsearch/search/highlight/Highlighter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/Highlighter.java
rename to core/src/main/java/org/elasticsearch/search/highlight/Highlighter.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java
rename to core/src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/Highlighters.java b/core/src/main/java/org/elasticsearch/search/highlight/Highlighters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/Highlighters.java
rename to core/src/main/java/org/elasticsearch/search/highlight/Highlighters.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java b/core/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
rename to core/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java b/core/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
rename to core/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java b/core/src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java
rename to core/src/main/java/org/elasticsearch/search/highlight/SearchContextHighlight.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
rename to core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SimpleFragmentsBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SimpleFragmentsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SimpleFragmentsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SimpleFragmentsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java
rename to core/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
rename to core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
diff --git a/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
rename to core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java
diff --git a/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java
rename to core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java
diff --git a/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java b/core/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java
rename to core/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java
diff --git a/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java
rename to core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java
diff --git a/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java
rename to core/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java
diff --git a/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java
rename to core/src/main/java/org/elasticsearch/search/internal/InternalSearchHits.java
diff --git a/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java
rename to core/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java
diff --git a/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/SearchContext.java
rename to core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
diff --git a/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
rename to core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
diff --git a/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
rename to core/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
diff --git a/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java
rename to core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java
diff --git a/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/internal/SubSearchContext.java
rename to core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java b/core/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java
rename to core/src/main/java/org/elasticsearch/search/lookup/CachedPositionIterator.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/DocLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/DocLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/DocLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/DocLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/IndexField.java b/core/src/main/java/org/elasticsearch/search/lookup/IndexField.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/IndexField.java
rename to core/src/main/java/org/elasticsearch/search/lookup/IndexField.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java b/core/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
rename to core/src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/IndexLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/IndexLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/IndexLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/IndexLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafIndexLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/LeafIndexLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/LeafIndexLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/LeafIndexLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/PositionIterator.java b/core/src/main/java/org/elasticsearch/search/lookup/PositionIterator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/PositionIterator.java
rename to core/src/main/java/org/elasticsearch/search/lookup/PositionIterator.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/SearchLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/core/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
rename to core/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
diff --git a/src/main/java/org/elasticsearch/search/lookup/TermPosition.java b/core/src/main/java/org/elasticsearch/search/lookup/TermPosition.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/lookup/TermPosition.java
rename to core/src/main/java/org/elasticsearch/search/lookup/TermPosition.java
diff --git a/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java b/core/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/FromParseElement.java b/core/src/main/java/org/elasticsearch/search/query/FromParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/FromParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/FromParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java b/core/src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/IndicesBoostParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java b/core/src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/MinScoreParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/PostFilterParseElement.java b/core/src/main/java/org/elasticsearch/search/query/PostFilterParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/PostFilterParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/PostFilterParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java b/core/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/QueryParseElement.java b/core/src/main/java/org/elasticsearch/search/query/QueryParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QueryParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/QueryParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/core/src/main/java/org/elasticsearch/search/query/QueryPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QueryPhase.java
rename to core/src/main/java/org/elasticsearch/search/query/QueryPhase.java
diff --git a/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java b/core/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java
rename to core/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java
diff --git a/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java b/core/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java
rename to core/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java
diff --git a/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
rename to core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java
diff --git a/src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java b/core/src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java
rename to core/src/main/java/org/elasticsearch/search/query/QuerySearchResultProvider.java
diff --git a/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java b/core/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java
rename to core/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java
diff --git a/src/main/java/org/elasticsearch/search/query/SizeParseElement.java b/core/src/main/java/org/elasticsearch/search/query/SizeParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/SizeParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/SizeParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java b/core/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/TerminateAfterParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/query/TimeoutParseElement.java b/core/src/main/java/org/elasticsearch/search/query/TimeoutParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/query/TimeoutParseElement.java
rename to core/src/main/java/org/elasticsearch/search/query/TimeoutParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java
rename to core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java
diff --git a/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java b/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java
rename to core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java b/core/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java
rename to core/src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/core/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/rescore/RescorePhase.java
rename to core/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java
diff --git a/src/main/java/org/elasticsearch/search/rescore/RescoreSearchContext.java b/core/src/main/java/org/elasticsearch/search/rescore/RescoreSearchContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/rescore/RescoreSearchContext.java
rename to core/src/main/java/org/elasticsearch/search/rescore/RescoreSearchContext.java
diff --git a/src/main/java/org/elasticsearch/search/rescore/Rescorer.java b/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/rescore/Rescorer.java
rename to core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java
diff --git a/src/main/java/org/elasticsearch/search/scan/ScanContext.java b/core/src/main/java/org/elasticsearch/search/scan/ScanContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/scan/ScanContext.java
rename to core/src/main/java/org/elasticsearch/search/scan/ScanContext.java
diff --git a/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
rename to core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
rename to core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java b/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
rename to core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
diff --git a/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java
rename to core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
rename to core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java
rename to core/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java
diff --git a/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/SortBuilder.java
rename to core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/core/src/main/java/org/elasticsearch/search/sort/SortBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/SortBuilders.java
rename to core/src/main/java/org/elasticsearch/search/sort/SortBuilders.java
diff --git a/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/SortOrder.java
rename to core/src/main/java/org/elasticsearch/search/sort/SortOrder.java
diff --git a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java b/core/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/SortParseElement.java
rename to core/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/sort/SortParser.java b/core/src/main/java/org/elasticsearch/search/sort/SortParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/SortParser.java
rename to core/src/main/java/org/elasticsearch/search/sort/SortParser.java
diff --git a/src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java b/core/src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java
rename to core/src/main/java/org/elasticsearch/search/sort/TrackScoresParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java b/core/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java
rename to core/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/core/src/main/java/org/elasticsearch/search/suggest/Suggest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/Suggest.java
rename to core/src/main/java/org/elasticsearch/search/suggest/Suggest.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilderException.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilderException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestBuilderException.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilderException.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestContextParser.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestContextParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestContextParser.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestContextParser.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestModule.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestModule.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestModule.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestParseElement.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/Suggester.java b/core/src/main/java/org/elasticsearch/search/suggest/Suggester.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/Suggester.java
rename to core/src/main/java/org/elasticsearch/search/suggest/Suggester.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/Suggesters.java b/core/src/main/java/org/elasticsearch/search/suggest/Suggesters.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/Suggesters.java
rename to core/src/main/java/org/elasticsearch/search/suggest/Suggesters.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java
rename to core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/Completion090PostingsFormat.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestParser.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionFuzzyBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionFuzzyBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionFuzzyBuilder.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionFuzzyBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/CompletionTokenStream.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionTokenStream.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/CompletionTokenStream.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionTokenStream.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/PayloadProcessor.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/PayloadProcessor.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/completion/PayloadProcessor.java
rename to core/src/main/java/org/elasticsearch/search/suggest/completion/PayloadProcessor.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/context/CategoryContextMapping.java b/core/src/main/java/org/elasticsearch/search/suggest/context/CategoryContextMapping.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/context/CategoryContextMapping.java
rename to core/src/main/java/org/elasticsearch/search/suggest/context/CategoryContextMapping.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/context/ContextBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/context/ContextBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/context/ContextBuilder.java
rename to core/src/main/java/org/elasticsearch/search/suggest/context/ContextBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/context/ContextMapping.java b/core/src/main/java/org/elasticsearch/search/suggest/context/ContextMapping.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/context/ContextMapping.java
rename to core/src/main/java/org/elasticsearch/search/suggest/context/ContextMapping.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/context/GeolocationContextMapping.java b/core/src/main/java/org/elasticsearch/search/suggest/context/GeolocationContextMapping.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/context/GeolocationContextMapping.java
rename to core/src/main/java/org/elasticsearch/search/suggest/context/GeolocationContextMapping.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpoatingScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpoatingScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpoatingScorer.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpoatingScorer.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java
rename to core/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java
rename to core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestParser.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java
rename to core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java
rename to core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java
rename to core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java
diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java
rename to core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java
diff --git a/src/main/java/org/elasticsearch/search/warmer/IndexWarmerMissingException.java b/core/src/main/java/org/elasticsearch/search/warmer/IndexWarmerMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/warmer/IndexWarmerMissingException.java
rename to core/src/main/java/org/elasticsearch/search/warmer/IndexWarmerMissingException.java
diff --git a/src/main/java/org/elasticsearch/search/warmer/IndexWarmersMetaData.java b/core/src/main/java/org/elasticsearch/search/warmer/IndexWarmersMetaData.java
similarity index 100%
rename from src/main/java/org/elasticsearch/search/warmer/IndexWarmersMetaData.java
rename to core/src/main/java/org/elasticsearch/search/warmer/IndexWarmersMetaData.java
diff --git a/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java b/core/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java
rename to core/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java
diff --git a/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java b/core/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java
rename to core/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java
diff --git a/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java b/core/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/RestoreInfo.java
rename to core/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java
diff --git a/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/RestoreService.java
rename to core/src/main/java/org/elasticsearch/snapshots/RestoreService.java
diff --git a/src/main/java/org/elasticsearch/snapshots/Snapshot.java b/core/src/main/java/org/elasticsearch/snapshots/Snapshot.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/Snapshot.java
rename to core/src/main/java/org/elasticsearch/snapshots/Snapshot.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotException.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotException.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotException.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotState.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotState.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotState.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotState.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java
diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
rename to core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java
similarity index 100%
rename from src/main/java/org/elasticsearch/threadpool/ThreadPool.java
rename to core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java
diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java b/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java
rename to core/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java
diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java b/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java
rename to core/src/main/java/org/elasticsearch/threadpool/ThreadPoolModule.java
diff --git a/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java b/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java
rename to core/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java
diff --git a/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java b/core/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/core/src/main/java/org/elasticsearch/transport/ActionTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/ActionTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/ActionTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java b/core/src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java
rename to core/src/main/java/org/elasticsearch/transport/BaseTransportResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/transport/BindTransportException.java b/core/src/main/java/org/elasticsearch/transport/BindTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/BindTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/BindTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java b/core/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/BytesTransportRequest.java
rename to core/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java
diff --git a/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/core/src/main/java/org/elasticsearch/transport/ConnectTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/ConnectTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/ConnectTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java b/core/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java
rename to core/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/transport/FailedCommunicationException.java b/core/src/main/java/org/elasticsearch/transport/FailedCommunicationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/FailedCommunicationException.java
rename to core/src/main/java/org/elasticsearch/transport/FailedCommunicationException.java
diff --git a/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java b/core/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java
rename to core/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java b/core/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java
rename to core/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java
diff --git a/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java b/core/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java
rename to core/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java
diff --git a/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java b/core/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java
rename to core/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java
diff --git a/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java b/core/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java b/core/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/PlainTransportFuture.java
rename to core/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java
diff --git a/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java b/core/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/RemoteTransportException.java b/core/src/main/java/org/elasticsearch/transport/RemoteTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/RemoteTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/RemoteTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java b/core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java
rename to core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java
diff --git a/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java b/core/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java b/core/src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/ResponseHandlerNotFoundTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java b/core/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/SendRequestTransportException.java
rename to core/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/Transport.java b/core/src/main/java/org/elasticsearch/transport/Transport.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/Transport.java
rename to core/src/main/java/org/elasticsearch/transport/Transport.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportChannel.java b/core/src/main/java/org/elasticsearch/transport/TransportChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportChannel.java
rename to core/src/main/java/org/elasticsearch/transport/TransportChannel.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java b/core/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportConnectionListener.java
rename to core/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportException.java b/core/src/main/java/org/elasticsearch/transport/TransportException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportException.java
rename to core/src/main/java/org/elasticsearch/transport/TransportException.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportFuture.java b/core/src/main/java/org/elasticsearch/transport/TransportFuture.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportFuture.java
rename to core/src/main/java/org/elasticsearch/transport/TransportFuture.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportInfo.java b/core/src/main/java/org/elasticsearch/transport/TransportInfo.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportInfo.java
rename to core/src/main/java/org/elasticsearch/transport/TransportInfo.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportMessage.java b/core/src/main/java/org/elasticsearch/transport/TransportMessage.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportMessage.java
rename to core/src/main/java/org/elasticsearch/transport/TransportMessage.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportModule.java b/core/src/main/java/org/elasticsearch/transport/TransportModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportModule.java
rename to core/src/main/java/org/elasticsearch/transport/TransportModule.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportRequest.java b/core/src/main/java/org/elasticsearch/transport/TransportRequest.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportRequest.java
rename to core/src/main/java/org/elasticsearch/transport/TransportRequest.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java b/core/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportRequestHandler.java
rename to core/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java b/core/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportRequestOptions.java
rename to core/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportResponse.java b/core/src/main/java/org/elasticsearch/transport/TransportResponse.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportResponse.java
rename to core/src/main/java/org/elasticsearch/transport/TransportResponse.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java b/core/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportResponseHandler.java
rename to core/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java b/core/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportResponseOptions.java
rename to core/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportSerializationException.java b/core/src/main/java/org/elasticsearch/transport/TransportSerializationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportSerializationException.java
rename to core/src/main/java/org/elasticsearch/transport/TransportSerializationException.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/core/src/main/java/org/elasticsearch/transport/TransportService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportService.java
rename to core/src/main/java/org/elasticsearch/transport/TransportService.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java b/core/src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java
rename to core/src/main/java/org/elasticsearch/transport/TransportServiceAdapter.java
diff --git a/src/main/java/org/elasticsearch/transport/TransportStats.java b/core/src/main/java/org/elasticsearch/transport/TransportStats.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/TransportStats.java
rename to core/src/main/java/org/elasticsearch/transport/TransportStats.java
diff --git a/src/main/java/org/elasticsearch/transport/Transports.java b/core/src/main/java/org/elasticsearch/transport/Transports.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/Transports.java
rename to core/src/main/java/org/elasticsearch/transport/Transports.java
diff --git a/src/main/java/org/elasticsearch/transport/local/LocalTransport.java b/core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/local/LocalTransport.java
rename to core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java
diff --git a/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java b/core/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java
rename to core/src/main/java/org/elasticsearch/transport/local/LocalTransportChannel.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java b/core/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java
rename to core/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInput.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInputFactory.java b/core/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInputFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInputFactory.java
rename to core/src/main/java/org/elasticsearch/transport/netty/ChannelBufferStreamInputFactory.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java b/core/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
rename to core/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyHeader.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyHeader.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/NettyHeader.java
rename to core/src/main/java/org/elasticsearch/transport/netty/NettyHeader.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java
rename to core/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLogger.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java
rename to core/src/main/java/org/elasticsearch/transport/netty/NettyInternalESLoggerFactory.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
rename to core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java
rename to core/src/main/java/org/elasticsearch/transport/netty/NettyTransportChannel.java
diff --git a/src/main/java/org/elasticsearch/transport/netty/SizeHeaderFrameDecoder.java b/core/src/main/java/org/elasticsearch/transport/netty/SizeHeaderFrameDecoder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/netty/SizeHeaderFrameDecoder.java
rename to core/src/main/java/org/elasticsearch/transport/netty/SizeHeaderFrameDecoder.java
diff --git a/src/main/java/org/elasticsearch/transport/support/TransportStatus.java b/core/src/main/java/org/elasticsearch/transport/support/TransportStatus.java
similarity index 100%
rename from src/main/java/org/elasticsearch/transport/support/TransportStatus.java
rename to core/src/main/java/org/elasticsearch/transport/support/TransportStatus.java
diff --git a/src/main/java/org/elasticsearch/tribe/TribeModule.java b/core/src/main/java/org/elasticsearch/tribe/TribeModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/tribe/TribeModule.java
rename to core/src/main/java/org/elasticsearch/tribe/TribeModule.java
diff --git a/src/main/java/org/elasticsearch/tribe/TribeService.java b/core/src/main/java/org/elasticsearch/tribe/TribeService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/tribe/TribeService.java
rename to core/src/main/java/org/elasticsearch/tribe/TribeService.java
diff --git a/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java b/core/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java
rename to core/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java
diff --git a/src/main/java/org/elasticsearch/watcher/FileChangesListener.java b/core/src/main/java/org/elasticsearch/watcher/FileChangesListener.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/FileChangesListener.java
rename to core/src/main/java/org/elasticsearch/watcher/FileChangesListener.java
diff --git a/src/main/java/org/elasticsearch/watcher/FileWatcher.java b/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/FileWatcher.java
rename to core/src/main/java/org/elasticsearch/watcher/FileWatcher.java
diff --git a/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java b/core/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/ResourceWatcher.java
rename to core/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java
diff --git a/src/main/java/org/elasticsearch/watcher/ResourceWatcherModule.java b/core/src/main/java/org/elasticsearch/watcher/ResourceWatcherModule.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/ResourceWatcherModule.java
rename to core/src/main/java/org/elasticsearch/watcher/ResourceWatcherModule.java
diff --git a/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/core/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java
rename to core/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java
diff --git a/src/main/java/org/elasticsearch/watcher/WatcherHandle.java b/core/src/main/java/org/elasticsearch/watcher/WatcherHandle.java
similarity index 100%
rename from src/main/java/org/elasticsearch/watcher/WatcherHandle.java
rename to core/src/main/java/org/elasticsearch/watcher/WatcherHandle.java
diff --git a/src/main/java/org/joda/time/base/BaseDateTime.java b/core/src/main/java/org/joda/time/base/BaseDateTime.java
similarity index 100%
rename from src/main/java/org/joda/time/base/BaseDateTime.java
rename to core/src/main/java/org/joda/time/base/BaseDateTime.java
diff --git a/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec b/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
similarity index 100%
rename from src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
rename to core/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
diff --git a/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat b/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
similarity index 100%
rename from src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
rename to core/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
diff --git a/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
similarity index 100%
rename from src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
rename to core/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
diff --git a/src/main/resources/config/names.txt b/core/src/main/resources/config/names.txt
similarity index 100%
rename from src/main/resources/config/names.txt
rename to core/src/main/resources/config/names.txt
diff --git a/src/main/resources/es-build.properties b/core/src/main/resources/es-build.properties
similarity index 100%
rename from src/main/resources/es-build.properties
rename to core/src/main/resources/es-build.properties
diff --git a/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
similarity index 100%
rename from src/main/resources/org/elasticsearch/bootstrap/security.policy
rename to core/src/main/resources/org/elasticsearch/bootstrap/security.policy
diff --git a/src/packaging/common/env/elasticsearch b/core/src/packaging/common/env/elasticsearch
similarity index 100%
rename from src/packaging/common/env/elasticsearch
rename to core/src/packaging/common/env/elasticsearch
diff --git a/src/packaging/common/packaging.properties b/core/src/packaging/common/packaging.properties
similarity index 100%
rename from src/packaging/common/packaging.properties
rename to core/src/packaging/common/packaging.properties
diff --git a/src/packaging/common/scripts/postinst b/core/src/packaging/common/scripts/postinst
similarity index 100%
rename from src/packaging/common/scripts/postinst
rename to core/src/packaging/common/scripts/postinst
diff --git a/src/packaging/common/scripts/postrm b/core/src/packaging/common/scripts/postrm
similarity index 100%
rename from src/packaging/common/scripts/postrm
rename to core/src/packaging/common/scripts/postrm
diff --git a/src/packaging/common/scripts/preinst b/core/src/packaging/common/scripts/preinst
similarity index 100%
rename from src/packaging/common/scripts/preinst
rename to core/src/packaging/common/scripts/preinst
diff --git a/src/packaging/common/scripts/prerm b/core/src/packaging/common/scripts/prerm
similarity index 100%
rename from src/packaging/common/scripts/prerm
rename to core/src/packaging/common/scripts/prerm
diff --git a/src/packaging/common/systemd/elasticsearch.conf b/core/src/packaging/common/systemd/elasticsearch.conf
similarity index 100%
rename from src/packaging/common/systemd/elasticsearch.conf
rename to core/src/packaging/common/systemd/elasticsearch.conf
diff --git a/src/packaging/common/systemd/elasticsearch.service b/core/src/packaging/common/systemd/elasticsearch.service
similarity index 100%
rename from src/packaging/common/systemd/elasticsearch.service
rename to core/src/packaging/common/systemd/elasticsearch.service
diff --git a/src/packaging/common/systemd/sysctl/elasticsearch.conf b/core/src/packaging/common/systemd/sysctl/elasticsearch.conf
similarity index 100%
rename from src/packaging/common/systemd/sysctl/elasticsearch.conf
rename to core/src/packaging/common/systemd/sysctl/elasticsearch.conf
diff --git a/src/packaging/deb/copyright b/core/src/packaging/deb/copyright
similarity index 100%
rename from src/packaging/deb/copyright
rename to core/src/packaging/deb/copyright
diff --git a/src/packaging/deb/init.d/elasticsearch b/core/src/packaging/deb/init.d/elasticsearch
similarity index 100%
rename from src/packaging/deb/init.d/elasticsearch
rename to core/src/packaging/deb/init.d/elasticsearch
diff --git a/src/packaging/deb/lintian/elasticsearch b/core/src/packaging/deb/lintian/elasticsearch
similarity index 100%
rename from src/packaging/deb/lintian/elasticsearch
rename to core/src/packaging/deb/lintian/elasticsearch
diff --git a/src/packaging/deb/packaging.properties b/core/src/packaging/deb/packaging.properties
similarity index 100%
rename from src/packaging/deb/packaging.properties
rename to core/src/packaging/deb/packaging.properties
diff --git a/src/packaging/deb/scripts/conffiles b/core/src/packaging/deb/scripts/conffiles
similarity index 100%
rename from src/packaging/deb/scripts/conffiles
rename to core/src/packaging/deb/scripts/conffiles
diff --git a/src/packaging/deb/scripts/control b/core/src/packaging/deb/scripts/control
similarity index 100%
rename from src/packaging/deb/scripts/control
rename to core/src/packaging/deb/scripts/control
diff --git a/src/packaging/rpm/init.d/elasticsearch b/core/src/packaging/rpm/init.d/elasticsearch
similarity index 100%
rename from src/packaging/rpm/init.d/elasticsearch
rename to core/src/packaging/rpm/init.d/elasticsearch
diff --git a/src/packaging/rpm/packaging.properties b/core/src/packaging/rpm/packaging.properties
similarity index 100%
rename from src/packaging/rpm/packaging.properties
rename to core/src/packaging/rpm/packaging.properties
diff --git a/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java
similarity index 100%
rename from src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java
rename to core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java
diff --git a/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java b/core/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java
similarity index 100%
rename from src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java
rename to core/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java
diff --git a/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java b/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java
similarity index 100%
rename from src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java
rename to core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java
diff --git a/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java
similarity index 100%
rename from src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java
rename to core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java
diff --git a/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java
similarity index 100%
rename from src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java
rename to core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java
diff --git a/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java
similarity index 100%
rename from src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java
rename to core/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java
diff --git a/src/test/java/org/apache/lucene/util/SloppyMathTests.java b/core/src/test/java/org/apache/lucene/util/SloppyMathTests.java
similarity index 100%
rename from src/test/java/org/apache/lucene/util/SloppyMathTests.java
rename to core/src/test/java/org/apache/lucene/util/SloppyMathTests.java
diff --git a/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java b/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java
rename to core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java
diff --git a/src/test/java/org/elasticsearch/NamingConventionTests.java b/core/src/test/java/org/elasticsearch/NamingConventionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/NamingConventionTests.java
rename to core/src/test/java/org/elasticsearch/NamingConventionTests.java
diff --git a/src/test/java/org/elasticsearch/VersionTests.java b/core/src/test/java/org/elasticsearch/VersionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/VersionTests.java
rename to core/src/test/java/org/elasticsearch/VersionTests.java
diff --git a/src/test/java/org/elasticsearch/action/IndicesRequestTests.java b/core/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/IndicesRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/ListenerActionTests.java b/core/src/test/java/org/elasticsearch/action/ListenerActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/ListenerActionTests.java
rename to core/src/test/java/org/elasticsearch/action/ListenerActionTests.java
diff --git a/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java b/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/OriginalIndicesTests.java
rename to core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java
diff --git a/src/test/java/org/elasticsearch/action/RejectionActionTests.java b/core/src/test/java/org/elasticsearch/action/RejectionActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/RejectionActionTests.java
rename to core/src/test/java/org/elasticsearch/action/RejectionActionTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java b/core/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
rename to core/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
diff --git a/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java
rename to core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java
diff --git a/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsTests.java
rename to core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsTests.java
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java
rename to core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/bulk/bulk-log.json b/core/src/test/java/org/elasticsearch/action/bulk/bulk-log.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/bulk-log.json
rename to core/src/test/java/org/elasticsearch/action/bulk/bulk-log.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json b/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json
rename to core/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json
diff --git a/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java b/core/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java
rename to core/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java
diff --git a/src/test/java/org/elasticsearch/action/count/CountRequestTests.java b/core/src/test/java/org/elasticsearch/action/count/CountRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/count/CountRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/count/CountRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/count/CountResponseTests.java b/core/src/test/java/org/elasticsearch/action/count/CountResponseTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/count/CountResponseTests.java
rename to core/src/test/java/org/elasticsearch/action/count/CountResponseTests.java
diff --git a/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java b/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java
rename to core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/index/IndexRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java b/core/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java b/core/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json b/core/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/percolate/mpercolate1.json
rename to core/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json
diff --git a/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json b/core/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/percolate/mpercolate2.json
rename to core/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json
diff --git a/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java b/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java
diff --git a/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java b/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java
rename to core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java
diff --git a/src/test/java/org/elasticsearch/action/search/simple-msearch1.json b/core/src/test/java/org/elasticsearch/action/search/simple-msearch1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/search/simple-msearch1.json
rename to core/src/test/java/org/elasticsearch/action/search/simple-msearch1.json
diff --git a/src/test/java/org/elasticsearch/action/search/simple-msearch2.json b/core/src/test/java/org/elasticsearch/action/search/simple-msearch2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/search/simple-msearch2.json
rename to core/src/test/java/org/elasticsearch/action/search/simple-msearch2.json
diff --git a/src/test/java/org/elasticsearch/action/search/simple-msearch3.json b/core/src/test/java/org/elasticsearch/action/search/simple-msearch3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/search/simple-msearch3.json
rename to core/src/test/java/org/elasticsearch/action/search/simple-msearch3.json
diff --git a/src/test/java/org/elasticsearch/action/search/simple-msearch4.json b/core/src/test/java/org/elasticsearch/action/search/simple-msearch4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/search/simple-msearch4.json
rename to core/src/test/java/org/elasticsearch/action/search/simple-msearch4.json
diff --git a/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java b/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java
rename to core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java
diff --git a/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java b/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java
rename to core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java
diff --git a/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java
rename to core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java
diff --git a/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java b/core/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java
rename to core/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java
diff --git a/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java
rename to core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java
diff --git a/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java
rename to core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java
diff --git a/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java
rename to core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java
diff --git a/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java
rename to core/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsTests.java
diff --git a/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java
rename to core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java
diff --git a/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json b/core/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json
rename to core/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json
diff --git a/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json b/core/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json
rename to core/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json
diff --git a/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
rename to core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
diff --git a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java b/core/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
rename to core/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
diff --git a/src/test/java/org/elasticsearch/benchmark/aliases/AliasesBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/aliases/AliasesBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/aliases/AliasesBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/aliases/AliasesBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/bloom/BloomBench.java b/core/src/test/java/org/elasticsearch/benchmark/bloom/BloomBench.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/bloom/BloomBench.java
rename to core/src/test/java/org/elasticsearch/benchmark/bloom/BloomBench.java
diff --git a/src/test/java/org/elasticsearch/benchmark/breaker/CircuitBreakerBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/breaker/CircuitBreakerBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/breaker/CircuitBreakerBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/breaker/CircuitBreakerBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/checksum/ChecksumBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/common/lucene/uidscan/LuceneUidScanBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/common/recycler/RecyclerBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/common/recycler/RecyclerBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/common/recycler/RecyclerBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/common/recycler/RecyclerBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/counter/SimpleCounterBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/fs/FsAppendBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/get/SimpleGetActionBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/hppc/StringMapAdjustOrPutBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/hppc/StringMapAdjustOrPutBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/hppc/StringMapAdjustOrPutBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/hppc/StringMapAdjustOrPutBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/percolator/PercolatorStressBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/percolator/PercolatorStressBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/percolator/PercolatorStressBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/percolator/PercolatorStressBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript1.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript1.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript1.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript1.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript2.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript2.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript2.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript2.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript3.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript3.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript3.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript3.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript4.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript4.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript4.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScript4.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScriptPlugin.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScriptPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScriptPlugin.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/expression/NativeScriptPlugin.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsConstantScoreBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsConstantScoreBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsConstantScoreBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsConstantScoreBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScoreBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScoreBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScoreBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScoreBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScorePayloadSumBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScorePayloadSumBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScorePayloadSumBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/ScriptsScorePayloadSumBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/plugin/NativeScriptExamplesPlugin.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/plugin/NativeScriptExamplesPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/plugin/NativeScriptExamplesPlugin.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/plugin/NativeScriptExamplesPlugin.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantForLoopScoreScript.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantForLoopScoreScript.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantForLoopScoreScript.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantForLoopScoreScript.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantScoreScript.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantScoreScript.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantScoreScript.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeConstantScoreScript.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeNaiveTFIDFScoreScript.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeNaiveTFIDFScoreScript.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeNaiveTFIDFScoreScript.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativeNaiveTFIDFScoreScript.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumNoRecordScoreScript.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumNoRecordScoreScript.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumNoRecordScoreScript.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumNoRecordScoreScript.java
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumScoreScript.java b/core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumScoreScript.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumScoreScript.java
rename to core/src/test/java/org/elasticsearch/benchmark/scripts/score/script/NativePayloadSumScoreScript.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/SuggestSearchBenchMark.java b/core/src/test/java/org/elasticsearch/benchmark/search/SuggestSearchBenchMark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/SuggestSearchBenchMark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/SuggestSearchBenchMark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/CardinalityAggregationSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/CardinalityAggregationSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/CardinalityAggregationSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/CardinalityAggregationSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/HistogramAggregationSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/IncludeExcludeAggregationSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/IncludeExcludeAggregationSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/IncludeExcludeAggregationSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/IncludeExcludeAggregationSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/PercentilesAggregationSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/PercentilesAggregationSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/PercentilesAggregationSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/PercentilesAggregationSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/QueryFilterAggregationSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/QueryFilterAggregationSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/QueryFilterAggregationSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/QueryFilterAggregationSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchAndIndexingBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ParentChildIndexGenerator.java b/core/src/test/java/org/elasticsearch/benchmark/search/child/ParentChildIndexGenerator.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/child/ParentChildIndexGenerator.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/child/ParentChildIndexGenerator.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java b/core/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/nested/NestedSearchBenchMark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/search/scroll/ScrollSearchBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/search/scroll/ScrollSearchBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/search/scroll/ScrollSearchBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/search/scroll/ScrollSearchBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java b/core/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java
rename to core/src/test/java/org/elasticsearch/benchmark/stress/NodesStressTest.java
diff --git a/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java b/core/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java
rename to core/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java
diff --git a/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java b/core/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java
rename to core/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadIndexingStress.java
diff --git a/src/test/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/time/SimpleTimeBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageRequest.java b/core/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageRequest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageRequest.java
rename to core/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageRequest.java
diff --git a/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageResponse.java b/core/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageResponse.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageResponse.java
rename to core/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkMessageResponse.java
diff --git a/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java b/core/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java
rename to core/src/test/java/org/elasticsearch/benchmark/transport/BenchmarkNettyLargeMessages.java
diff --git a/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/transport/TransportBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/transport/netty/NettyEchoBenchmark.java
diff --git a/src/test/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java
rename to core/src/test/java/org/elasticsearch/benchmark/uuid/SimpleUuidBenchmark.java
diff --git a/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java b/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java
rename to core/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java b/core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
rename to core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
diff --git a/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java b/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java
rename to core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java
diff --git a/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java b/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bootstrap/SecurityTests.java
rename to core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java
diff --git a/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java b/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
rename to core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityTests.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java
rename to core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityTest.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java b/core/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java b/core/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesTests.java b/core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatTests.java b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatTests.java
rename to core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatTests.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityTest.java b/core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityTest.java
rename to core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityTest.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityTest.java b/core/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityTest.java
rename to core/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityTest.java
diff --git a/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityTest.java b/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityTest.java
rename to core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityTest.java
diff --git a/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java b/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java
rename to core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java
diff --git a/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java b/core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java
rename to core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java
diff --git a/src/test/java/org/elasticsearch/client/node/NodeClientTests.java b/core/src/test/java/org/elasticsearch/client/node/NodeClientTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/node/NodeClientTests.java
rename to core/src/test/java/org/elasticsearch/client/node/NodeClientTests.java
diff --git a/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java b/core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java
rename to core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java
diff --git a/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java
rename to core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java
diff --git a/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java
rename to core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java
diff --git a/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
rename to core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
diff --git a/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
rename to core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ClusterInfoServiceTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ClusterStateDiffTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ClusterStateDiffTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
rename to core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
rename to core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java b/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
rename to core/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java
rename to core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java
rename to core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java
rename to core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java b/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsTests.java b/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/ack/AckTests.java b/core/src/test/java/org/elasticsearch/cluster/ack/AckTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/ack/AckTests.java
rename to core/src/test/java/org/elasticsearch/cluster/ack/AckTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
rename to core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
rename to core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java
rename to core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
rename to core/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java
rename to core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java
rename to core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java
rename to core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java
rename to core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestBase.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestBase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestBase.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestBase.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIntegrationTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java
rename to core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java
rename to core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java b/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java
rename to core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java b/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java
rename to core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java b/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java
rename to core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringTests.java b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringTests.java
rename to core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java
rename to core/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java b/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java
rename to core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java
diff --git a/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java
rename to core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java
diff --git a/src/test/java/org/elasticsearch/codecs/CodecTests.java b/core/src/test/java/org/elasticsearch/codecs/CodecTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/codecs/CodecTests.java
rename to core/src/test/java/org/elasticsearch/codecs/CodecTests.java
diff --git a/src/test/java/org/elasticsearch/common/Base64Test.java b/core/src/test/java/org/elasticsearch/common/Base64Test.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/Base64Test.java
rename to core/src/test/java/org/elasticsearch/common/Base64Test.java
diff --git a/src/test/java/org/elasticsearch/common/BooleansTests.java b/core/src/test/java/org/elasticsearch/common/BooleansTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/BooleansTests.java
rename to core/src/test/java/org/elasticsearch/common/BooleansTests.java
diff --git a/src/test/java/org/elasticsearch/common/ChannelsTests.java b/core/src/test/java/org/elasticsearch/common/ChannelsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/ChannelsTests.java
rename to core/src/test/java/org/elasticsearch/common/ChannelsTests.java
diff --git a/src/test/java/org/elasticsearch/common/ParseFieldTests.java b/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/ParseFieldTests.java
rename to core/src/test/java/org/elasticsearch/common/ParseFieldTests.java
diff --git a/src/test/java/org/elasticsearch/common/PidFileTests.java b/core/src/test/java/org/elasticsearch/common/PidFileTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/PidFileTests.java
rename to core/src/test/java/org/elasticsearch/common/PidFileTests.java
diff --git a/src/test/java/org/elasticsearch/common/StringsTests.java b/core/src/test/java/org/elasticsearch/common/StringsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/StringsTests.java
rename to core/src/test/java/org/elasticsearch/common/StringsTests.java
diff --git a/src/test/java/org/elasticsearch/common/TableTests.java b/core/src/test/java/org/elasticsearch/common/TableTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/TableTests.java
rename to core/src/test/java/org/elasticsearch/common/TableTests.java
diff --git a/src/test/java/org/elasticsearch/common/UUIDTests.java b/core/src/test/java/org/elasticsearch/common/UUIDTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/UUIDTests.java
rename to core/src/test/java/org/elasticsearch/common/UUIDTests.java
diff --git a/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java b/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java
rename to core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java
diff --git a/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java b/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java
rename to core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java
diff --git a/src/test/java/org/elasticsearch/common/bytes/ByteBufferBytesReference.java b/core/src/test/java/org/elasticsearch/common/bytes/ByteBufferBytesReference.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/bytes/ByteBufferBytesReference.java
rename to core/src/test/java/org/elasticsearch/common/bytes/ByteBufferBytesReference.java
diff --git a/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java b/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java
rename to core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java
diff --git a/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java
rename to core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java
diff --git a/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java b/core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java
rename to core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java
diff --git a/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java b/core/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java
rename to core/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java
diff --git a/src/test/java/org/elasticsearch/common/cli/CliToolTests.java b/core/src/test/java/org/elasticsearch/common/cli/CliToolTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/cli/CliToolTests.java
rename to core/src/test/java/org/elasticsearch/common/cli/CliToolTests.java
diff --git a/src/test/java/org/elasticsearch/common/cli/TerminalTests.java b/core/src/test/java/org/elasticsearch/common/cli/TerminalTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/cli/TerminalTests.java
rename to core/src/test/java/org/elasticsearch/common/cli/TerminalTests.java
diff --git a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java b/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java
rename to core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java
diff --git a/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java b/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java
rename to core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java b/core/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java b/core/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java
rename to core/src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
rename to core/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java
rename to core/src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java
rename to core/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java
diff --git a/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java b/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/geo/GeoHashTests.java
rename to core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java
diff --git a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java b/core/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java
rename to core/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java
diff --git a/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
rename to core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
diff --git a/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java b/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java
rename to core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java
diff --git a/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java b/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java
rename to core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java
diff --git a/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java b/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java
rename to core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/io/StreamsTests.java
rename to core/src/test/java/org/elasticsearch/common/io/StreamsTests.java
diff --git a/src/test/java/org/elasticsearch/common/io/rootdir.properties b/core/src/test/java/org/elasticsearch/common/io/rootdir.properties
similarity index 100%
rename from src/test/java/org/elasticsearch/common/io/rootdir.properties
rename to core/src/test/java/org/elasticsearch/common/io/rootdir.properties
diff --git a/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java
rename to core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java
diff --git a/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java b/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
rename to core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
diff --git a/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java b/core/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java
rename to core/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java
diff --git a/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java b/core/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java
rename to core/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java
diff --git a/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java b/core/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java
rename to core/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java b/core/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/LuceneTest.java
rename to core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java b/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java b/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReaderTests.java b/core/src/test/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReaderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReaderTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReaderTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java b/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java b/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java
diff --git a/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java b/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java
rename to core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java
diff --git a/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java b/core/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/math/MathUtilsTests.java
rename to core/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/common/path/PathTrieTests.java b/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/path/PathTrieTests.java
rename to core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java
diff --git a/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java b/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java
rename to core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java
diff --git a/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java b/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java
rename to core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java
diff --git a/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java b/core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java
rename to core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java
diff --git a/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java b/core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java
rename to core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java
diff --git a/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java b/core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java
rename to core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java
diff --git a/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java b/core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java
rename to core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java
diff --git a/src/test/java/org/elasticsearch/common/regex/RegexTests.java b/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/regex/RegexTests.java
rename to core/src/test/java/org/elasticsearch/common/regex/RegexTests.java
diff --git a/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java b/core/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/rounding/RoundingTests.java
rename to core/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java
diff --git a/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java b/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java
rename to core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java
diff --git a/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java b/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java
rename to core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java
diff --git a/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/SettingsTests.java
rename to core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
diff --git a/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java b/core/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java
rename to core/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java
diff --git a/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java b/core/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java
rename to core/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java
diff --git a/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java b/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java
rename to core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java
diff --git a/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java b/core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java
rename to core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java
diff --git a/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json b/core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/loader/test-settings.json
rename to core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json
diff --git a/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml b/core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml
similarity index 100%
rename from src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml
rename to core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml
diff --git a/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java b/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java
diff --git a/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java
diff --git a/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java b/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java
diff --git a/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java b/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java
diff --git a/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/RatioValueTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java
diff --git a/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/SizeValueTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java
diff --git a/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/unit/TimeValueTests.java
rename to core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java b/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java
rename to core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/BigArraysTests.java b/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/BigArraysTests.java
rename to core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java b/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java
rename to core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java b/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java
rename to core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java b/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java
rename to core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java
diff --git a/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java b/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java
rename to core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/LongHashTests.java b/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/LongHashTests.java
rename to core/src/test/java/org/elasticsearch/common/util/LongHashTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java b/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java
rename to core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
rename to core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java b/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java
rename to core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java
rename to core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java
diff --git a/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java
rename to core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java
rename to core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java
diff --git a/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java
rename to core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java
rename to core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java
diff --git a/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java b/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java
rename to core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java
diff --git a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java b/core/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
rename to core/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
diff --git a/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java b/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java
rename to core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java
diff --git a/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
rename to core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
diff --git a/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java b/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java
rename to core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java
diff --git a/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java
rename to core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java b/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java
rename to core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
rename to core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java
rename to core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryTests.java b/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryTests.java
rename to core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java b/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java
rename to core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java
diff --git a/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryTests.java
rename to core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java
rename to core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java
diff --git a/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java
rename to core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java
rename to core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java
diff --git a/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java
rename to core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java
diff --git a/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java b/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java
rename to core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java
diff --git a/src/test/java/org/elasticsearch/document/BulkTests.java b/core/src/test/java/org/elasticsearch/document/BulkTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/document/BulkTests.java
rename to core/src/test/java/org/elasticsearch/document/BulkTests.java
diff --git a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java b/core/src/test/java/org/elasticsearch/document/DocumentActionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/document/DocumentActionsTests.java
rename to core/src/test/java/org/elasticsearch/document/DocumentActionsTests.java
diff --git a/src/test/java/org/elasticsearch/document/ShardInfoTests.java b/core/src/test/java/org/elasticsearch/document/ShardInfoTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/document/ShardInfoTests.java
rename to core/src/test/java/org/elasticsearch/document/ShardInfoTests.java
diff --git a/src/test/java/org/elasticsearch/env/EnvironmentTests.java b/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/env/EnvironmentTests.java
rename to core/src/test/java/org/elasticsearch/env/EnvironmentTests.java
diff --git a/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
rename to core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
diff --git a/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java b/core/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/exists/SimpleExistsTests.java
rename to core/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java
diff --git a/src/test/java/org/elasticsearch/explain/ExplainActionTests.java b/core/src/test/java/org/elasticsearch/explain/ExplainActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/explain/ExplainActionTests.java
rename to core/src/test/java/org/elasticsearch/explain/ExplainActionTests.java
diff --git a/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java
rename to core/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java
rename to core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java b/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java
rename to core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java
rename to core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java
rename to core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java
rename to core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java
rename to core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java
diff --git a/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesTests.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesTests.java
rename to core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java b/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java
rename to core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java b/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java
rename to core/src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesTests.java b/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/RecoverAfterNodesTests.java
rename to core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java b/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
rename to core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
diff --git a/src/test/java/org/elasticsearch/get/GetActionTests.java b/core/src/test/java/org/elasticsearch/get/GetActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/get/GetActionTests.java
rename to core/src/test/java/org/elasticsearch/get/GetActionTests.java
diff --git a/src/test/java/org/elasticsearch/http/netty/HttpPublishPortTests.java b/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/http/netty/HttpPublishPortTests.java
rename to core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortTests.java
diff --git a/src/test/java/org/elasticsearch/http/netty/NettyHttpClient.java b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpClient.java
similarity index 100%
rename from src/test/java/org/elasticsearch/http/netty/NettyHttpClient.java
rename to core/src/test/java/org/elasticsearch/http/netty/NettyHttpClient.java
diff --git a/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java
rename to core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java
diff --git a/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIntegrationTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIntegrationTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java b/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java
rename to core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java
diff --git a/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java b/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java
rename to core/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java
diff --git a/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java b/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java
rename to core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java
diff --git a/src/test/java/org/elasticsearch/index/TransportIndexFailuresTest.java b/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/TransportIndexFailuresTest.java
rename to core/src/test/java/org/elasticsearch/index/TransportIndexFailuresTest.java
diff --git a/src/test/java/org/elasticsearch/index/VersionTypeTests.java b/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/VersionTypeTests.java
rename to core/src/test/java/org/elasticsearch/index/VersionTypeTests.java
diff --git a/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java b/core/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java
rename to core/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java
rename to core/src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java b/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java b/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json b/core/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json
rename to core/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java
rename to core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt b/core/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt
rename to core/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt
diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json b/core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json
rename to core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json b/core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json
rename to core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java b/core/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java
rename to core/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json b/core/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/keep_analysis.json
rename to core/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json b/core/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/pattern_capture.json
rename to core/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json b/core/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json
rename to core/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/stop.json b/core/src/test/java/org/elasticsearch/index/analysis/stop.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/stop.json
rename to core/src/test/java/org/elasticsearch/index/analysis/stop.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java
rename to core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java
diff --git a/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json
rename to core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt
rename to core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt
diff --git a/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt
rename to core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt
diff --git a/src/test/java/org/elasticsearch/index/analysis/test1.json b/core/src/test/java/org/elasticsearch/index/analysis/test1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/test1.json
rename to core/src/test/java/org/elasticsearch/index/analysis/test1.json
diff --git a/src/test/java/org/elasticsearch/index/analysis/test1.yml b/core/src/test/java/org/elasticsearch/index/analysis/test1.yml
similarity index 100%
rename from src/test/java/org/elasticsearch/index/analysis/test1.yml
rename to core/src/test/java/org/elasticsearch/index/analysis/test1.yml
diff --git a/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java b/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java
rename to core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java
diff --git a/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/codec/CodecTests.java
rename to core/src/test/java/org/elasticsearch/index/codec/CodecTests.java
diff --git a/src/test/java/org/elasticsearch/index/codec/postingformat/Elasticsearch090RWPostingsFormat.java b/core/src/test/java/org/elasticsearch/index/codec/postingformat/Elasticsearch090RWPostingsFormat.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/codec/postingformat/Elasticsearch090RWPostingsFormat.java
rename to core/src/test/java/org/elasticsearch/index/codec/postingformat/Elasticsearch090RWPostingsFormat.java
diff --git a/src/test/java/org/elasticsearch/index/codec/postingformat/ElasticsearchPostingsFormatTest.java b/core/src/test/java/org/elasticsearch/index/codec/postingformat/ElasticsearchPostingsFormatTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/codec/postingformat/ElasticsearchPostingsFormatTest.java
rename to core/src/test/java/org/elasticsearch/index/codec/postingformat/ElasticsearchPostingsFormatTest.java
diff --git a/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java b/core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java
rename to core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java
diff --git a/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java b/core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java
rename to core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java
diff --git a/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java b/core/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java
rename to core/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java
diff --git a/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java b/core/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java
rename to core/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java
diff --git a/src/test/java/org/elasticsearch/index/engine/InternalEngineIntegrationTest.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/InternalEngineIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/index/engine/InternalEngineIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/InternalEngineMergeTests.java
rename to core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeTests.java
diff --git a/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java
rename to core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java
diff --git a/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
rename to core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
diff --git a/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java
rename to core/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/DuelFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/DuelFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/DuelFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/DuelFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java b/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java
diff --git a/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java
rename to core/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java
diff --git a/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java b/core/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java
rename to core/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java b/core/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIntegrationTest.java b/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/UidTests.java b/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/UidTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/UidTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json b/core/src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json b/core/src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json b/core/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json b/core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json b/core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json b/core/src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json b/core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json b/core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/test1.json b/core/src/test/java/org/elasticsearch/index/mapper/all/test1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/test1.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/test1.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java b/core/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java b/core/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java b/core/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalIndexModule.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalIndexModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalIndexModule.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalIndexModule.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapperPlugin.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapperPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapperPlugin.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapperPlugin.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalRootMapper.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalRootMapper.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalRootMapper.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalRootMapper.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/RegisterExternalTypes.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/RegisterExternalTypes.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/RegisterExternalTypes.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/RegisterExternalTypes.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeoMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/geo/GeoMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/geo/GeoMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java b/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java
rename to core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java b/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java
rename to core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json b/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json
rename to core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java b/core/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java b/core/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json b/core/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json
rename to core/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json b/core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json
rename to core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json b/core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json
rename to core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json b/core/src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json
rename to core/src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/test1.json b/core/src/test/java/org/elasticsearch/index/mapper/simple/test1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/simple/test1.json
rename to core/src/test/java/org/elasticsearch/index/mapper/simple/test1.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java b/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java b/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
rename to core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json b/core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json
rename to core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json b/core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json
rename to core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json b/core/src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json
rename to core/src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json
diff --git a/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java b/core/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java
rename to core/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java
diff --git a/src/test/java/org/elasticsearch/index/merge/policy/VersionFieldUpgraderTest.java b/core/src/test/java/org/elasticsearch/index/merge/policy/VersionFieldUpgraderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/merge/policy/VersionFieldUpgraderTest.java
rename to core/src/test/java/org/elasticsearch/index/merge/policy/VersionFieldUpgraderTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java
rename to core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java b/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java
rename to core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java b/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java
rename to core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
rename to core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java
rename to core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java
rename to core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
rename to core/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/TestQueryParsingException.java b/core/src/test/java/org/elasticsearch/index/query/TestQueryParsingException.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/TestQueryParsingException.java
rename to core/src/test/java/org/elasticsearch/index/query/TestQueryParsingException.java
diff --git a/src/test/java/org/elasticsearch/index/query/and-filter-cache.json b/core/src/test/java/org/elasticsearch/index/query/and-filter-cache.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/and-filter-cache.json
rename to core/src/test/java/org/elasticsearch/index/query/and-filter-cache.json
diff --git a/src/test/java/org/elasticsearch/index/query/and-filter-named.json b/core/src/test/java/org/elasticsearch/index/query/and-filter-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/and-filter-named.json
rename to core/src/test/java/org/elasticsearch/index/query/and-filter-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/and-filter.json b/core/src/test/java/org/elasticsearch/index/query/and-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/and-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/and-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/and-filter2.json b/core/src/test/java/org/elasticsearch/index/query/and-filter2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/and-filter2.json
rename to core/src/test/java/org/elasticsearch/index/query/and-filter2.json
diff --git a/src/test/java/org/elasticsearch/index/query/bool-filter.json b/core/src/test/java/org/elasticsearch/index/query/bool-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/bool-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/bool-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json b/core/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
rename to core/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
diff --git a/src/test/java/org/elasticsearch/index/query/bool.json b/core/src/test/java/org/elasticsearch/index/query/bool.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/bool.json
rename to core/src/test/java/org/elasticsearch/index/query/bool.json
diff --git a/src/test/java/org/elasticsearch/index/query/boosting-query.json b/core/src/test/java/org/elasticsearch/index/query/boosting-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/boosting-query.json
rename to core/src/test/java/org/elasticsearch/index/query/boosting-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/child-mapping.json b/core/src/test/java/org/elasticsearch/index/query/child-mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/child-mapping.json
rename to core/src/test/java/org/elasticsearch/index/query/child-mapping.json
diff --git a/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json b/core/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/commonTerms-query1.json
rename to core/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json
diff --git a/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json b/core/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/commonTerms-query2.json
rename to core/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json
diff --git a/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json b/core/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/commonTerms-query3.json
rename to core/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json
diff --git a/src/test/java/org/elasticsearch/index/query/constantScore-query.json b/core/src/test/java/org/elasticsearch/index/query/constantScore-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/constantScore-query.json
rename to core/src/test/java/org/elasticsearch/index/query/constantScore-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/data.json b/core/src/test/java/org/elasticsearch/index/query/data.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/data.json
rename to core/src/test/java/org/elasticsearch/index/query/data.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json b/core/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_filter_format.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json b/core/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json b/core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json b/core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json b/core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json b/core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_query_format.json b/core/src/test/java/org/elasticsearch/index/query/date_range_query_format.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_query_format.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_query_format.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_query_format_invalid.json b/core/src/test/java/org/elasticsearch/index/query/date_range_query_format_invalid.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_query_format_invalid.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_query_format_invalid.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_query_timezone.json b/core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_query_timezone.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone.json
diff --git a/src/test/java/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json b/core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json
rename to core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json
diff --git a/src/test/java/org/elasticsearch/index/query/disMax.json b/core/src/test/java/org/elasticsearch/index/query/disMax.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/disMax.json
rename to core/src/test/java/org/elasticsearch/index/query/disMax.json
diff --git a/src/test/java/org/elasticsearch/index/query/disMax2.json b/core/src/test/java/org/elasticsearch/index/query/disMax2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/disMax2.json
rename to core/src/test/java/org/elasticsearch/index/query/disMax2.json
diff --git a/src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json b/core/src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json
rename to core/src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/field3.json b/core/src/test/java/org/elasticsearch/index/query/field3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/field3.json
rename to core/src/test/java/org/elasticsearch/index/query/field3.json
diff --git a/src/test/java/org/elasticsearch/index/query/filtered-query.json b/core/src/test/java/org/elasticsearch/index/query/filtered-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/filtered-query.json
rename to core/src/test/java/org/elasticsearch/index/query/filtered-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/filtered-query2.json b/core/src/test/java/org/elasticsearch/index/query/filtered-query2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/filtered-query2.json
rename to core/src/test/java/org/elasticsearch/index/query/filtered-query2.json
diff --git a/src/test/java/org/elasticsearch/index/query/filtered-query3.json b/core/src/test/java/org/elasticsearch/index/query/filtered-query3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/filtered-query3.json
rename to core/src/test/java/org/elasticsearch/index/query/filtered-query3.json
diff --git a/src/test/java/org/elasticsearch/index/query/filtered-query4.json b/core/src/test/java/org/elasticsearch/index/query/filtered-query4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/filtered-query4.json
rename to core/src/test/java/org/elasticsearch/index/query/filtered-query4.json
diff --git a/src/test/java/org/elasticsearch/index/query/fquery-filter.json b/core/src/test/java/org/elasticsearch/index/query/fquery-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/fquery-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/fquery-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json b/core/src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json
rename to core/src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/function-filter-score-query.json b/core/src/test/java/org/elasticsearch/index/query/function-filter-score-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/function-filter-score-query.json
rename to core/src/test/java/org/elasticsearch/index/query/function-filter-score-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/function-score-query-causing-NPE.json b/core/src/test/java/org/elasticsearch/index/query/function-score-query-causing-NPE.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/function-score-query-causing-NPE.json
rename to core/src/test/java/org/elasticsearch/index/query/function-score-query-causing-NPE.json
diff --git a/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json b/core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json
rename to core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json
diff --git a/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json b/core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json
rename to core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json
diff --git a/src/test/java/org/elasticsearch/index/query/fuzzy.json b/core/src/test/java/org/elasticsearch/index/query/fuzzy.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/fuzzy.json
rename to core/src/test/java/org/elasticsearch/index/query/fuzzy.json
diff --git a/src/test/java/org/elasticsearch/index/query/geoShape-filter.json b/core/src/test/java/org/elasticsearch/index/query/geoShape-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geoShape-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/geoShape-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/geoShape-query.json b/core/src/test/java/org/elasticsearch/index/query/geoShape-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geoShape-query.json
rename to core/src/test/java/org/elasticsearch/index/query/geoShape-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox5.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox5.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox5.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox5.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_boundingbox6.json b/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox6.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_boundingbox6.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_boundingbox6.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance-named.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance-named.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance1.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance1.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance1.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance10.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance10.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance10.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance10.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance11.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance11.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance11.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance11.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance12.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance12.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance12.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance12.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance2.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance2.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance2.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance3.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance3.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance3.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance4.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance4.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance4.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance5.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance5.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance5.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance5.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance6.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance6.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance6.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance6.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance7.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance7.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance7.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance7.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance8.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance8.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance8.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance8.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_distance9.json b/core/src/test/java/org/elasticsearch/index/query/geo_distance9.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_distance9.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_distance9.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon-named.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon1.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon1.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon1.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon2.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon2.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon2.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon3.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon3.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon3.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon4.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon4.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon4.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_1.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon_exception_1.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_1.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_2.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon_exception_2.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_2.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_3.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon_exception_3.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_3.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_4.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon_exception_4.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_4.json
diff --git a/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_5.json b/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_5.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/geo_polygon_exception_5.json
rename to core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_5.json
diff --git a/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java b/core/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java
rename to core/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java b/core/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java
rename to core/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java
diff --git a/src/test/java/org/elasticsearch/index/query/has-child-in-and-filter-cached.json b/core/src/test/java/org/elasticsearch/index/query/has-child-in-and-filter-cached.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/has-child-in-and-filter-cached.json
rename to core/src/test/java/org/elasticsearch/index/query/has-child-in-and-filter-cached.json
diff --git a/src/test/java/org/elasticsearch/index/query/has-child.json b/core/src/test/java/org/elasticsearch/index/query/has-child.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/has-child.json
rename to core/src/test/java/org/elasticsearch/index/query/has-child.json
diff --git a/src/test/java/org/elasticsearch/index/query/mapping.json b/core/src/test/java/org/elasticsearch/index/query/mapping.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/mapping.json
rename to core/src/test/java/org/elasticsearch/index/query/mapping.json
diff --git a/src/test/java/org/elasticsearch/index/query/match-query-bad-type.json b/core/src/test/java/org/elasticsearch/index/query/match-query-bad-type.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/match-query-bad-type.json
rename to core/src/test/java/org/elasticsearch/index/query/match-query-bad-type.json
diff --git a/src/test/java/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json b/core/src/test/java/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json
rename to core/src/test/java/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json
diff --git a/src/test/java/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json b/core/src/test/java/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json
rename to core/src/test/java/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json
diff --git a/src/test/java/org/elasticsearch/index/query/matchAll.json b/core/src/test/java/org/elasticsearch/index/query/matchAll.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/matchAll.json
rename to core/src/test/java/org/elasticsearch/index/query/matchAll.json
diff --git a/src/test/java/org/elasticsearch/index/query/match_all_empty1.json b/core/src/test/java/org/elasticsearch/index/query/match_all_empty1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/match_all_empty1.json
rename to core/src/test/java/org/elasticsearch/index/query/match_all_empty1.json
diff --git a/src/test/java/org/elasticsearch/index/query/match_all_empty2.json b/core/src/test/java/org/elasticsearch/index/query/match_all_empty2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/match_all_empty2.json
rename to core/src/test/java/org/elasticsearch/index/query/match_all_empty2.json
diff --git a/src/test/java/org/elasticsearch/index/query/mlt-items.json b/core/src/test/java/org/elasticsearch/index/query/mlt-items.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/mlt-items.json
rename to core/src/test/java/org/elasticsearch/index/query/mlt-items.json
diff --git a/src/test/java/org/elasticsearch/index/query/mlt.json b/core/src/test/java/org/elasticsearch/index/query/mlt.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/mlt.json
rename to core/src/test/java/org/elasticsearch/index/query/mlt.json
diff --git a/src/test/java/org/elasticsearch/index/query/multiMatch-query-bad-type.json b/core/src/test/java/org/elasticsearch/index/query/multiMatch-query-bad-type.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/multiMatch-query-bad-type.json
rename to core/src/test/java/org/elasticsearch/index/query/multiMatch-query-bad-type.json
diff --git a/src/test/java/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json b/core/src/test/java/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json
rename to core/src/test/java/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json
diff --git a/src/test/java/org/elasticsearch/index/query/multiMatch-query-simple.json b/core/src/test/java/org/elasticsearch/index/query/multiMatch-query-simple.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/multiMatch-query-simple.json
rename to core/src/test/java/org/elasticsearch/index/query/multiMatch-query-simple.json
diff --git a/src/test/java/org/elasticsearch/index/query/not-filter.json b/core/src/test/java/org/elasticsearch/index/query/not-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/not-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/not-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/not-filter2.json b/core/src/test/java/org/elasticsearch/index/query/not-filter2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/not-filter2.json
rename to core/src/test/java/org/elasticsearch/index/query/not-filter2.json
diff --git a/src/test/java/org/elasticsearch/index/query/not-filter3.json b/core/src/test/java/org/elasticsearch/index/query/not-filter3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/not-filter3.json
rename to core/src/test/java/org/elasticsearch/index/query/not-filter3.json
diff --git a/src/test/java/org/elasticsearch/index/query/or-filter.json b/core/src/test/java/org/elasticsearch/index/query/or-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/or-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/or-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/or-filter2.json b/core/src/test/java/org/elasticsearch/index/query/or-filter2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/or-filter2.json
rename to core/src/test/java/org/elasticsearch/index/query/or-filter2.json
diff --git a/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java b/core/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java
rename to core/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java
diff --git a/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java b/core/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java
rename to core/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java
diff --git a/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java b/core/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java
rename to core/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java
diff --git a/src/test/java/org/elasticsearch/index/query/prefix-boost.json b/core/src/test/java/org/elasticsearch/index/query/prefix-boost.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/prefix-boost.json
rename to core/src/test/java/org/elasticsearch/index/query/prefix-boost.json
diff --git a/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json b/core/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/prefix-filter-named.json
rename to core/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/prefix-filter.json b/core/src/test/java/org/elasticsearch/index/query/prefix-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/prefix-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/prefix-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json b/core/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/prefix-with-boost.json
rename to core/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json
diff --git a/src/test/java/org/elasticsearch/index/query/prefix.json b/core/src/test/java/org/elasticsearch/index/query/prefix.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/prefix.json
rename to core/src/test/java/org/elasticsearch/index/query/prefix.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-fields-match.json b/core/src/test/java/org/elasticsearch/index/query/query-fields-match.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-fields-match.json
rename to core/src/test/java/org/elasticsearch/index/query/query-fields-match.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-fields1.json b/core/src/test/java/org/elasticsearch/index/query/query-fields1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-fields1.json
rename to core/src/test/java/org/elasticsearch/index/query/query-fields1.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-fields2.json b/core/src/test/java/org/elasticsearch/index/query/query-fields2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-fields2.json
rename to core/src/test/java/org/elasticsearch/index/query/query-fields2.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-fields3.json b/core/src/test/java/org/elasticsearch/index/query/query-fields3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-fields3.json
rename to core/src/test/java/org/elasticsearch/index/query/query-fields3.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-filter.json b/core/src/test/java/org/elasticsearch/index/query/query-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/query-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-regexp-max-determinized-states.json b/core/src/test/java/org/elasticsearch/index/query/query-regexp-max-determinized-states.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-regexp-max-determinized-states.json
rename to core/src/test/java/org/elasticsearch/index/query/query-regexp-max-determinized-states.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json b/core/src/test/java/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json
rename to core/src/test/java/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-timezone-incorrect.json b/core/src/test/java/org/elasticsearch/index/query/query-timezone-incorrect.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-timezone-incorrect.json
rename to core/src/test/java/org/elasticsearch/index/query/query-timezone-incorrect.json
diff --git a/src/test/java/org/elasticsearch/index/query/query-timezone.json b/core/src/test/java/org/elasticsearch/index/query/query-timezone.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query-timezone.json
rename to core/src/test/java/org/elasticsearch/index/query/query-timezone.json
diff --git a/src/test/java/org/elasticsearch/index/query/query.json b/core/src/test/java/org/elasticsearch/index/query/query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query.json
rename to core/src/test/java/org/elasticsearch/index/query/query.json
diff --git a/src/test/java/org/elasticsearch/index/query/query2.json b/core/src/test/java/org/elasticsearch/index/query/query2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/query2.json
rename to core/src/test/java/org/elasticsearch/index/query/query2.json
diff --git a/src/test/java/org/elasticsearch/index/query/range-filter-named.json b/core/src/test/java/org/elasticsearch/index/query/range-filter-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/range-filter-named.json
rename to core/src/test/java/org/elasticsearch/index/query/range-filter-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/range-filter.json b/core/src/test/java/org/elasticsearch/index/query/range-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/range-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/range-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/range.json b/core/src/test/java/org/elasticsearch/index/query/range.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/range.json
rename to core/src/test/java/org/elasticsearch/index/query/range.json
diff --git a/src/test/java/org/elasticsearch/index/query/range2.json b/core/src/test/java/org/elasticsearch/index/query/range2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/range2.json
rename to core/src/test/java/org/elasticsearch/index/query/range2.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-boost.json b/core/src/test/java/org/elasticsearch/index/query/regexp-boost.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-boost.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-boost.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json b/core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json b/core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json b/core/src/test/java/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-filter-named.json b/core/src/test/java/org/elasticsearch/index/query/regexp-filter-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-filter-named.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-filter-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-filter.json b/core/src/test/java/org/elasticsearch/index/query/regexp-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp-max-determinized-states.json b/core/src/test/java/org/elasticsearch/index/query/regexp-max-determinized-states.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp-max-determinized-states.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp-max-determinized-states.json
diff --git a/src/test/java/org/elasticsearch/index/query/regexp.json b/core/src/test/java/org/elasticsearch/index/query/regexp.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/regexp.json
rename to core/src/test/java/org/elasticsearch/index/query/regexp.json
diff --git a/src/test/java/org/elasticsearch/index/query/simple-query-string.json b/core/src/test/java/org/elasticsearch/index/query/simple-query-string.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/simple-query-string.json
rename to core/src/test/java/org/elasticsearch/index/query/simple-query-string.json
diff --git a/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json b/core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json
rename to core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json
diff --git a/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json b/core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json
rename to core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json
diff --git a/src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json b/core/src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json
rename to core/src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json
diff --git a/src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json b/core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json
rename to core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json
diff --git a/src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json b/core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json
rename to core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json
diff --git a/src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json b/core/src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json
rename to core/src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanContaining.json b/core/src/test/java/org/elasticsearch/index/query/spanContaining.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanContaining.json
rename to core/src/test/java/org/elasticsearch/index/query/spanContaining.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json b/core/src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json
rename to core/src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanFirst.json b/core/src/test/java/org/elasticsearch/index/query/spanFirst.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanFirst.json
rename to core/src/test/java/org/elasticsearch/index/query/spanFirst.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanNear.json b/core/src/test/java/org/elasticsearch/index/query/spanNear.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanNear.json
rename to core/src/test/java/org/elasticsearch/index/query/spanNear.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanNot.json b/core/src/test/java/org/elasticsearch/index/query/spanNot.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanNot.json
rename to core/src/test/java/org/elasticsearch/index/query/spanNot.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanOr.json b/core/src/test/java/org/elasticsearch/index/query/spanOr.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanOr.json
rename to core/src/test/java/org/elasticsearch/index/query/spanOr.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanOr2.json b/core/src/test/java/org/elasticsearch/index/query/spanOr2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanOr2.json
rename to core/src/test/java/org/elasticsearch/index/query/spanOr2.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanTerm.json b/core/src/test/java/org/elasticsearch/index/query/spanTerm.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanTerm.json
rename to core/src/test/java/org/elasticsearch/index/query/spanTerm.json
diff --git a/src/test/java/org/elasticsearch/index/query/spanWithin.json b/core/src/test/java/org/elasticsearch/index/query/spanWithin.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/spanWithin.json
rename to core/src/test/java/org/elasticsearch/index/query/spanWithin.json
diff --git a/src/test/java/org/elasticsearch/index/query/starColonStar.json b/core/src/test/java/org/elasticsearch/index/query/starColonStar.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/starColonStar.json
rename to core/src/test/java/org/elasticsearch/index/query/starColonStar.json
diff --git a/src/test/java/org/elasticsearch/index/query/term-array-invalid.json b/core/src/test/java/org/elasticsearch/index/query/term-array-invalid.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/term-array-invalid.json
rename to core/src/test/java/org/elasticsearch/index/query/term-array-invalid.json
diff --git a/src/test/java/org/elasticsearch/index/query/term-filter-named.json b/core/src/test/java/org/elasticsearch/index/query/term-filter-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/term-filter-named.json
rename to core/src/test/java/org/elasticsearch/index/query/term-filter-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/term-filter.json b/core/src/test/java/org/elasticsearch/index/query/term-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/term-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/term-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/term-with-boost.json b/core/src/test/java/org/elasticsearch/index/query/term-with-boost.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/term-with-boost.json
rename to core/src/test/java/org/elasticsearch/index/query/term-with-boost.json
diff --git a/src/test/java/org/elasticsearch/index/query/term.json b/core/src/test/java/org/elasticsearch/index/query/term.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/term.json
rename to core/src/test/java/org/elasticsearch/index/query/term.json
diff --git a/src/test/java/org/elasticsearch/index/query/terms-filter-named.json b/core/src/test/java/org/elasticsearch/index/query/terms-filter-named.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/terms-filter-named.json
rename to core/src/test/java/org/elasticsearch/index/query/terms-filter-named.json
diff --git a/src/test/java/org/elasticsearch/index/query/terms-filter.json b/core/src/test/java/org/elasticsearch/index/query/terms-filter.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/terms-filter.json
rename to core/src/test/java/org/elasticsearch/index/query/terms-filter.json
diff --git a/src/test/java/org/elasticsearch/index/query/terms-query.json b/core/src/test/java/org/elasticsearch/index/query/terms-query.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/terms-query.json
rename to core/src/test/java/org/elasticsearch/index/query/terms-query.json
diff --git a/src/test/java/org/elasticsearch/index/query/wildcard-boost.json b/core/src/test/java/org/elasticsearch/index/query/wildcard-boost.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/wildcard-boost.json
rename to core/src/test/java/org/elasticsearch/index/query/wildcard-boost.json
diff --git a/src/test/java/org/elasticsearch/index/query/wildcard.json b/core/src/test/java/org/elasticsearch/index/query/wildcard.json
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/wildcard.json
rename to core/src/test/java/org/elasticsearch/index/query/wildcard.json
diff --git a/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java b/core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
rename to core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/BitSetCollector.java b/core/src/test/java/org/elasticsearch/index/search/child/BitSetCollector.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/BitSetCollector.java
rename to core/src/test/java/org/elasticsearch/index/search/child/BitSetCollector.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java
rename to core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java
rename to core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/MockScorer.java b/core/src/test/java/org/elasticsearch/index/search/child/MockScorer.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/MockScorer.java
rename to core/src/test/java/org/elasticsearch/index/search/child/MockScorer.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java
rename to core/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java
rename to core/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java
rename to core/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java
rename to core/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java
rename to core/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java
rename to core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java
rename to core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java
rename to core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java
rename to core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java
rename to core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java
rename to core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java
diff --git a/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java b/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java
rename to core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java
diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java
rename to core/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java
diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
rename to core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
diff --git a/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/shard/ShardPathTests.java
rename to core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java
diff --git a/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java b/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java
rename to core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
rename to core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
diff --git a/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java
rename to core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java
diff --git a/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java
rename to core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java
diff --git a/src/test/java/org/elasticsearch/index/store/CorruptedFileTest.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/CorruptedFileTest.java
rename to core/src/test/java/org/elasticsearch/index/store/CorruptedFileTest.java
diff --git a/src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java
rename to core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java
diff --git a/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java b/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java
rename to core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java
diff --git a/src/test/java/org/elasticsearch/index/store/ExceptionRetryTests.java b/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/ExceptionRetryTests.java
rename to core/src/test/java/org/elasticsearch/index/store/ExceptionRetryTests.java
diff --git a/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java b/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/IndexStoreTests.java
rename to core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java
diff --git a/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java b/core/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java
rename to core/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java
diff --git a/src/test/java/org/elasticsearch/index/store/StoreTest.java b/core/src/test/java/org/elasticsearch/index/store/StoreTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/store/StoreTest.java
rename to core/src/test/java/org/elasticsearch/index/store/StoreTest.java
diff --git a/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsTests.java b/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsTests.java
rename to core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsTests.java
diff --git a/src/test/java/org/elasticsearch/index/translog/BufferedTranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/BufferedTranslogTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/translog/BufferedTranslogTests.java
rename to core/src/test/java/org/elasticsearch/index/translog/BufferedTranslogTests.java
diff --git a/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java b/core/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java
rename to core/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java
diff --git a/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/translog/TranslogTests.java
rename to core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
diff --git a/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java
rename to core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java
diff --git a/src/test/java/org/elasticsearch/indexing/IndexActionTests.java b/core/src/test/java/org/elasticsearch/indexing/IndexActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indexing/IndexActionTests.java
rename to core/src/test/java/org/elasticsearch/indexing/IndexActionTests.java
diff --git a/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java b/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java
rename to core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java
diff --git a/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java
rename to core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java
diff --git a/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java
rename to core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java
diff --git a/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerTests.java
rename to core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerTests.java
diff --git a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java b/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/IndicesServiceTest.java
rename to core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisBinderProcessor.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisBinderProcessor.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisBinderProcessor.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisBinderProcessor.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisPlugin.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisPlugin.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalysisPlugin.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzer.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzer.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzer.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzer.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzerProvider.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzerProvider.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzerProvider.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyAnalyzerProvider.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyCharFilterFactory.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyCharFilterFactory.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyCharFilterFactory.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyCharFilterFactory.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysis.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysis.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysis.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysis.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysisModule.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysisModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysisModule.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyIndicesAnalysisModule.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyTokenFilterFactory.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyTokenFilterFactory.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyTokenFilterFactory.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyTokenFilterFactory.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/DummyTokenizerFactory.java b/core/src/test/java/org/elasticsearch/indices/analysis/DummyTokenizerFactory.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/DummyTokenizerFactory.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/DummyTokenizerFactory.java
diff --git a/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java
rename to core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java
diff --git a/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
rename to core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
diff --git a/src/test/java/org/elasticsearch/indices/cache/query/IndicesQueryCacheTests.java b/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesQueryCacheTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/cache/query/IndicesQueryCacheTests.java
rename to core/src/test/java/org/elasticsearch/indices/cache/query/IndicesQueryCacheTests.java
diff --git a/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsTests.java b/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsTests.java
rename to core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsTests.java
diff --git a/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java b/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java
rename to core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java
diff --git a/src/test/java/org/elasticsearch/indices/flush/FlushTest.java b/core/src/test/java/org/elasticsearch/indices/flush/FlushTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/flush/FlushTest.java
rename to core/src/test/java/org/elasticsearch/indices/flush/FlushTest.java
diff --git a/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java
rename to core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java
diff --git a/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
rename to core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
diff --git a/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java
rename to core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java
diff --git a/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java b/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java
rename to core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java
diff --git a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java
rename to core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java
diff --git a/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java
rename to core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java
diff --git a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java
rename to core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java
diff --git a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java
rename to core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java
diff --git a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
rename to core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
diff --git a/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopTests.java
rename to core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopTests.java
diff --git a/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceTests.java
rename to core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceTests.java
diff --git a/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java
rename to core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java
diff --git a/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerTests.java
rename to core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerTests.java
diff --git a/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryTests.java
rename to core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryTests.java
diff --git a/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java
rename to core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java
diff --git a/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java
rename to core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java
diff --git a/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java b/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java
rename to core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java
diff --git a/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksTests.java b/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksTests.java
rename to core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java
rename to core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java
diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
rename to core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
diff --git a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java b/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java
rename to core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java
diff --git a/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java
rename to core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java
diff --git a/src/test/java/org/elasticsearch/indices/state/RareClusterStateTests.java b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/state/RareClusterStateTests.java
rename to core/src/test/java/org/elasticsearch/indices/state/RareClusterStateTests.java
diff --git a/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java b/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java
rename to core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java
diff --git a/src/test/java/org/elasticsearch/indices/stats/IndexStatsTests.java b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/stats/IndexStatsTests.java
rename to core/src/test/java/org/elasticsearch/indices/stats/IndexStatsTests.java
diff --git a/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java
rename to core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java
diff --git a/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksTests.java b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksTests.java
rename to core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringTests.java b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringTests.java
rename to core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringTests.java
diff --git a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
rename to core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
diff --git a/src/test/java/org/elasticsearch/indices/template/template0.json b/core/src/test/java/org/elasticsearch/indices/template/template0.json
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/template0.json
rename to core/src/test/java/org/elasticsearch/indices/template/template0.json
diff --git a/src/test/java/org/elasticsearch/indices/template/template1.json b/core/src/test/java/org/elasticsearch/indices/template/template1.json
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/template1.json
rename to core/src/test/java/org/elasticsearch/indices/template/template1.json
diff --git a/src/test/java/org/elasticsearch/indices/template/template2.json b/core/src/test/java/org/elasticsearch/indices/template/template2.json
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/template2.json
rename to core/src/test/java/org/elasticsearch/indices/template/template2.json
diff --git a/src/test/java/org/elasticsearch/indices/template/template3.json b/core/src/test/java/org/elasticsearch/indices/template/template3.json
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/template3.json
rename to core/src/test/java/org/elasticsearch/indices/template/template3.json
diff --git a/src/test/java/org/elasticsearch/indices/template/template4.json b/core/src/test/java/org/elasticsearch/indices/template/template4.json
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/template4.json
rename to core/src/test/java/org/elasticsearch/indices/template/template4.json
diff --git a/src/test/java/org/elasticsearch/indices/template/template5.json b/core/src/test/java/org/elasticsearch/indices/template/template5.json
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/template/template5.json
rename to core/src/test/java/org/elasticsearch/indices/template/template5.json
diff --git a/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerTests.java b/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerTests.java
rename to core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerTests.java
diff --git a/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksTests.java b/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksTests.java
rename to core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksTests.java
diff --git a/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java b/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
rename to core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
diff --git a/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java b/core/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/mget/SimpleMgetTests.java
rename to core/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java
diff --git a/src/test/java/org/elasticsearch/monitor/SigarTests.java b/core/src/test/java/org/elasticsearch/monitor/SigarTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/monitor/SigarTests.java
rename to core/src/test/java/org/elasticsearch/monitor/SigarTests.java
diff --git a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java b/core/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
rename to core/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
diff --git a/src/test/java/org/elasticsearch/network/DirectBufferNetworkTests.java b/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/network/DirectBufferNetworkTests.java
rename to core/src/test/java/org/elasticsearch/network/DirectBufferNetworkTests.java
diff --git a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java b/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
rename to core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
diff --git a/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java b/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java
rename to core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java
diff --git a/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java b/core/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java
rename to core/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java
diff --git a/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java b/core/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java
rename to core/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java
diff --git a/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java b/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledTest.java b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledTest.java
rename to core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledTest.java
diff --git a/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledTest.java b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledTest.java
rename to core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledTest.java
diff --git a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java
rename to core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java
diff --git a/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java
rename to core/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java
diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java
rename to core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java
diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/PercolatorTests.java
rename to core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
diff --git a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java
rename to core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java
diff --git a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java
rename to core/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java b/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java
rename to core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/PluginLuceneCheckerTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginLuceneCheckerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/PluginLuceneCheckerTests.java
rename to core/src/test/java/org/elasticsearch/plugins/PluginLuceneCheckerTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/PluginManagerTests.java
rename to core/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
rename to core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/PluginServiceTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/PluginServiceTests.java
rename to core/src/test/java/org/elasticsearch/plugins/PluginServiceTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/PluginTestCase.java b/core/src/test/java/org/elasticsearch/plugins/PluginTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/PluginTestCase.java
rename to core/src/test/java/org/elasticsearch/plugins/PluginTestCase.java
diff --git a/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginTests.java b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginTests.java
rename to core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigTests.java b/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigTests.java
rename to core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/SitePluginTests.java b/core/src/test/java/org/elasticsearch/plugins/SitePluginTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/SitePluginTests.java
rename to core/src/test/java/org/elasticsearch/plugins/SitePluginTests.java
diff --git a/src/test/java/org/elasticsearch/plugins/loading/classpath/InClassPathPlugin.java b/core/src/test/java/org/elasticsearch/plugins/loading/classpath/InClassPathPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/loading/classpath/InClassPathPlugin.java
rename to core/src/test/java/org/elasticsearch/plugins/loading/classpath/InClassPathPlugin.java
diff --git a/src/test/java/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties b/core/src/test/java/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties
rename to core/src/test/java/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties
diff --git a/src/test/java/org/elasticsearch/plugins/lucene/current/CurrentLucenePlugin.java b/core/src/test/java/org/elasticsearch/plugins/lucene/current/CurrentLucenePlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/lucene/current/CurrentLucenePlugin.java
rename to core/src/test/java/org/elasticsearch/plugins/lucene/current/CurrentLucenePlugin.java
diff --git a/src/test/java/org/elasticsearch/plugins/lucene/current/es-plugin-test.properties b/core/src/test/java/org/elasticsearch/plugins/lucene/current/es-plugin-test.properties
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/lucene/current/es-plugin-test.properties
rename to core/src/test/java/org/elasticsearch/plugins/lucene/current/es-plugin-test.properties
diff --git a/src/test/java/org/elasticsearch/plugins/lucene/newer/NewerLucenePlugin.java b/core/src/test/java/org/elasticsearch/plugins/lucene/newer/NewerLucenePlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/lucene/newer/NewerLucenePlugin.java
rename to core/src/test/java/org/elasticsearch/plugins/lucene/newer/NewerLucenePlugin.java
diff --git a/src/test/java/org/elasticsearch/plugins/lucene/newer/es-plugin-test.properties b/core/src/test/java/org/elasticsearch/plugins/lucene/newer/es-plugin-test.properties
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/lucene/newer/es-plugin-test.properties
rename to core/src/test/java/org/elasticsearch/plugins/lucene/newer/es-plugin-test.properties
diff --git a/src/test/java/org/elasticsearch/plugins/lucene/old/OldLucenePlugin.java b/core/src/test/java/org/elasticsearch/plugins/lucene/old/OldLucenePlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/lucene/old/OldLucenePlugin.java
rename to core/src/test/java/org/elasticsearch/plugins/lucene/old/OldLucenePlugin.java
diff --git a/src/test/java/org/elasticsearch/plugins/lucene/old/es-plugin-test.properties b/core/src/test/java/org/elasticsearch/plugins/lucene/old/es-plugin-test.properties
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/lucene/old/es-plugin-test.properties
rename to core/src/test/java/org/elasticsearch/plugins/lucene/old/es-plugin-test.properties
diff --git a/src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderPlugin.java b/core/src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderPlugin.java
rename to core/src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderPlugin.java
diff --git a/src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderRestAction.java b/core/src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderRestAction.java
similarity index 100%
rename from src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderRestAction.java
rename to core/src/test/java/org/elasticsearch/plugins/responseheader/TestResponseHeaderRestAction.java
diff --git a/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java b/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java
rename to core/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java
rename to core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java b/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java
rename to core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java
diff --git a/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java b/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java
rename to core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/RelocationTests.java b/core/src/test/java/org/elasticsearch/recovery/RelocationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/RelocationTests.java
rename to core/src/test/java/org/elasticsearch/recovery/RelocationTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java
rename to core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java
rename to core/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java
rename to core/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java
rename to core/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java
diff --git a/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/recovery/TruncatedRecoveryTests.java
rename to core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryTests.java
diff --git a/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java b/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java
rename to core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java
diff --git a/src/test/java/org/elasticsearch/rest/CorsRegexDefaultTests.java b/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/CorsRegexDefaultTests.java
rename to core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultTests.java
diff --git a/src/test/java/org/elasticsearch/rest/CorsRegexTests.java b/core/src/test/java/org/elasticsearch/rest/CorsRegexTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/CorsRegexTests.java
rename to core/src/test/java/org/elasticsearch/rest/CorsRegexTests.java
diff --git a/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java b/core/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java
rename to core/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java
diff --git a/src/test/java/org/elasticsearch/rest/NoOpClient.java b/core/src/test/java/org/elasticsearch/rest/NoOpClient.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/NoOpClient.java
rename to core/src/test/java/org/elasticsearch/rest/NoOpClient.java
diff --git a/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java b/core/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
rename to core/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
diff --git a/src/test/java/org/elasticsearch/rest/RestRequestTests.java b/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/RestRequestTests.java
rename to core/src/test/java/org/elasticsearch/rest/RestRequestTests.java
diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java b/core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
rename to core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java b/core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
rename to core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
diff --git a/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java b/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
rename to core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
diff --git a/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java b/core/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java
rename to core/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/river/RiverTests.java b/core/src/test/java/org/elasticsearch/river/RiverTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/river/RiverTests.java
rename to core/src/test/java/org/elasticsearch/river/RiverTests.java
diff --git a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java b/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java
rename to core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java b/core/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
rename to core/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java b/core/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java
rename to core/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java
diff --git a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java b/core/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
rename to core/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
diff --git a/src/test/java/org/elasticsearch/script/GroovyScriptTests.java b/core/src/test/java/org/elasticsearch/script/GroovyScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/GroovyScriptTests.java
rename to core/src/test/java/org/elasticsearch/script/GroovyScriptTests.java
diff --git a/src/test/java/org/elasticsearch/script/GroovySecurityTests.java b/core/src/test/java/org/elasticsearch/script/GroovySecurityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/GroovySecurityTests.java
rename to core/src/test/java/org/elasticsearch/script/GroovySecurityTests.java
diff --git a/src/test/java/org/elasticsearch/script/IndexLookupTests.java b/core/src/test/java/org/elasticsearch/script/IndexLookupTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/IndexLookupTests.java
rename to core/src/test/java/org/elasticsearch/script/IndexLookupTests.java
diff --git a/src/test/java/org/elasticsearch/script/IndexedScriptTests.java b/core/src/test/java/org/elasticsearch/script/IndexedScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/IndexedScriptTests.java
rename to core/src/test/java/org/elasticsearch/script/IndexedScriptTests.java
diff --git a/src/test/java/org/elasticsearch/script/NativeScriptTests.java b/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/NativeScriptTests.java
rename to core/src/test/java/org/elasticsearch/script/NativeScriptTests.java
diff --git a/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java b/core/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
rename to core/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
diff --git a/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java b/core/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java
rename to core/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java
diff --git a/src/test/java/org/elasticsearch/script/ScriptFieldTests.java b/core/src/test/java/org/elasticsearch/script/ScriptFieldTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/ScriptFieldTests.java
rename to core/src/test/java/org/elasticsearch/script/ScriptFieldTests.java
diff --git a/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java b/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java
rename to core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java
diff --git a/src/test/java/org/elasticsearch/script/ScriptModesTests.java b/core/src/test/java/org/elasticsearch/script/ScriptModesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/ScriptModesTests.java
rename to core/src/test/java/org/elasticsearch/script/ScriptModesTests.java
diff --git a/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java b/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java
rename to core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java
diff --git a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/ScriptServiceTests.java
rename to core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
diff --git a/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java b/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
rename to core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
diff --git a/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java b/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java
rename to core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java
diff --git a/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java b/core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/script/mustache/MustacheTest.java
rename to core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java
diff --git a/src/test/java/org/elasticsearch/search/CountSearchTests.java b/core/src/test/java/org/elasticsearch/search/CountSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/CountSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/CountSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/MultiValueModeTests.java
rename to core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java
diff --git a/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/SearchServiceTests.java
rename to core/src/test/java/org/elasticsearch/search/SearchServiceTests.java
diff --git a/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java b/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
rename to core/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
diff --git a/src/test/java/org/elasticsearch/search/StressSearchServiceReaperTest.java b/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/StressSearchServiceReaperTest.java
rename to core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperTest.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/CombiTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/MetaDataTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/MetaDataTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/MetaDataTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/MissingValueTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/MissingValueTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/MissingValueTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/package-info.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/package-info.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/package-info.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/package-info.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptNoParams.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptNoParams.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptNoParams.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptNoParams.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptWithParams.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptWithParams.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptWithParams.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptWithParams.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/script/TestScript.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/script/TestScript.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/script/TestScript.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/script/TestScript.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/package-info.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/package-info.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/metrics/package-info.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/metrics/package-info.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/package-info.java b/core/src/test/java/org/elasticsearch/search/aggregations/package-info.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/package-info.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/package-info.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java
diff --git a/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java
rename to core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java
diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java
rename to core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java
diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java
rename to core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java
diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java
rename to core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java
diff --git a/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java b/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java
rename to core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java
diff --git a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java b/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java
rename to core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
rename to core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
diff --git a/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
rename to core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java
rename to core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java
diff --git a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
rename to core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
diff --git a/src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json b/core/src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json
similarity index 100%
rename from src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json
rename to core/src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json
diff --git a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java b/core/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
rename to core/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
diff --git a/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java b/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java
rename to core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java
diff --git a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java b/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
rename to core/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
diff --git a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
rename to core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java
rename to core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
rename to core/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java
rename to core/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoPolygonTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/geo/GeoPolygonTests.java
rename to core/src/test/java/org/elasticsearch/search/geo/GeoPolygonTests.java
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/search/geo/gzippedmap.gz b/core/src/test/java/org/elasticsearch/search/geo/gzippedmap.gz
similarity index 100%
rename from src/test/java/org/elasticsearch/search/geo/gzippedmap.gz
rename to core/src/test/java/org/elasticsearch/search/geo/gzippedmap.gz
diff --git a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java
rename to core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java
diff --git a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java
rename to core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java
diff --git a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java b/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
rename to core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
diff --git a/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java
rename to core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java
diff --git a/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java b/core/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java
rename to core/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java
diff --git a/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisTests.java b/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisTests.java
rename to core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisTests.java
diff --git a/src/test/java/org/elasticsearch/search/morelikethis/items.json b/core/src/test/java/org/elasticsearch/search/morelikethis/items.json
similarity index 100%
rename from src/test/java/org/elasticsearch/search/morelikethis/items.json
rename to core/src/test/java/org/elasticsearch/search/morelikethis/items.json
diff --git a/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java b/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java b/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java
rename to core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java
diff --git a/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java b/core/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
rename to core/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
diff --git a/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java
rename to core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java
diff --git a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java b/core/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
rename to core/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
diff --git a/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java
rename to core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java
diff --git a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
rename to core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
diff --git a/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java b/core/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scan/ScanContextTests.java
rename to core/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java
diff --git a/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java b/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java
rename to core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java
diff --git a/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java b/core/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scan/SearchScanTests.java
rename to core/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java
diff --git a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java b/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
rename to core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/scroll/DuelScrollTests.java b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scroll/DuelScrollTests.java
rename to core/src/test/java/org/elasticsearch/search/scroll/DuelScrollTests.java
diff --git a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java
rename to core/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java
diff --git a/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesTests.java b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesTests.java
rename to core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesTests.java
diff --git a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java b/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/core/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
rename to core/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
diff --git a/src/test/java/org/elasticsearch/search/sort/SortParserTests.java b/core/src/test/java/org/elasticsearch/search/sort/SortParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/sort/SortParserTests.java
rename to core/src/test/java/org/elasticsearch/search/sort/SortParserTests.java
diff --git a/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java b/core/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java
rename to core/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java
diff --git a/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
rename to core/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
diff --git a/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java
rename to core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java
rename to core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java
rename to core/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java
rename to core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
rename to core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
rename to core/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
rename to core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java b/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java
rename to core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java
diff --git a/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java
rename to core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java
diff --git a/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java b/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
rename to core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
diff --git a/src/test/java/org/elasticsearch/similarity/SimilarityTests.java b/core/src/test/java/org/elasticsearch/similarity/SimilarityTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/similarity/SimilarityTests.java
rename to core/src/test/java/org/elasticsearch/similarity/SimilarityTests.java
diff --git a/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java b/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java
rename to core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java
diff --git a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java b/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
rename to core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
diff --git a/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java b/core/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java
rename to core/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java
diff --git a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
rename to core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
diff --git a/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityTest.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityTest.java
rename to core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityTest.java
diff --git a/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java
rename to core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java
rename to core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java
diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java
rename to core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java
diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
rename to core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryModule.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryModule.java
rename to core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryModule.java
diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java
similarity index 100%
rename from src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java
rename to core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java
diff --git a/src/test/java/org/elasticsearch/stresstest/client/ClientFailover.java b/core/src/test/java/org/elasticsearch/stresstest/client/ClientFailover.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/client/ClientFailover.java
rename to core/src/test/java/org/elasticsearch/stresstest/client/ClientFailover.java
diff --git a/src/test/java/org/elasticsearch/stresstest/fullrestart/FullRestartStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/fullrestart/FullRestartStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/fullrestart/FullRestartStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/fullrestart/FullRestartStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/gcbehavior/FilterCacheGcStress.java b/core/src/test/java/org/elasticsearch/stresstest/gcbehavior/FilterCacheGcStress.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/gcbehavior/FilterCacheGcStress.java
rename to core/src/test/java/org/elasticsearch/stresstest/gcbehavior/FilterCacheGcStress.java
diff --git a/src/test/java/org/elasticsearch/stresstest/get/GetStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/get/GetStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/get/GetStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/get/GetStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/get/MGetStress1.java b/core/src/test/java/org/elasticsearch/stresstest/get/MGetStress1.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/get/MGetStress1.java
rename to core/src/test/java/org/elasticsearch/stresstest/get/MGetStress1.java
diff --git a/src/test/java/org/elasticsearch/stresstest/indexing/BulkIndexingStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/indexing/BulkIndexingStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/indexing/BulkIndexingStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/indexing/BulkIndexingStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/indexing/ConcurrentIndexingVersioningStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/indexing/ConcurrentIndexingVersioningStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/indexing/ConcurrentIndexingVersioningStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/indexing/ConcurrentIndexingVersioningStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/leaks/GenericStatsLeak.java b/core/src/test/java/org/elasticsearch/stresstest/leaks/GenericStatsLeak.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/leaks/GenericStatsLeak.java
rename to core/src/test/java/org/elasticsearch/stresstest/leaks/GenericStatsLeak.java
diff --git a/src/test/java/org/elasticsearch/stresstest/leaks/JvmStatsLeak.java b/core/src/test/java/org/elasticsearch/stresstest/leaks/JvmStatsLeak.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/leaks/JvmStatsLeak.java
rename to core/src/test/java/org/elasticsearch/stresstest/leaks/JvmStatsLeak.java
diff --git a/src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesRemoteStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesRemoteStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesRemoteStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesRemoteStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/manyindices/ManyIndicesStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/manyindices/ManyNodesManyIndicesRecoveryStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/manyindices/ManyNodesManyIndicesRecoveryStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/manyindices/ManyNodesManyIndicesRecoveryStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/manyindices/ManyNodesManyIndicesRecoveryStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/refresh/RefreshStressTest1.java b/core/src/test/java/org/elasticsearch/stresstest/refresh/RefreshStressTest1.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/refresh/RefreshStressTest1.java
rename to core/src/test/java/org/elasticsearch/stresstest/refresh/RefreshStressTest1.java
diff --git a/src/test/java/org/elasticsearch/stresstest/rollingrestart/QuickRollingRestartStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/rollingrestart/QuickRollingRestartStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/rollingrestart/QuickRollingRestartStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/rollingrestart/QuickRollingRestartStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/rollingrestart/RollingRestartStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/rollingrestart/RollingRestartStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/rollingrestart/RollingRestartStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/rollingrestart/RollingRestartStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationTests.java b/core/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationTests.java
rename to core/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationTests.java
diff --git a/src/test/java/org/elasticsearch/stresstest/search1/ParentChildStressTest.java b/core/src/test/java/org/elasticsearch/stresstest/search1/ParentChildStressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/search1/ParentChildStressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/search1/ParentChildStressTest.java
diff --git a/src/test/java/org/elasticsearch/stresstest/search1/Search1StressTest.java b/core/src/test/java/org/elasticsearch/stresstest/search1/Search1StressTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/stresstest/search1/Search1StressTest.java
rename to core/src/test/java/org/elasticsearch/stresstest/search1/Search1StressTest.java
diff --git a/src/test/java/org/elasticsearch/test/BackgroundIndexer.java b/core/src/test/java/org/elasticsearch/test/BackgroundIndexer.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/BackgroundIndexer.java
rename to core/src/test/java/org/elasticsearch/test/BackgroundIndexer.java
diff --git a/src/test/java/org/elasticsearch/test/CompositeTestCluster.java b/core/src/test/java/org/elasticsearch/test/CompositeTestCluster.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/CompositeTestCluster.java
rename to core/src/test/java/org/elasticsearch/test/CompositeTestCluster.java
diff --git a/src/test/java/org/elasticsearch/test/DummyShardLock.java b/core/src/test/java/org/elasticsearch/test/DummyShardLock.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/DummyShardLock.java
rename to core/src/test/java/org/elasticsearch/test/DummyShardLock.java
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchAllocationTestCase.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchAllocationTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ElasticsearchAllocationTestCase.java
rename to core/src/test/java/org/elasticsearch/test/ElasticsearchAllocationTestCase.java
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
rename to core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java
rename to core/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java
rename to core/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java b/core/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java
rename to core/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java
diff --git a/src/test/java/org/elasticsearch/test/ExternalNode.java b/core/src/test/java/org/elasticsearch/test/ExternalNode.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ExternalNode.java
rename to core/src/test/java/org/elasticsearch/test/ExternalNode.java
diff --git a/src/test/java/org/elasticsearch/test/ExternalTestCluster.java b/core/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/ExternalTestCluster.java
rename to core/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/core/src/test/java/org/elasticsearch/test/InternalTestCluster.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/InternalTestCluster.java
rename to core/src/test/java/org/elasticsearch/test/InternalTestCluster.java
diff --git a/src/test/java/org/elasticsearch/test/MockLogAppender.java b/core/src/test/java/org/elasticsearch/test/MockLogAppender.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/MockLogAppender.java
rename to core/src/test/java/org/elasticsearch/test/MockLogAppender.java
diff --git a/src/test/java/org/elasticsearch/test/SettingsSource.java b/core/src/test/java/org/elasticsearch/test/SettingsSource.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/SettingsSource.java
rename to core/src/test/java/org/elasticsearch/test/SettingsSource.java
diff --git a/src/test/java/org/elasticsearch/test/TestCluster.java b/core/src/test/java/org/elasticsearch/test/TestCluster.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/TestCluster.java
rename to core/src/test/java/org/elasticsearch/test/TestCluster.java
diff --git a/src/test/java/org/elasticsearch/test/TestSearchContext.java b/core/src/test/java/org/elasticsearch/test/TestSearchContext.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/TestSearchContext.java
rename to core/src/test/java/org/elasticsearch/test/TestSearchContext.java
diff --git a/src/test/java/org/elasticsearch/test/VersionUtils.java b/core/src/test/java/org/elasticsearch/test/VersionUtils.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/VersionUtils.java
rename to core/src/test/java/org/elasticsearch/test/VersionUtils.java
diff --git a/src/test/java/org/elasticsearch/test/XContentTestUtils.java b/core/src/test/java/org/elasticsearch/test/XContentTestUtils.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/XContentTestUtils.java
rename to core/src/test/java/org/elasticsearch/test/XContentTestUtils.java
diff --git a/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java
rename to core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java
diff --git a/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArraysModule.java b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArraysModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/cache/recycler/MockBigArraysModule.java
rename to core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArraysModule.java
diff --git a/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java
rename to core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java
diff --git a/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecyclerModule.java b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecyclerModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecyclerModule.java
rename to core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecyclerModule.java
diff --git a/src/test/java/org/elasticsearch/test/client/RandomizingClient.java b/core/src/test/java/org/elasticsearch/test/client/RandomizingClient.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/client/RandomizingClient.java
rename to core/src/test/java/org/elasticsearch/test/client/RandomizingClient.java
diff --git a/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java b/core/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java
rename to core/src/test/java/org/elasticsearch/test/cluster/NoopClusterService.java
diff --git a/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java b/core/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/cluster/TestClusterService.java
rename to core/src/test/java/org/elasticsearch/test/cluster/TestClusterService.java
diff --git a/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java b/core/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java
rename to core/src/test/java/org/elasticsearch/test/discovery/ClusterDiscoveryConfiguration.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java b/core/src/test/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java
rename to core/src/test/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java b/core/src/test/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java
rename to core/src/test/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java b/core/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java
rename to core/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/NetworkDelaysPartition.java b/core/src/test/java/org/elasticsearch/test/disruption/NetworkDelaysPartition.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/NetworkDelaysPartition.java
rename to core/src/test/java/org/elasticsearch/test/disruption/NetworkDelaysPartition.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/NetworkDisconnectPartition.java b/core/src/test/java/org/elasticsearch/test/disruption/NetworkDisconnectPartition.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/NetworkDisconnectPartition.java
rename to core/src/test/java/org/elasticsearch/test/disruption/NetworkDisconnectPartition.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/NetworkPartition.java b/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartition.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/NetworkPartition.java
rename to core/src/test/java/org/elasticsearch/test/disruption/NetworkPartition.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/NetworkUnresponsivePartition.java b/core/src/test/java/org/elasticsearch/test/disruption/NetworkUnresponsivePartition.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/NetworkUnresponsivePartition.java
rename to core/src/test/java/org/elasticsearch/test/disruption/NetworkUnresponsivePartition.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/NoOpDisruptionScheme.java b/core/src/test/java/org/elasticsearch/test/disruption/NoOpDisruptionScheme.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/NoOpDisruptionScheme.java
rename to core/src/test/java/org/elasticsearch/test/disruption/NoOpDisruptionScheme.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java b/core/src/test/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java
rename to core/src/test/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java b/core/src/test/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java
rename to core/src/test/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java
diff --git a/src/test/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java b/core/src/test/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java
rename to core/src/test/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java
diff --git a/src/test/java/org/elasticsearch/test/engine/AssertingSearcher.java b/core/src/test/java/org/elasticsearch/test/engine/AssertingSearcher.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/engine/AssertingSearcher.java
rename to core/src/test/java/org/elasticsearch/test/engine/AssertingSearcher.java
diff --git a/src/test/java/org/elasticsearch/test/engine/MockEngineFactory.java b/core/src/test/java/org/elasticsearch/test/engine/MockEngineFactory.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/engine/MockEngineFactory.java
rename to core/src/test/java/org/elasticsearch/test/engine/MockEngineFactory.java
diff --git a/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java b/core/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java
rename to core/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java
diff --git a/src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java b/core/src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java
rename to core/src/test/java/org/elasticsearch/test/engine/MockInternalEngine.java
diff --git a/src/test/java/org/elasticsearch/test/engine/MockShadowEngine.java b/core/src/test/java/org/elasticsearch/test/engine/MockShadowEngine.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/engine/MockShadowEngine.java
rename to core/src/test/java/org/elasticsearch/test/engine/MockShadowEngine.java
diff --git a/src/test/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java b/core/src/test/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java
rename to core/src/test/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java
diff --git a/src/test/java/org/elasticsearch/test/gateway/NoopGatewayAllocator.java b/core/src/test/java/org/elasticsearch/test/gateway/NoopGatewayAllocator.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/gateway/NoopGatewayAllocator.java
rename to core/src/test/java/org/elasticsearch/test/gateway/NoopGatewayAllocator.java
diff --git a/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java b/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java
rename to core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java b/core/src/test/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java
rename to core/src/test/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java b/core/src/test/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java
rename to core/src/test/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
rename to core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java b/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java
rename to core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java b/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java
rename to core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/RegexMatcher.java b/core/src/test/java/org/elasticsearch/test/hamcrest/RegexMatcher.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/hamcrest/RegexMatcher.java
rename to core/src/test/java/org/elasticsearch/test/hamcrest/RegexMatcher.java
diff --git a/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java b/core/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java
rename to core/src/test/java/org/elasticsearch/test/index/merge/NoMergePolicyProvider.java
diff --git a/src/test/java/org/elasticsearch/test/junit/annotations/Network.java b/core/src/test/java/org/elasticsearch/test/junit/annotations/Network.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/junit/annotations/Network.java
rename to core/src/test/java/org/elasticsearch/test/junit/annotations/Network.java
diff --git a/src/test/java/org/elasticsearch/test/junit/annotations/TestLogging.java b/core/src/test/java/org/elasticsearch/test/junit/annotations/TestLogging.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/junit/annotations/TestLogging.java
rename to core/src/test/java/org/elasticsearch/test/junit/annotations/TestLogging.java
diff --git a/src/test/java/org/elasticsearch/test/junit/listeners/LoggingListener.java b/core/src/test/java/org/elasticsearch/test/junit/listeners/LoggingListener.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/junit/listeners/LoggingListener.java
rename to core/src/test/java/org/elasticsearch/test/junit/listeners/LoggingListener.java
diff --git a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/core/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
rename to core/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
diff --git a/src/test/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java b/core/src/test/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java
rename to core/src/test/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java
diff --git a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java b/core/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
rename to core/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
diff --git a/src/test/java/org/elasticsearch/test/rest/FakeRestRequest.java b/core/src/test/java/org/elasticsearch/test/rest/FakeRestRequest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/FakeRestRequest.java
rename to core/src/test/java/org/elasticsearch/test/rest/FakeRestRequest.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest0Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest0Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest0Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest0Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest1Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest1Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest1Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest1Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest2Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest2Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest2Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest2Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest3Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest3Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest3Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest3Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest4Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest4Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest4Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest4Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest5Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest5Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest5Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest5Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest6Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest6Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest6Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest6Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Rest7Tests.java b/core/src/test/java/org/elasticsearch/test/rest/Rest7Tests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Rest7Tests.java
rename to core/src/test/java/org/elasticsearch/test/rest/Rest7Tests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/RestTestCandidate.java b/core/src/test/java/org/elasticsearch/test/rest/RestTestCandidate.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/RestTestCandidate.java
rename to core/src/test/java/org/elasticsearch/test/rest/RestTestCandidate.java
diff --git a/src/test/java/org/elasticsearch/test/rest/RestTestExecutionContext.java b/core/src/test/java/org/elasticsearch/test/rest/RestTestExecutionContext.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/RestTestExecutionContext.java
rename to core/src/test/java/org/elasticsearch/test/rest/RestTestExecutionContext.java
diff --git a/src/test/java/org/elasticsearch/test/rest/Stash.java b/core/src/test/java/org/elasticsearch/test/rest/Stash.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/Stash.java
rename to core/src/test/java/org/elasticsearch/test/rest/Stash.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/RestClient.java b/core/src/test/java/org/elasticsearch/test/rest/client/RestClient.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/RestClient.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/RestClient.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/RestException.java b/core/src/test/java/org/elasticsearch/test/rest/client/RestException.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/RestException.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/RestException.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/RestResponse.java b/core/src/test/java/org/elasticsearch/test/rest/client/RestResponse.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/RestResponse.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/RestResponse.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/http/HttpDeleteWithEntity.java b/core/src/test/java/org/elasticsearch/test/rest/client/http/HttpDeleteWithEntity.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/http/HttpDeleteWithEntity.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/http/HttpDeleteWithEntity.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/http/HttpGetWithEntity.java b/core/src/test/java/org/elasticsearch/test/rest/client/http/HttpGetWithEntity.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/http/HttpGetWithEntity.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/http/HttpGetWithEntity.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/http/HttpRequestBuilder.java b/core/src/test/java/org/elasticsearch/test/rest/client/http/HttpRequestBuilder.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/http/HttpRequestBuilder.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/http/HttpRequestBuilder.java
diff --git a/src/test/java/org/elasticsearch/test/rest/client/http/HttpResponse.java b/core/src/test/java/org/elasticsearch/test/rest/client/http/HttpResponse.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/client/http/HttpResponse.java
rename to core/src/test/java/org/elasticsearch/test/rest/client/http/HttpResponse.java
diff --git a/src/test/java/org/elasticsearch/test/rest/json/JsonPath.java b/core/src/test/java/org/elasticsearch/test/rest/json/JsonPath.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/json/JsonPath.java
rename to core/src/test/java/org/elasticsearch/test/rest/json/JsonPath.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/DoSectionParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/DoSectionParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/DoSectionParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/DoSectionParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/GreaterThanEqualToParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/GreaterThanEqualToParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/GreaterThanEqualToParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/GreaterThanEqualToParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/GreaterThanParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/GreaterThanParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/GreaterThanParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/GreaterThanParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/IsFalseParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/IsFalseParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/IsFalseParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/IsFalseParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/IsTrueParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/IsTrueParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/IsTrueParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/IsTrueParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/LengthParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/LengthParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/LengthParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/LengthParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/LessThanOrEqualToParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/LessThanOrEqualToParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/LessThanOrEqualToParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/LessThanOrEqualToParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/LessThanParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/LessThanParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/LessThanParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/LessThanParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/MatchParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/MatchParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/MatchParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/MatchParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/RestTestFragmentParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/RestTestFragmentParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/RestTestFragmentParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/RestTestFragmentParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/RestTestParseException.java b/core/src/test/java/org/elasticsearch/test/rest/parser/RestTestParseException.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/RestTestParseException.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/RestTestParseException.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/RestTestSectionParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/RestTestSectionParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/RestTestSectionParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/RestTestSectionParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParseContext.java b/core/src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParseContext.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParseContext.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParseContext.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/RestTestSuiteParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/SetSectionParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/SetSectionParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/SetSectionParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/SetSectionParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/SetupSectionParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/SetupSectionParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/SetupSectionParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/SetupSectionParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/parser/SkipSectionParser.java b/core/src/test/java/org/elasticsearch/test/rest/parser/SkipSectionParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/parser/SkipSectionParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/parser/SkipSectionParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/ApiCallSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/ApiCallSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/ApiCallSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/ApiCallSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/Assertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/Assertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/Assertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/Assertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/DoSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/DoSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/DoSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/DoSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/ExecutableSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/ExecutableSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/ExecutableSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/ExecutableSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/GreaterThanAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/GreaterThanAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/GreaterThanAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/GreaterThanAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/GreaterThanEqualToAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/GreaterThanEqualToAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/GreaterThanEqualToAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/GreaterThanEqualToAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/IsFalseAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/IsFalseAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/IsFalseAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/IsFalseAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/IsTrueAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/IsTrueAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/IsTrueAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/IsTrueAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/LengthAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/LengthAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/LengthAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/LengthAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/LessThanAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/LessThanAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/LessThanAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/LessThanAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/LessThanOrEqualToAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/LessThanOrEqualToAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/LessThanOrEqualToAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/LessThanOrEqualToAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/MatchAssertion.java b/core/src/test/java/org/elasticsearch/test/rest/section/MatchAssertion.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/MatchAssertion.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/MatchAssertion.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/RestTestSuite.java b/core/src/test/java/org/elasticsearch/test/rest/section/RestTestSuite.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/RestTestSuite.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/RestTestSuite.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/SetSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/SetSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/SetSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/SetSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/SetupSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/SetupSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/SetupSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/SetupSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/SkipSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/SkipSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/SkipSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/SkipSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/section/TestSection.java b/core/src/test/java/org/elasticsearch/test/rest/section/TestSection.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/section/TestSection.java
rename to core/src/test/java/org/elasticsearch/test/rest/section/TestSection.java
diff --git a/src/test/java/org/elasticsearch/test/rest/spec/RestApi.java b/core/src/test/java/org/elasticsearch/test/rest/spec/RestApi.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/spec/RestApi.java
rename to core/src/test/java/org/elasticsearch/test/rest/spec/RestApi.java
diff --git a/src/test/java/org/elasticsearch/test/rest/spec/RestApiParser.java b/core/src/test/java/org/elasticsearch/test/rest/spec/RestApiParser.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/spec/RestApiParser.java
rename to core/src/test/java/org/elasticsearch/test/rest/spec/RestApiParser.java
diff --git a/src/test/java/org/elasticsearch/test/rest/spec/RestSpec.java b/core/src/test/java/org/elasticsearch/test/rest/spec/RestSpec.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/spec/RestSpec.java
rename to core/src/test/java/org/elasticsearch/test/rest/spec/RestSpec.java
diff --git a/src/test/java/org/elasticsearch/test/rest/support/Features.java b/core/src/test/java/org/elasticsearch/test/rest/support/Features.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/support/Features.java
rename to core/src/test/java/org/elasticsearch/test/rest/support/Features.java
diff --git a/src/test/java/org/elasticsearch/test/rest/support/FileUtils.java b/core/src/test/java/org/elasticsearch/test/rest/support/FileUtils.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/support/FileUtils.java
rename to core/src/test/java/org/elasticsearch/test/rest/support/FileUtils.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/AbstractParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java
rename to core/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java
diff --git a/src/test/java/org/elasticsearch/test/search/MockSearchService.java b/core/src/test/java/org/elasticsearch/test/search/MockSearchService.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/search/MockSearchService.java
rename to core/src/test/java/org/elasticsearch/test/search/MockSearchService.java
diff --git a/src/test/java/org/elasticsearch/test/search/MockSearchServiceModule.java b/core/src/test/java/org/elasticsearch/test/search/MockSearchServiceModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/search/MockSearchServiceModule.java
rename to core/src/test/java/org/elasticsearch/test/search/MockSearchServiceModule.java
diff --git a/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java b/core/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java
rename to core/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java
diff --git a/src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java b/core/src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java
rename to core/src/test/java/org/elasticsearch/test/store/MockFSIndexStore.java
diff --git a/src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java b/core/src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java
rename to core/src/test/java/org/elasticsearch/test/store/MockFSIndexStoreModule.java
diff --git a/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/core/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java
rename to core/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java
diff --git a/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java b/core/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java
rename to core/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java
diff --git a/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java b/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java
rename to core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java
diff --git a/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java b/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java
rename to core/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java
diff --git a/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java b/core/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java
rename to core/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java
diff --git a/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java b/core/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java
rename to core/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java
diff --git a/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java b/core/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/transport/CapturingTransport.java
rename to core/src/test/java/org/elasticsearch/test/transport/CapturingTransport.java
diff --git a/src/test/java/org/elasticsearch/test/transport/MockTransportService.java b/core/src/test/java/org/elasticsearch/test/transport/MockTransportService.java
similarity index 100%
rename from src/test/java/org/elasticsearch/test/transport/MockTransportService.java
rename to core/src/test/java/org/elasticsearch/test/transport/MockTransportService.java
diff --git a/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java b/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java
rename to core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java
diff --git a/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java b/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java
rename to core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java
diff --git a/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
rename to core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
diff --git a/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java b/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java
rename to core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java
diff --git a/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java b/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java
rename to core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java
diff --git a/src/test/java/org/elasticsearch/transport/ActionNamesTests.java b/core/src/test/java/org/elasticsearch/transport/ActionNamesTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/ActionNamesTests.java
rename to core/src/test/java/org/elasticsearch/transport/ActionNamesTests.java
diff --git a/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportTests.java b/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportTests.java
rename to core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportTests.java
diff --git a/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java b/core/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java
rename to core/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java
diff --git a/src/test/java/org/elasticsearch/transport/TransportMessageTests.java b/core/src/test/java/org/elasticsearch/transport/TransportMessageTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/TransportMessageTests.java
rename to core/src/test/java/org/elasticsearch/transport/TransportMessageTests.java
diff --git a/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java b/core/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java
rename to core/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java
diff --git a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java b/core/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java
rename to core/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java
diff --git a/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java
rename to core/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java
diff --git a/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationTests.java
rename to core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationTests.java
diff --git a/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java
rename to core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java
diff --git a/src/test/java/org/elasticsearch/transport/netty/NettyTransportTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/netty/NettyTransportTests.java
rename to core/src/test/java/org/elasticsearch/transport/netty/NettyTransportTests.java
diff --git a/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java b/core/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java
rename to core/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java
diff --git a/src/test/java/org/elasticsearch/tribe/TribeTests.java b/core/src/test/java/org/elasticsearch/tribe/TribeTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/tribe/TribeTests.java
rename to core/src/test/java/org/elasticsearch/tribe/TribeTests.java
diff --git a/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java b/core/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/tribe/TribeUnitTests.java
rename to core/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java
diff --git a/src/test/java/org/elasticsearch/tribe/elasticsearch.yml b/core/src/test/java/org/elasticsearch/tribe/elasticsearch.yml
similarity index 100%
rename from src/test/java/org/elasticsearch/tribe/elasticsearch.yml
rename to core/src/test/java/org/elasticsearch/tribe/elasticsearch.yml
diff --git a/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java b/core/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java
rename to core/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java
diff --git a/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
rename to core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
diff --git a/src/test/java/org/elasticsearch/update/UpdateNoopTests.java b/core/src/test/java/org/elasticsearch/update/UpdateNoopTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/update/UpdateNoopTests.java
rename to core/src/test/java/org/elasticsearch/update/UpdateNoopTests.java
diff --git a/src/test/java/org/elasticsearch/update/UpdateTests.java b/core/src/test/java/org/elasticsearch/update/UpdateTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/update/UpdateTests.java
rename to core/src/test/java/org/elasticsearch/update/UpdateTests.java
diff --git a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java
rename to core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java
diff --git a/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java
rename to core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java
diff --git a/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java
rename to core/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java
diff --git a/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java b/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/watcher/FileWatcherTest.java
rename to core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java
diff --git a/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java
similarity index 100%
rename from src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java
rename to core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java
diff --git a/src/test/resources/config/elasticsearch.json b/core/src/test/resources/config/elasticsearch.json
similarity index 100%
rename from src/test/resources/config/elasticsearch.json
rename to core/src/test/resources/config/elasticsearch.json
diff --git a/src/test/resources/config/elasticsearch.properties b/core/src/test/resources/config/elasticsearch.properties
similarity index 100%
rename from src/test/resources/config/elasticsearch.properties
rename to core/src/test/resources/config/elasticsearch.properties
diff --git a/src/test/resources/config/elasticsearch.yaml b/core/src/test/resources/config/elasticsearch.yaml
similarity index 100%
rename from src/test/resources/config/elasticsearch.yaml
rename to core/src/test/resources/config/elasticsearch.yaml
diff --git a/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff b/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff
similarity index 100%
rename from src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff
rename to core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff
diff --git a/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic b/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic
similarity index 100%
rename from src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic
rename to core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic
diff --git a/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff b/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff
similarity index 100%
rename from src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff
rename to core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff
diff --git a/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic b/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic
similarity index 100%
rename from src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic
rename to core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic
diff --git a/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml b/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml
similarity index 100%
rename from src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml
rename to core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml
diff --git a/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic b/core/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic
similarity index 100%
rename from src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic
rename to core/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic
diff --git a/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff b/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff
similarity index 100%
rename from src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff
rename to core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff
diff --git a/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff b/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff
similarity index 100%
rename from src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff
rename to core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff
diff --git a/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic b/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic
similarity index 100%
rename from src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic
rename to core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic
diff --git a/src/test/resources/jmeter/index-count.jmx b/core/src/test/resources/jmeter/index-count.jmx
similarity index 100%
rename from src/test/resources/jmeter/index-count.jmx
rename to core/src/test/resources/jmeter/index-count.jmx
diff --git a/src/test/resources/jmeter/index-get.jmx b/core/src/test/resources/jmeter/index-get.jmx
similarity index 100%
rename from src/test/resources/jmeter/index-get.jmx
rename to core/src/test/resources/jmeter/index-get.jmx
diff --git a/src/test/resources/jmeter/index-search.jmx b/core/src/test/resources/jmeter/index-search.jmx
similarity index 100%
rename from src/test/resources/jmeter/index-search.jmx
rename to core/src/test/resources/jmeter/index-search.jmx
diff --git a/src/test/resources/jmeter/index.jmx b/core/src/test/resources/jmeter/index.jmx
similarity index 100%
rename from src/test/resources/jmeter/index.jmx
rename to core/src/test/resources/jmeter/index.jmx
diff --git a/src/test/resources/jmeter/ping-single.jmx b/core/src/test/resources/jmeter/ping-single.jmx
similarity index 100%
rename from src/test/resources/jmeter/ping-single.jmx
rename to core/src/test/resources/jmeter/ping-single.jmx
diff --git a/src/test/resources/org/apache/lucene/search/postingshighlight/CambridgeMA.utf8 b/core/src/test/resources/org/apache/lucene/search/postingshighlight/CambridgeMA.utf8
similarity index 100%
rename from src/test/resources/org/apache/lucene/search/postingshighlight/CambridgeMA.utf8
rename to core/src/test/resources/org/apache/lucene/search/postingshighlight/CambridgeMA.utf8
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip b/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip b/core/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip
diff --git a/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip b/core/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip
rename to core/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip
diff --git a/src/test/resources/org/elasticsearch/cluster/routing/custom_routing_1_x.zip b/core/src/test/resources/org/elasticsearch/cluster/routing/custom_routing_1_x.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/cluster/routing/custom_routing_1_x.zip
rename to core/src/test/resources/org/elasticsearch/cluster/routing/custom_routing_1_x.zip
diff --git a/src/test/resources/org/elasticsearch/cluster/routing/default_routing_1_x.zip b/core/src/test/resources/org/elasticsearch/cluster/routing/default_routing_1_x.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/cluster/routing/default_routing_1_x.zip
rename to core/src/test/resources/org/elasticsearch/cluster/routing/default_routing_1_x.zip
diff --git a/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip b/core/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip
rename to core/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip
diff --git a/src/test/resources/org/elasticsearch/cluster/routing/shard_routes.txt b/core/src/test/resources/org/elasticsearch/cluster/routing/shard_routes.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/cluster/routing/shard_routes.txt
rename to core/src/test/resources/org/elasticsearch/cluster/routing/shard_routes.txt
diff --git a/src/test/resources/org/elasticsearch/common/cli/tool-cmd1.help b/core/src/test/resources/org/elasticsearch/common/cli/tool-cmd1.help
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/cli/tool-cmd1.help
rename to core/src/test/resources/org/elasticsearch/common/cli/tool-cmd1.help
diff --git a/src/test/resources/org/elasticsearch/common/cli/tool.help b/core/src/test/resources/org/elasticsearch/common/cli/tool.help
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/cli/tool.help
rename to core/src/test/resources/org/elasticsearch/common/cli/tool.help
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v1/dir/file2.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v1/dir/file2.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v1/dir/file2.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v1/dir/file2.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v1/file1.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v1/file1.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v1/file1.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v1/file1.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/file2.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/file2.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/file2.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/file2.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/subdir/file4.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/subdir/file4.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/subdir/file4.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/dir/subdir/file4.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v2/file1.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/file1.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v2/file1.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/file1.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v2/file3.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/file3.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v2/file3.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v2/file3.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/file2.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/file2.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/file2.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/file2.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file4.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file4.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file4.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file4.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file5.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file5.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file5.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/dir/subdir/file5.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v3/file1.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/file1.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v3/file1.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/file1.txt
diff --git a/src/test/resources/org/elasticsearch/common/io/copyappend/v3/file3.txt b/core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/file3.txt
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/io/copyappend/v3/file3.txt
rename to core/src/test/resources/org/elasticsearch/common/io/copyappend/v3/file3.txt
diff --git a/src/test/resources/org/elasticsearch/common/logging/log4j/config/logging.yml b/core/src/test/resources/org/elasticsearch/common/logging/log4j/config/logging.yml
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/logging/log4j/config/logging.yml
rename to core/src/test/resources/org/elasticsearch/common/logging/log4j/config/logging.yml
diff --git a/src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/logging.yml b/core/src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/logging.yml
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/logging.yml
rename to core/src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/logging.yml
diff --git a/src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/test3/logging.yml b/core/src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/test3/logging.yml
similarity index 100%
rename from src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/test3/logging.yml
rename to core/src/test/resources/org/elasticsearch/common/logging/log4j/config/test2/test3/logging.yml
diff --git a/src/test/resources/org/elasticsearch/gateway/global-3.st b/core/src/test/resources/org/elasticsearch/gateway/global-3.st
similarity index 100%
rename from src/test/resources/org/elasticsearch/gateway/global-3.st
rename to core/src/test/resources/org/elasticsearch/gateway/global-3.st
diff --git a/src/test/resources/org/elasticsearch/index/query/config/scripts/full-query-template.mustache b/core/src/test/resources/org/elasticsearch/index/query/config/scripts/full-query-template.mustache
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/query/config/scripts/full-query-template.mustache
rename to core/src/test/resources/org/elasticsearch/index/query/config/scripts/full-query-template.mustache
diff --git a/src/test/resources/org/elasticsearch/index/query/config/scripts/storedTemplate.mustache b/core/src/test/resources/org/elasticsearch/index/query/config/scripts/storedTemplate.mustache
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/query/config/scripts/storedTemplate.mustache
rename to core/src/test/resources/org/elasticsearch/index/query/config/scripts/storedTemplate.mustache
diff --git a/src/test/resources/org/elasticsearch/index/translog/legacy_translogs.zip b/core/src/test/resources/org/elasticsearch/index/translog/legacy_translogs.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/legacy_translogs.zip
rename to core/src/test/resources/org/elasticsearch/index/translog/legacy_translogs.zip
diff --git a/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary b/core/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary
rename to core/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary
diff --git a/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary b/core/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/translog-v0.binary
rename to core/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary
diff --git a/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary b/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary
rename to core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary
diff --git a/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary b/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary
rename to core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary
diff --git a/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary b/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary
rename to core/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary
diff --git a/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary b/core/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary
similarity index 100%
rename from src/test/resources/org/elasticsearch/index/translog/translog-v1.binary
rename to core/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary
diff --git a/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/es-plugin.properties b/core/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/es-plugin.properties
similarity index 100%
rename from src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/es-plugin.properties
rename to core/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/es-plugin.properties
diff --git a/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/index.html b/core/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/index.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/index.html
rename to core/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/index.html
diff --git a/src/test/resources/org/elasticsearch/nodesinfo/node4/dummy/_site/index.html b/core/src/test/resources/org/elasticsearch/nodesinfo/node4/dummy/_site/index.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/nodesinfo/node4/dummy/_site/index.html
rename to core/src/test/resources/org/elasticsearch/nodesinfo/node4/dummy/_site/index.html
diff --git a/src/test/resources/org/elasticsearch/nodesinfo/node4/test-no-version-plugin/_site/index.html b/core/src/test/resources/org/elasticsearch/nodesinfo/node4/test-no-version-plugin/_site/index.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/nodesinfo/node4/test-no-version-plugin/_site/index.html
rename to core/src/test/resources/org/elasticsearch/nodesinfo/node4/test-no-version-plugin/_site/index.html
diff --git a/src/test/resources/org/elasticsearch/plugins/anotherplugin/_site/index.html b/core/src/test/resources/org/elasticsearch/plugins/anotherplugin/_site/index.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/anotherplugin/_site/index.html
rename to core/src/test/resources/org/elasticsearch/plugins/anotherplugin/_site/index.html
diff --git a/src/test/resources/org/elasticsearch/plugins/dummy/_site/dir1/.empty b/core/src/test/resources/org/elasticsearch/plugins/dummy/_site/dir1/.empty
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/dummy/_site/dir1/.empty
rename to core/src/test/resources/org/elasticsearch/plugins/dummy/_site/dir1/.empty
diff --git a/src/test/resources/org/elasticsearch/plugins/dummy/_site/index.html b/core/src/test/resources/org/elasticsearch/plugins/dummy/_site/index.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/dummy/_site/index.html
rename to core/src/test/resources/org/elasticsearch/plugins/dummy/_site/index.html
diff --git a/src/test/resources/org/elasticsearch/plugins/loading/jar/in-jar-plugin.jar b/core/src/test/resources/org/elasticsearch/plugins/loading/jar/in-jar-plugin.jar
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/loading/jar/in-jar-plugin.jar
rename to core/src/test/resources/org/elasticsearch/plugins/loading/jar/in-jar-plugin.jar
diff --git a/src/test/resources/org/elasticsearch/plugins/loading/zip/in-zip-plugin.jar b/core/src/test/resources/org/elasticsearch/plugins/loading/zip/in-zip-plugin.jar
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/loading/zip/in-zip-plugin.jar
rename to core/src/test/resources/org/elasticsearch/plugins/loading/zip/in-zip-plugin.jar
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_folder_file.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_folder_file.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_folder_file.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_folder_file.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_folder_site.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_folder_site.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_folder_site.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_folder_site.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_single_folder.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_single_folder.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_single_folder.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_single_folder.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_bin_and_config.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_bin_and_config.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_bin_and_config.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_bin_and_config.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_bin_only.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_bin_only.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_bin_only.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_bin_only.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_classfile.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_classfile.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_classfile.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_classfile.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v1.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v1.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_config_v1.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v1.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v2.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v2.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_config_v2.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v2.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v3.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v3.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_config_v3.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_config_v3.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_with_sourcefiles.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_with_sourcefiles.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_with_sourcefiles.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_with_sourcefiles.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/plugin_without_folders.zip b/core/src/test/resources/org/elasticsearch/plugins/plugin_without_folders.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/plugin_without_folders.zip
rename to core/src/test/resources/org/elasticsearch/plugins/plugin_without_folders.zip
diff --git a/src/test/resources/org/elasticsearch/plugins/subdir/_site/dir/index.html b/core/src/test/resources/org/elasticsearch/plugins/subdir/_site/dir/index.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/subdir/_site/dir/index.html
rename to core/src/test/resources/org/elasticsearch/plugins/subdir/_site/dir/index.html
diff --git a/src/test/resources/org/elasticsearch/plugins/subdir/_site/dir_without_index/page.html b/core/src/test/resources/org/elasticsearch/plugins/subdir/_site/dir_without_index/page.html
similarity index 100%
rename from src/test/resources/org/elasticsearch/plugins/subdir/_site/dir_without_index/page.html
rename to core/src/test/resources/org/elasticsearch/plugins/subdir/_site/dir_without_index/page.html
diff --git a/src/test/resources/org/elasticsearch/rest/action/admin/indices/upgrade/index-0.90.6.zip b/core/src/test/resources/org/elasticsearch/rest/action/admin/indices/upgrade/index-0.90.6.zip
similarity index 100%
rename from src/test/resources/org/elasticsearch/rest/action/admin/indices/upgrade/index-0.90.6.zip
rename to core/src/test/resources/org/elasticsearch/rest/action/admin/indices/upgrade/index-0.90.6.zip
diff --git a/src/test/resources/org/elasticsearch/script/config/scripts/script1.expression b/core/src/test/resources/org/elasticsearch/script/config/scripts/script1.expression
similarity index 100%
rename from src/test/resources/org/elasticsearch/script/config/scripts/script1.expression
rename to core/src/test/resources/org/elasticsearch/script/config/scripts/script1.expression
diff --git a/src/test/resources/org/elasticsearch/script/config/scripts/script1.groovy b/core/src/test/resources/org/elasticsearch/script/config/scripts/script1.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/script/config/scripts/script1.groovy
rename to core/src/test/resources/org/elasticsearch/script/config/scripts/script1.groovy
diff --git a/src/test/resources/org/elasticsearch/script/config/scripts/script1.mustache b/core/src/test/resources/org/elasticsearch/script/config/scripts/script1.mustache
similarity index 100%
rename from src/test/resources/org/elasticsearch/script/config/scripts/script1.mustache
rename to core/src/test/resources/org/elasticsearch/script/config/scripts/script1.mustache
diff --git a/src/test/resources/org/elasticsearch/script/config/scripts/script2.groovy b/core/src/test/resources/org/elasticsearch/script/config/scripts/script2.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/script/config/scripts/script2.groovy
rename to core/src/test/resources/org/elasticsearch/script/config/scripts/script2.groovy
diff --git a/src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_no_params.groovy b/core/src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_no_params.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_no_params.groovy
rename to core/src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_no_params.groovy
diff --git a/src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_with_params.groovy b/core/src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_with_params.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_with_params.groovy
rename to core/src/test/resources/org/elasticsearch/search/aggregations/bucket/config/scripts/significance_script_with_params.groovy
diff --git a/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/combine_script.groovy b/core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/combine_script.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/combine_script.groovy
rename to core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/combine_script.groovy
diff --git a/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/init_script.groovy b/core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/init_script.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/init_script.groovy
rename to core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/init_script.groovy
diff --git a/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/map_script.groovy b/core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/map_script.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/map_script.groovy
rename to core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/map_script.groovy
diff --git a/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/reduce_script.groovy b/core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/reduce_script.groovy
similarity index 100%
rename from src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/reduce_script.groovy
rename to core/src/test/resources/org/elasticsearch/search/aggregations/metrics/scripted/conf/scripts/reduce_script.groovy
diff --git a/src/test/resources/packaging/scripts/20_tar_package.bats b/core/src/test/resources/packaging/scripts/20_tar_package.bats
similarity index 100%
rename from src/test/resources/packaging/scripts/20_tar_package.bats
rename to core/src/test/resources/packaging/scripts/20_tar_package.bats
diff --git a/src/test/resources/packaging/scripts/25_tar_plugins.bats b/core/src/test/resources/packaging/scripts/25_tar_plugins.bats
similarity index 100%
rename from src/test/resources/packaging/scripts/25_tar_plugins.bats
rename to core/src/test/resources/packaging/scripts/25_tar_plugins.bats
diff --git a/src/test/resources/packaging/scripts/30_deb_package.bats b/core/src/test/resources/packaging/scripts/30_deb_package.bats
similarity index 100%
rename from src/test/resources/packaging/scripts/30_deb_package.bats
rename to core/src/test/resources/packaging/scripts/30_deb_package.bats
diff --git a/src/test/resources/packaging/scripts/40_rpm_package.bats b/core/src/test/resources/packaging/scripts/40_rpm_package.bats
similarity index 100%
rename from src/test/resources/packaging/scripts/40_rpm_package.bats
rename to core/src/test/resources/packaging/scripts/40_rpm_package.bats
diff --git a/src/test/resources/packaging/scripts/50_plugins.bats b/core/src/test/resources/packaging/scripts/50_plugins.bats
similarity index 100%
rename from src/test/resources/packaging/scripts/50_plugins.bats
rename to core/src/test/resources/packaging/scripts/50_plugins.bats
diff --git a/src/test/resources/packaging/scripts/50_systemd.bats b/core/src/test/resources/packaging/scripts/50_systemd.bats
similarity index 100%
rename from src/test/resources/packaging/scripts/50_systemd.bats
rename to core/src/test/resources/packaging/scripts/50_systemd.bats
diff --git a/src/test/resources/packaging/scripts/packaging_test_utils.bash b/core/src/test/resources/packaging/scripts/packaging_test_utils.bash
similarity index 100%
rename from src/test/resources/packaging/scripts/packaging_test_utils.bash
rename to core/src/test/resources/packaging/scripts/packaging_test_utils.bash